Changeset 13983

Timestamp:

07/27/2024 06:44:41 PM (11 months ago)

Author:

espellcaste

Message:

Require singular and plural names for BuddyPress custom types.

When creating a member or group type, require that both singular and plural names are provided. This ensures that the type can be properly registered and used throughout BuddyPress.

Props 1naveengiri, imath, imranmd.

Fixes #9092
Closes ​https://github.com/buddypress/buddypress/pull/335/

Location:

trunk/src

Files:

• bp-core/admin/bp-core-admin-types.php (modified) (4 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-groups/bp-groups-admin.php (modified) (1 diff)
• bp-groups/bp-groups-functions.php (modified) (1 diff)
• bp-members/bp-members-admin.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (1 diff)

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

@@ -45 +45 @@
  *     @type string $taxonomy   The Type's taxonomy. Required.
  *     @type string $bp_type_id Unique string identifier for the member type. Required.
+ *     @type string $bp_type_singular_name Singular name for the member type. Required.
+ *     @type string $bp_type_name Plural name for the member type. Required.
  *     @see keys of the array returned by bp_get_type_metadata_schema() for the other arguments.
  * }
- * @return integer|WP_Error The Type's term ID on success. A WP_Error object otherwise.
+ * @return int|WP_Error The Type's term ID on success. A WP_Error object otherwise.
  */
 function bp_core_admin_insert_type( $args = array() ) {
@@ -53 +55 @@
         'taxonomy'   => '',
         'bp_type_id' => '',
+        'bp_type_singular_name' => '',
+        'bp_type_name' => '',
     );
 
@@ -67 +71 @@
             __( 'The Type ID value is missing', 'buddypress' ),
             array( 'message' => 1 )
+        );
+    }
+
+    if ( ! $args['bp_type_singular_name'] ) {
+        return new WP_Error(
+            'empty_field_singular',
+            __( 'The Singular Name value is missing', 'buddypress' ),
+            array(
+                'message' => 11,
+            )
+        );
+    }
+
+    if ( ! $args['bp_type_name'] ) {
+        return new WP_Error(
+            'empty_field_plural',
+            __( 'The Plural Name value is missing', 'buddypress' ),
+            array(
+                'message' => 12,
+            )
         );
     }
@@ -117 +141 @@
     }
 
+    $type_term_id = reset( $type_term_id );
+
     /**
      * Hook here to add code once the type has been inserted.

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

@@ -3381 +3381 @@
 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' ),

trunk/src/bp-groups/bp-groups-admin.php

@@ -1513 +1513 @@
         9  => __( 'Group type successfully deleted.', 'buddypress' ),
         10 => __( 'Group type could not be updated due to missing required information.', 'buddypress' ),
+        11 => __( 'Please define the Group Type Singular Name field.', 'buddypress' ),
+        12 => __( 'Please define the Group Type Plural Name field.', 'buddypress' ),
     );
 

trunk/src/bp-groups/bp-groups-functions.php

@@ -2840 +2840 @@
 
             // Specific to BuddyPress.
-            'bp_type_id_label'              => _x( 'Group Type ID', 'BP Member type ID label', 'buddypress' ),
+            'bp_type_id_label'              => _x( 'Group Type ID (required)', 'BP Member type ID label', 'buddypress' ),
             'bp_type_id_description'        => _x( 'Lower-case string, no spaces or special characters. Used to identify the group type.', 'BP Group type ID description', 'buddypress' ),
             'bp_type_show_in_create_screen' => _x( 'Show on Group Creation', 'BP Group type show in create screen', 'buddypress' ),

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

@@ -108 +108 @@
         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' ),
     );
 

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

@@ -2767 +2767 @@
 
             // 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' ),