Changeset 12395 for trunk/src/bp-activity/bp-activity-admin.php

Timestamp:

05/11/2019 01:33:14 PM (5 years ago)

Author:

imath

Message:

Improve i18n of Groups activity updates action string

Dynamically generated activity action strings were introduced in BuddyPress 2.0 to ensure these strings are always up to date and multilingual-friendly (see #3856).

It appeared although the activity_update type enjoys this feature when activities are shared by users on their profiles, it was not the case for activity updates posted within Groups.

Thanks to this commit, BuddyPress is now taking it in charge by:

• Registering a new group activity action to reference a specific formatting callback function for activities posted within Groups.
• Making sure this new activity action type does not interfere with the one of regular activity updates in dropdown filters or into the Activity Administration screens.

BTW happy 4th WPTranslationDay to everyone :)

Fixes #8089

File:

• trunk/src/bp-activity/bp-activity-admin.php (modified) (2 diffs)

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

@@ -841 +841 @@
 
         for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ ) {
+            /**
+             * Don't take in account:
+             * - a mis-named Friends activity type from before BP 1.6,
+             * - The Group's component 'activity_update' one as the Activity component is using it.
+             */
+            if ( 'friends_register_activity_action' === $action[$i]['key'] || 'bp_groups_format_activity_action_group_activity_update' === $action[$i]['format_callback'] ) {
+                continue;
+            }
+
             $actions[ $action[$i]['key'] ] = $action[$i]['value'];
         }
     }
 
-    // This was a mis-named activity type from before BP 1.6.
-    unset( $actions['friends_register_activity_action'] );
-
     // Sort array by the human-readable value.
     natsort( $actions );
@@ -871 +877 @@
         $action = array_values( (array) $action );
 
-        for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ )
+        for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ ) {
+            /**
+             * Don't take in account:
+             * - a mis-named Friends activity type from before BP 1.6,
+             * - The Group's component 'activity_update' one as the Activity component is using it.
+             */
+            if ( 'friends_register_activity_action' === $action[$i]['key'] || 'bp_groups_format_activity_action_group_activity_update' === $action[$i]['format_callback'] ) {
+                continue;
+            }
+
             $actions[ $action[$i]['key'] ] = $action[$i]['value'];
+        }
     }
-
-    // This was a mis-named activity type from before BP 1.6.
-    unset( $actions['friends_register_activity_action'] );
 
     // Sort array by the human-readable value.