Ticket #9092: 9092.patch

src/bp-core/admin/bp-core-admin-types.php

@@ -54 +54 @@
         $default_args = array(
                 'taxonomy'   => '',
                 'bp_type_id' => '',
+                'bp_type_singular_name' => '',
+        'bp_type_name' => '',
         );
 
         $args = array_map( 'wp_unslash', $args );
@@ -66 +68 @@
         if ( ! $args['bp_type_id'] || ! $args['taxonomy'] ) {
                  return new WP_Error(
                          'invalid_type_taxonomy',
-                         __( 'The Type ID value is missing', 'buddypress' ),
+                         __( 'Member Type ID value is missing', 'buddypress' ),
                          array(
                                 'message' => 1,
                          )
                 );
         }
 
+        if ( ! $args['bp_type_singular_name'] ) {
+         return new WP_Error(
+             'empty_field_singular',
+             __( 'Member Type Singular Name value is missing', 'buddypress' ),
+             array(
+                'message' => 11,
+             )
+        );
+    }
+    if ( ! $args['bp_type_name'] ) {
+         return new WP_Error(
+             'empty_field_plural',
+             __( 'Member Type Plural Name value is missing', 'buddypress' ),
+             array(
+                'message' => 12,
+             )
+        );
+    }
+
         $type_id       = sanitize_title( $args['bp_type_id'] );
         $type_taxonomy = sanitize_key( $args['taxonomy'] );
 

src/bp-core/bp-core-functions.php

@@ -3289 +3289 @@
  */
 function bp_get_taxonomy_common_labels() {
         return array(
-                'bp_type_name'           => _x( 'Plural Name', 'BP Type name label', 'buddypress' ),
-                'bp_type_singular_name'  => _x( 'Singular name', 'BP Type singular name label', 'buddypress' ),
+                'bp_type_name'           => _x( 'Plural Name (required)', 'BP Type name label', 'buddypress' ),
+                'bp_type_singular_name'  => _x( 'Singular Name (required)', 'BP Type singular name label', 'buddypress' ),
                 'bp_type_has_directory'  => _x( 'Has Directory View', 'BP Type has directory checkbox label', 'buddypress' ),
                 'bp_type_directory_slug' => _x( 'Custom type directory slug', 'BP Type slug label', 'buddypress' ),
         );

src/bp-members/bp-members-admin.php

@@ -107 +107 @@
                 8  => __( 'Sorry, there was an error while trying to delete this Member type.', 'buddypress' ),
                 9  => __( 'Member type successfully deleted.', 'buddypress' ),
                 10 => __( 'Member type could not be updated due to missing required information.', 'buddypress' ),
+                11 => __( 'Please define the Member Type Singular Name field.', 'buddypress' ),
+        12 => __( 'Please define the Member Type Plural Name field.', 'buddypress' ),
         );
 
         return $messages;

src/bp-members/bp-members-functions.php

@@ -2740 +2740 @@
                         'back_to_items'              => _x( '← Back to Member Types', 'Member type taxonomy back to items label', 'buddypress' ),
 
                         // Specific to BuddyPress.
-                        'bp_type_id_label'           => _x( 'Member Type ID', 'BP Member type ID label', 'buddypress' ),
+                        'bp_type_id_label'           => _x( 'Member Type ID (required)', 'BP Member type ID label', 'buddypress' ),
                         'bp_type_id_description'     => _x( 'Enter a lower-case string without spaces or special characters (used internally to identify the member type).', 'BP Member type ID description', 'buddypress' ),
                         'bp_type_show_in_list'       => _x( 'Show on Member', 'BP Member type show in list', 'buddypress' ),
                 )