Changeset 8705 for trunk/src/bp-activity/bp-activity-loader.php

Timestamp:

07/27/2014 05:48:17 PM (10 years ago)

Author:

djpaul

Message:

i18n: disambiguate nav items' strings.

See #5777, props danbp

File:

• trunk/src/bp-activity/bp-activity-loader.php (modified) (13 diffs)

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

@@ -137 +137 @@
         // Add 'Activity' to the main navigation
         $main_nav = array(
-            'name'                => __( 'Activity', 'buddypress' ),
+            'name'                => _x( 'Activity', 'Profile activity screen nav', 'buddypress' ),
             'slug'                => $this->slug,
             'position'            => 10,
@@ -163 +163 @@
         // Add the subnav items to the activity nav item if we are using a theme that supports this
         $sub_nav[] = array(
-            'name'            => __( 'Personal', 'buddypress' ),
+            'name'            => _x( 'Personal', 'Profile activity screen sub nav', 'buddypress' ),
             'slug'            => 'just-me',
             'parent_url'      => $activity_link,
@@ -174 +174 @@
         if ( bp_activity_do_mentions() ) {
             $sub_nav[] = array(
-                'name'            => __( 'Mentions', 'buddypress' ),
+                'name'            => _x( 'Mentions', 'Profile activity screen sub nav', 'buddypress' ),
                 'slug'            => 'mentions',
                 'parent_url'      => $activity_link,
@@ -186 +186 @@
         // Favorite activity items
         $sub_nav[] = array(
-            'name'            => __( 'Favorites', 'buddypress' ),
+            'name'            => _x( 'Favorites', 'Profile activity screen sub nav', 'buddypress' ),
             'slug'            => 'favorites',
             'parent_url'      => $activity_link,
@@ -198 +198 @@
         if ( bp_is_active( 'friends' ) ) {
             $sub_nav[] = array(
-                'name'            => __( 'Friends', 'buddypress' ),
+                'name'            => _x( 'Friends', 'Profile activity screen sub nav', 'buddypress' ),
                 'slug'            => bp_get_friends_slug(),
                 'parent_url'      => $activity_link,
@@ -211 +211 @@
         if ( bp_is_active( 'groups' ) ) {
             $sub_nav[] = array(
-                'name'            => __( 'Groups', 'buddypress' ),
+                'name'            => _x( 'Groups', 'Profile activity screen sub nav', 'buddypress' ),
                 'slug'            => bp_get_groups_slug(),
                 'parent_url'      => $activity_link,
@@ -256 +256 @@
                 $count = bp_get_total_mention_count_for_user( bp_loggedin_user_id() );
                 if ( !empty( $count ) ) {
-                    $title = sprintf( __( 'Mentions <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
+                    $title = sprintf( _x( 'Mentions <span class="count">%s</span>', 'Toolbar Mention logged in user', 'buddypress' ), number_format_i18n( $count ) );
                 } else {
-                    $title = __( 'Mentions', 'buddypress' );
+                    $title = _x( 'Mentions', 'Toolbar Mention logged in user', 'buddypress' );
                 }
             }
@@ -266 +266 @@
                 'parent' => $bp->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
-                'title'  => __( 'Activity', 'buddypress' ),
+                'title'  => _x( 'Activity', 'My Account Activity sub nav', 'buddypress' ),
                 'href'   => trailingslashit( $activity_link )
             );
@@ -274 +274 @@
                 'parent' => 'my-account-' . $this->id,
                 'id'     => 'my-account-' . $this->id . '-personal',
-                'title'  => __( 'Personal', 'buddypress' ),
+                'title'  => _x( 'Personal', 'My Account Activity sub nav', 'buddypress' ),
                 'href'   => trailingslashit( $activity_link )
             );
@@ -292 +292 @@
                 'parent' => 'my-account-' . $this->id,
                 'id'     => 'my-account-' . $this->id . '-favorites',
-                'title'  => __( 'Favorites', 'buddypress' ),
+                'title'  => _x( 'Favorites', 'My Account Activity sub nav', 'buddypress' ),
                 'href'   => trailingslashit( $activity_link . 'favorites' )
             );
@@ -301 +301 @@
                     'parent' => 'my-account-' . $this->id,
                     'id'     => 'my-account-' . $this->id . '-friends',
-                    'title'  => __( 'Friends', 'buddypress' ),
+                    'title'  => _x( 'Friends', 'My Account Activity sub nav', 'buddypress' ),
                     'href'   => trailingslashit( $activity_link . bp_get_friends_slug() )
                 );
@@ -311 +311 @@
                     'parent' => 'my-account-' . $this->id,
                     'id'     => 'my-account-' . $this->id . '-groups',
-                    'title'  => __( 'Groups', 'buddypress' ),
+                    'title'  => _x( 'Groups', 'My Account Activity sub nav', 'buddypress' ),
                     'href'   => trailingslashit( $activity_link . bp_get_groups_slug() )
                 );
@@ -335 +335 @@
         if ( bp_is_activity_component() ) {
             if ( bp_is_my_profile() ) {
-                $bp->bp_options_title = __( 'My Activity', 'buddypress' );
+                $bp->bp_options_title = _x( 'My Activity', 'Page and <title>', 'buddypress' );
             } else {
                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(