Index: bp-activity/bp-activity-admin.php
===================================================================
--- bp-activity/bp-activity-admin.php (revision 8692)
+++ bp-activity/bp-activity-admin.php (working copy)
@@ -29,8 +29,8 @@
// Add our screen
$hook = add_menu_page(
- __( 'Activity', 'buddypress' ),
- __( 'Activity', 'buddypress' ),
+ _x( 'Activity', 'Admin Dashbord SWA page title', 'buddypress' ),
+ _x( 'Activity', 'Admin Dashbord SWA menu', 'buddypress' ),
'bp_moderate',
'bp-activity',
'bp_activity_admin',
@@ -903,7 +903,7 @@
-
+
@@ -1238,10 +1238,10 @@
function get_columns() {
return array(
'cb' => '',
- 'author' => __( 'Author', 'buddypress' ),
- 'comment' => __( 'Activity', 'buddypress' ),
- 'action' => __( 'Action', 'buddypress' ),
- 'response' => __( 'In Response To', 'buddypress' ),
+ 'author' => _x('Author', 'Admin SWA column header', 'buddypress' ),
+ 'comment' => _x( 'Activity', 'Admin SWA column header', 'buddypress' ),
+ 'action' => _x( 'Action', 'Admin SWA column header', 'buddypress' ),
+ 'response' => _x( 'In Response To', 'Admin SWA column header', 'buddypress' ),
);
}
Index: bp-activity/bp-activity-loader.php
===================================================================
--- bp-activity/bp-activity-loader.php (revision 8692)
+++ bp-activity/bp-activity-loader.php (working copy)
@@ -136,7 +136,7 @@
// 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,
'screen_function' => 'bp_activity_screen_my_activity',
@@ -162,7 +162,7 @@
// 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,
'parent_slug' => $this->slug,
@@ -173,7 +173,7 @@
// @ mentions
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,
'parent_slug' => $this->slug,
@@ -185,7 +185,7 @@
// Favorite activity items
$sub_nav[] = array(
- 'name' => __( 'Favorites', 'buddypress' ),
+ 'name' => _x( 'Favorites', 'Profile activity screen sub nav', 'buddypress' ),
'slug' => 'favorites',
'parent_url' => $activity_link,
'parent_slug' => $this->slug,
@@ -197,7 +197,7 @@
// Additional menu if friends is active
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,
'parent_slug' => $this->slug,
@@ -210,7 +210,7 @@
// Additional menu if groups is active
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,
'parent_slug' => $this->slug,
@@ -255,9 +255,9 @@
if ( bp_activity_do_mentions() ) {
$count = bp_get_total_mention_count_for_user( bp_loggedin_user_id() );
if ( !empty( $count ) ) {
- $title = sprintf( __( 'Mentions %s', 'buddypress' ), number_format_i18n( $count ) );
+ $title = sprintf( _x( 'Mentions %s', 'Toolbar Mention logged in user', 'buddypress' ), number_format_i18n( $count ) );
} else {
- $title = __( 'Mentions', 'buddypress' );
+ $title = _x( 'Mentions', 'Toolbar Mention logged in user', 'buddypress' );
}
}
@@ -265,7 +265,7 @@
$wp_admin_nav[] = array(
'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 )
);
@@ -273,7 +273,7 @@
$wp_admin_nav[] = array(
'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 )
);
@@ -291,7 +291,7 @@
$wp_admin_nav[] = array(
'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' )
);
@@ -300,7 +300,7 @@
$wp_admin_nav[] = array(
'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() )
);
}
@@ -310,7 +310,7 @@
$wp_admin_nav[] = array(
'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() )
);
}
@@ -334,7 +334,7 @@
// Adjust title based on view
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 ', 'buddypress' );
} else {
$bp->bp_options_avatar = bp_core_fetch_avatar( array(
'item_id' => bp_displayed_user_id(),
@@ -367,4 +367,4 @@
function bp_setup_activity() {
buddypress()->activity = new BP_Activity_Component();
}
-add_action( 'bp_setup_components', 'bp_setup_activity', 6 );
+add_action( 'bp_setup_components', 'bp_setup_activity', 6 );
\ No newline at end of file
Index: bp-core/bp-core-admin.php
===================================================================
--- bp-core/bp-core-admin.php (revision 8692)
+++ bp-core/bp-core-admin.php (working copy)
@@ -334,7 +334,7 @@
if ( bp_is_active( 'xprofile' ) ) {
// Add the main section
- add_settings_section( 'bp_xprofile', __( 'Profile Settings', 'buddypress' ), 'bp_admin_setting_callback_xprofile_section', 'buddypress' );
+ add_settings_section( 'bp_xprofile', _x( 'Profile Settings', 'BuddyPress setting tab', 'buddypress' ), 'bp_admin_setting_callback_xprofile_section', 'buddypress' );
$avatar_setting = 'bp_xprofile';
Index: bp-core/bp-core-loader.php
===================================================================
--- bp-core/bp-core-loader.php (revision 8692)
+++ bp-core/bp-core-loader.php (working copy)
@@ -230,7 +230,7 @@
// Add 'Profile' to the main navigation
$main_nav = array(
- 'name' => __( 'Profile', 'buddypress' ),
+ 'name' => _x( 'Profile', 'Main navigation', 'buddypress' ),
'slug' => $bp->core->profile->slug,
'position' => 20,
'screen_function' => 'bp_core_catch_profile_uri',
@@ -241,7 +241,7 @@
// Add the subnav items to the profile
$sub_nav[] = array(
- 'name' => __( 'View', 'buddypress' ),
+ 'name' => _x( 'View', 'Profile sub nav', 'buddypress' ),
'slug' => 'public',
'parent_url' => $profile_link,
'parent_slug' => $bp->core->profile->slug,
Index: bp-core/bp-core-template.php
===================================================================
--- bp-core/bp-core-template.php (revision 8692)
+++ bp-core/bp-core-template.php (working copy)
@@ -383,21 +383,21 @@
$options = array();
if ( bp_is_active( 'xprofile' ) )
- $options['members'] = __( 'Members', 'buddypress' );
+ $options['members'] = _x( 'Members', 'search form', 'buddypress' );
if ( bp_is_active( 'groups' ) )
- $options['groups'] = __( 'Groups', 'buddypress' );
+ $options['groups'] = _x( 'Groups', 'search form', 'buddypress' );
if ( bp_is_active( 'blogs' ) && is_multisite() )
- $options['blogs'] = __( 'Blogs', 'buddypress' );
+ $options['blogs'] = _x( 'Blogs', 'search form', 'buddypress' );
if ( bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() && bp_forums_has_directory() )
- $options['forums'] = __( 'Forums', 'buddypress' );
+ $options['forums'] = _x( 'Forums', 'search form', 'buddypress' );
- $options['posts'] = __( 'Posts', 'buddypress' );
+ $options['posts'] = _x( 'Posts', 'search form', 'buddypress' );
// Eventually this won't be needed and a page will be built to integrate all search results.
- $selection_box = '<label for="search-which" class="accessibly-hidden">' . __( 'Search these:', 'buddypress' ) . '</label>';
+ $selection_box = '<label for="search-which" class="accessibly-hidden">' . _x( 'Search these:', 'search form', 'buddypress' ) . '</label>';
$selection_box .= '<select name="search-which" id="search-which" style="width: auto">';
$options = apply_filters( 'bp_search_form_type_select_options', $options );
Index: bp-friends/bp-friends-loader.php
===================================================================
--- bp-friends/bp-friends-loader.php (revision 8692)
+++ bp-friends/bp-friends-loader.php (working copy)
@@ -21,7 +21,7 @@
public function __construct() {
parent::start(
'friends',
- __( 'Friend Connections', 'buddypress' ),
+ _x( 'Friend Connections', 'Friends screen page <title>', 'buddypress' ),
buddypress()->plugin_dir,
array(
'adminbar_myaccount_order' => 60
@@ -137,7 +137,7 @@
// Add the subnav items to the friends nav item
$sub_nav[] = array(
- 'name' => __( 'Friendships', 'buddypress' ),
+ 'name' => _x( 'Friendships', 'Friends screen sub nav', 'buddypress' ),
'slug' => 'my-friends',
'parent_url' => $friends_link,
'parent_slug' => bp_get_friends_slug(),
@@ -147,7 +147,7 @@
);
$sub_nav[] = array(
- 'name' => __( 'Requests', 'buddypress' ),
+ 'name' => _x( 'Requests', 'Friends screen sub nav', 'buddypress' ),
'slug' => 'requests',
'parent_url' => $friends_link,
'parent_slug' => bp_get_friends_slug(),
@@ -182,11 +182,11 @@
// Pending friend requests
$count = count( friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) );
if ( !empty( $count ) ) {
- $title = sprintf( __( 'Friends <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
- $pending = sprintf( __( 'Pending Requests <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
+ $title = sprintf( _x( 'Friends <span class="count">%s</span>', 'My Account Friends menu', 'buddypress' ), number_format_i18n( $count ) );
+ $pending = sprintf( _x( 'Pending Requests <span class="count">%s</span>', 'My Account Friends menu sub nav', 'buddypress' ), number_format_i18n( $count ) );
} else {
- $title = __( 'Friends', 'buddypress' );
- $pending = __( 'No Pending Requests', 'buddypress' );
+ $title = _x( 'Friends', 'My Account Friends menu', 'buddypress' );
+ $pending = _x( 'No Pending Requests','My Account Friends menu sub nav', 'buddypress' );
}
// Add the "My Account" sub menus
@@ -197,11 +197,11 @@
'href' => trailingslashit( $friends_link )
);
- // My Groups
+ // My Friends
$wp_admin_nav[] = array(
'parent' => 'my-account-' . $this->id,
'id' => 'my-account-' . $this->id . '-friendships',
- 'title' => __( 'Friendships', 'buddypress' ),
+ 'title' => _x( 'Friendships', 'My Account Friends menu sub nav', 'buddypress' ),
'href' => trailingslashit( $friends_link )
);
Index: bp-friends/bp-friends-screens.php
===================================================================
--- bp-friends/bp-friends-screens.php (revision 8692)
+++ bp-friends/bp-friends-screens.php (working copy)
@@ -82,7 +82,7 @@
<thead>
<tr>
<th class="icon"></th>
- <th class="title"><?php _e( 'Friends', 'buddypress' ) ?></th>
+ <th class="title"><?php _ex( 'Friends', 'Friend settings on notification settings page', 'buddypress' ) ?></th>
<th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
<th class="no"><?php _e( 'No', 'buddypress' )?></th>
</tr>
@@ -91,13 +91,13 @@
<tbody>
<tr id="friends-notification-settings-request">
<td></td>
- <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
+ <td><?php _ex( 'A member sends you a friendship request', 'Friend settings on notification settings page', 'buddypress' ) ?></td>
<td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php checked( $send_requests, 'yes', true ) ?>/></td>
<td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php checked( $send_requests, 'no', true ) ?>/></td>
</tr>
<tr id="friends-notification-settings-accepted">
<td></td>
- <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
+ <td><?php _ex( 'A member accepts your friendship request', 'Friend settings on notification settings page', 'buddypress' ) ?></td>
<td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php checked( $accept_requests, 'yes', true ) ?>/></td>
<td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php checked( $accept_requests, 'no', true ) ?>/></td>
</tr>
Index: bp-groups/bp-groups-admin.php
===================================================================
--- bp-groups/bp-groups-admin.php (revision 8692)
+++ bp-groups/bp-groups-admin.php (working copy)
@@ -29,8 +29,8 @@
// Add our screen
$hook = add_menu_page(
- __( 'Groups', 'buddypress' ),
- __( 'Groups', 'buddypress' ),
+ _x( 'Groups', 'Admin Groups page title', 'buddypress' ),
+ _x( 'Groups', 'Admin Groups menu', 'buddypress' ),
'bp_moderate',
'bp-groups',
'bp_groups_admin',
Index: bp-groups/bp-groups-loader.php
===================================================================
--- bp-groups/bp-groups-loader.php (revision 8692)
+++ bp-groups/bp-groups-loader.php (working copy)
@@ -80,7 +80,7 @@
public function __construct() {
parent::start(
'groups',
- __( 'User Groups', 'buddypress' ),
+ _x( 'User Groups', 'Group screen page <title>', 'buddypress' ),
buddypress()->plugin_dir,
array(
'adminbar_myaccount_order' => 70
@@ -148,7 +148,7 @@
'has_directory' => true,
'directory_title' => _x( 'Groups', 'component directory title', 'buddypress' ),
'notification_callback' => 'groups_format_notifications',
- 'search_string' => __( 'Search Groups...', 'buddypress' ),
+ 'search_string' => _x( 'Search Groups...', 'Component directory search', 'buddypress' ),
'global_tables' => $global_tables,
'meta_tables' => $meta_tables,
);
@@ -243,11 +243,11 @@
// Preconfigured group creation steps
$this->group_creation_steps = apply_filters( 'groups_create_group_steps', array(
'group-details' => array(
- 'name' => __( 'Details', 'buddypress' ),
+ 'name' => _x( 'Details', 'Group screen nav', 'buddypress' ),
'position' => 0
),
'group-settings' => array(
- 'name' => __( 'Settings', 'buddypress' ),
+ 'name' => _x( 'Settings', 'Group screen nav', 'buddypress' ),
'position' => 10
)
) );
@@ -255,7 +255,7 @@
// If avatar uploads are not disabled, add avatar option
if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {
$this->group_creation_steps['group-avatar'] = array(
- 'name' => __( 'Profile Photo', 'buddypress' ),
+ 'name' => _x( 'Profile Photo', 'Group screen nav', 'buddypress' ),
'position' => 20
);
}
@@ -263,7 +263,7 @@
// If friends component is active, add invitations
if ( bp_is_active( 'friends' ) ) {
$this->group_creation_steps['group-invites'] = array(
- 'name' => __( 'Invites', 'buddypress' ),
+ 'name' => _x( 'Invites', 'Group screen nav', 'buddypress' ),
'position' => 30
);
}
@@ -330,9 +330,9 @@
if ( bp_is_user() ) {
$count = bp_get_total_group_count_for_user();
$class = ( 0 === $count ) ? 'no-count' : 'count';
- $nav_name = sprintf( __( 'Groups <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
+ $nav_name = sprintf( _x( 'Groups <span class="%s">%s</span>', 'Group screen nav with counter', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
} else {
- $nav_name = __( 'Groups', 'buddypress' );
+ $nav_name = _x( 'Groups', 'Group screen nav without counter', 'buddypress' );
}
// Add 'Groups' to the main navigation
@@ -401,7 +401,7 @@
// Add the "Home" subnav item, as this will always be present
$sub_nav[] = array(
- 'name' => _x( 'Home', 'Group home navigation title', 'buddypress' ),
+ 'name' => _x( 'Home', 'Group screen navigation title', 'buddypress' ),
'slug' => 'home',
'parent_url' => $group_link,
'parent_slug' => $this->current_group->slug,
@@ -421,7 +421,7 @@
) {
$sub_nav[] = array(
- 'name' => __( 'Request Membership', 'buddypress' ),
+ 'name' => _x( 'Request Membership','Group screen nav', 'buddypress' ),
'slug' => 'request-membership',
'parent_url' => $group_link,
'parent_slug' => $this->current_group->slug,
@@ -433,7 +433,7 @@
// Forums are enabled and turned on
if ( $this->current_group->enable_forum && bp_is_active( 'forums' ) ) {
$sub_nav[] = array(
- 'name' => __( 'Forum', 'buddypress' ),
+ 'name' => _x( 'Forum', 'My Group screen nav', 'buddypress' ),
'slug' => 'forum',
'parent_url' => $group_link,
'parent_slug' => $this->current_group->slug,
@@ -445,7 +445,7 @@
}
$sub_nav[] = array(
- 'name' => sprintf( __( 'Members <span>%s</span>', 'buddypress' ), number_format( $this->current_group->total_member_count ) ),
+ 'name' => sprintf( _x( 'Members <span>%s</span>', 'My Group screen nav', 'buddypress' ), number_format( $this->current_group->total_member_count ) ),
'slug' => 'members',
'parent_url' => $group_link,
'parent_slug' => $this->current_group->slug,
@@ -458,7 +458,7 @@
if ( bp_is_active( 'friends' ) && bp_groups_user_can_send_invites() ) {
$sub_nav[] = array(
- 'name' => __( 'Send Invites', 'buddypress' ),
+ 'name' => _x( 'Send Invites', 'My Group screen nav', 'buddypress' ),
'slug' => 'send-invites',
'parent_url' => $group_link,
'parent_slug' => $this->current_group->slug,
@@ -473,7 +473,7 @@
// If the user is a group admin, then show the group admin nav item
if ( bp_is_item_admin() ) {
$sub_nav[] = array(
- 'name' => __( 'Admin', 'buddypress' ),
+ 'name' => _x( 'Admin', 'My Group screen nav', 'buddypress' ),
'slug' => 'admin',
'parent_url' => $group_link,
'parent_slug' => $this->current_group->slug,
@@ -510,12 +510,12 @@
// Pending group invites
$count = groups_get_invite_count_for_user();
- $title = __( 'Groups', 'buddypress' );
- $pending = __( 'No Pending Invites', 'buddypress' );
+ $title = _x( 'Groups', 'My Account Groups', 'buddypress' );
+ $pending = _x( 'No Pending Invites', 'My Account Groups sub nav', 'buddypress' );
if ( !empty( $count['total'] ) ) {
- $title = sprintf( __( 'Groups <span class="count">%s</span>', 'buddypress' ), $count );
- $pending = sprintf( __( 'Pending Invites <span class="count">%s</span>', 'buddypress' ), $count );
+ $title = sprintf( _x( 'Groups <span class="count">%s</span>', 'My Account Groups nav', 'buddypress' ), $count );
+ $pending = sprintf( _x( 'Pending Invites <span class="count">%s</span>', 'My Account Groups sub nav', 'buddypress' ), $count );
}
// Add the "My Account" sub menus
@@ -530,7 +530,7 @@
$wp_admin_nav[] = array(
'parent' => 'my-account-' . $this->id,
'id' => 'my-account-' . $this->id . '-memberships',
- 'title' => __( 'Memberships', 'buddypress' ),
+ 'title' => _x( 'Memberships', 'My Account Groups sub nav', 'buddypress' ),
'href' => trailingslashit( $groups_link )
);
@@ -547,7 +547,7 @@
$wp_admin_nav[] = array(
'parent' => 'my-account-' . $this->id,
'id' => 'my-account-' . $this->id . '-create',
- 'title' => __( 'Create a Group', 'buddypress' ),
+ 'title' => _x( 'Create a Group', 'My Account Groups sub nav', 'buddypress' ),
'href' => trailingslashit( bp_get_groups_directory_permalink() . 'create' )
);
}
@@ -565,7 +565,7 @@
if ( bp_is_groups_component() ) {
if ( bp_is_my_profile() && !bp_is_single_item() ) {
- $bp->bp_options_title = __( 'Memberships', 'buddypress' );
+ $bp->bp_options_title = _x( 'Memberships', 'My Groups page <title>', 'buddypress' );
} else if ( !bp_is_my_profile() && !bp_is_single_item() ) {
$bp->bp_options_avatar = bp_core_fetch_avatar( array(
Index: bp-groups/bp-groups-screens.php
===================================================================
--- bp-groups/bp-groups-screens.php (revision 8692)
+++ bp-groups/bp-groups-screens.php (working copy)
@@ -933,7 +933,7 @@
<thead>
<tr>
<th class="icon"></th>
- <th class="title"><?php _e( 'Groups', 'buddypress' ) ?></th>
+ <th class="title"><?php _ex( 'Groups', 'Group settings on notification settings page', 'buddypress' ) ?></th>
<th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
<th class="no"><?php _e( 'No', 'buddypress' )?></th>
</tr>
@@ -942,25 +942,25 @@
<tbody>
<tr id="groups-notification-settings-invitation">
<td></td>
- <td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
+ <td><?php _ex( 'A member invites you to join a group', 'group settings on notification settings page','buddypress' ) ?></td>
<td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php checked( $group_invite, 'yes', true ) ?>/></td>
<td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php checked( $group_invite, 'no', true ) ?>/></td>
</tr>
<tr id="groups-notification-settings-info-updated">
<td></td>
- <td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
+ <td><?php _ex( 'Group information is updated', 'group settings on notification settings page', 'buddypress' ) ?></td>
<td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php checked( $group_update, 'yes', true ) ?>/></td>
<td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php checked( $group_update, 'no', true ) ?>/></td>
</tr>
<tr id="groups-notification-settings-promoted">
<td></td>
- <td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
+ <td><?php _ex( 'You are promoted to a group administrator or moderator', 'group settings on notification settings page', 'buddypress' ) ?></td>
<td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php checked( $group_promo, 'yes', true ) ?>/></td>
<td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php checked( $group_promo, 'no', true ) ?>/></td>
</tr>
<tr id="groups-notification-settings-request">
<td></td>
- <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
+ <td><?php _ex( 'A member requests to join a private group for which you are an admin', 'group settings on notification settings page', 'buddypress' ) ?></td>
<td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php checked( $group_request, 'yes', true ) ?>/></td>
<td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php checked( $group_request, 'no', true ) ?>/></td>
</tr>
@@ -1119,7 +1119,7 @@
*/
public function create_dummy_post() {
- $title = __( 'Groups', 'buddypress' );
+ $title = _x( 'Groups', 'Group creation page', 'buddypress' );
bp_theme_compat_reset_post( array(
'ID' => 0,
Index: bp-members/bp-members-loader.php
===================================================================
--- bp-members/bp-members-loader.php (revision 8692)
+++ bp-members/bp-members-loader.php (working copy)
@@ -217,7 +217,7 @@
// Setup the main navigation
$main_nav = array(
- 'name' => __( 'Profile', 'buddypress' ),
+ 'name' => _x( 'Profile', 'Member profile main navigation', 'buddypress' ),
'slug' => $bp->profile->slug,
'position' => 20,
'screen_function' => 'bp_members_screen_display_profile',
@@ -231,7 +231,7 @@
// Setup the subnav items for the member profile
$sub_nav[] = array(
- 'name' => __( 'View', 'buddypress' ),
+ 'name' => _x( 'View', 'Member profile view', 'buddypress' ),
'slug' => 'public',
'parent_url' => $profile_link,
'parent_slug' => $bp->profile->slug,
Index: bp-messages/bp-messages-template.php
===================================================================
--- bp-messages/bp-messages-template.php (revision 8692)
+++ bp-messages/bp-messages-template.php (working copy)
@@ -826,15 +826,15 @@
<select name="message-type-select" id="message-type-select">
<option value=""></option>
- <option value="read"><?php _e('Read', 'buddypress') ?></option>
- <option value="unread"><?php _e('Unread', 'buddypress') ?></option>
- <option value="all"><?php _e('All', 'buddypress') ?></option>
+ <option value="read"><?php _x('Read', 'Message dropdown filter', 'buddypress') ?></option>
+ <option value="unread"><?php _x('Unread', 'Message dropdown filter', 'buddypress') ?></option>
+ <option value="all"><?php _x('All', 'Message dropdown filter', 'buddypress') ?></option>
</select>
<?php if ( ! bp_is_current_action( 'sentbox' ) && bp_is_current_action( 'notices' ) ) : ?>
- <a href="#" id="mark_as_read"><?php _e('Mark as Read', 'buddypress') ?></a>
- <a href="#" id="mark_as_unread"><?php _e('Mark as Unread', 'buddypress') ?></a>
+ <a href="#" id="mark_as_read"><?php _x('Mark as Read', 'Message management markup', 'buddypress') ?></a>
+ <a href="#" id="mark_as_unread"><?php _x('Mark as Unread', 'Message management markup', 'buddypress') ?></a>
<?php endif; ?>
Index: bp-notifications/bp-notifications-loader.php
===================================================================
--- bp-notifications/bp-notifications-loader.php (revision 8692)
+++ bp-notifications/bp-notifications-loader.php (working copy)
@@ -23,7 +23,7 @@
public function __construct() {
parent::start(
'notifications',
- __( 'Notifications', 'buddypress' ),
+ _x( 'Notifications', 'Page <title>', 'buddypress' ),
buddypress()->plugin_dir,
array(
'adminbar_myaccount_order' => 30
@@ -107,9 +107,9 @@
if ( bp_is_user() && bp_user_has_access() ) {
$count = bp_notifications_get_unread_notification_count( bp_displayed_user_id() );
$class = ( 0 === $count ) ? 'no-count' : 'count';
- $nav_name = sprintf( __( 'Notifications <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
+ $nav_name = sprintf( _x( 'Notifications <span class="%s">%s</span>', 'Profile screen nav', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
} else {
- $nav_name = __( 'Notifications', 'buddypress' );
+ $nav_name = _x( 'Notifications', 'Profile screen nav', 'buddypress' );
}
// Add 'Notifications' to the main navigation
@@ -136,7 +136,7 @@
// Add the subnav items to the notifications nav item
$sub_nav[] = array(
- 'name' => __( 'Unread', 'buddypress' ),
+ 'name' => _x( 'Unread', 'Notification screen nav', 'buddypress' ),
'slug' => 'unread',
'parent_url' => $notifications_link,
'parent_slug' => bp_get_notifications_slug(),
@@ -147,7 +147,7 @@
);
$sub_nav[] = array(
- 'name' => __( 'Read', 'buddypress' ),
+ 'name' => _x( 'Read', 'Notification screen nav', 'buddypress' ),
'slug' => 'read',
'parent_url' => $notifications_link,
'parent_slug' => bp_get_notifications_slug(),
@@ -180,13 +180,12 @@
// Pending notification requests
$count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() );
- if ( ! empty( $count ) ) {
- $title = sprintf( __( 'Notifications <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
- $unread = sprintf( __( 'Unread <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
- } else {
- $title = __( 'Notifications', 'buddypress' );
- $unread = __( 'Unread', 'buddypress' );
- }
+ $title = sprintf( _x( 'Notifications <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), number_format_i18n( $count ) );
+ $unread = sprintf( _x( 'Unread <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), number_format_i18n( $count ) );
+ } else {
+ $title = _x( 'Notifications', 'My Account Notification', 'buddypress' );
+ $unread = _x( 'Unread', 'My Account Notification sub nav', 'buddypress' );
+ }
// Add the "My Account" sub menus
$wp_admin_nav[] = array(
@@ -250,4 +249,4 @@
function bp_setup_notifications() {
buddypress()->notifications = new BP_Notifications_Component();
}
-add_action( 'bp_setup_components', 'bp_setup_notifications', 6 );
+add_action( 'bp_setup_components', 'bp_setup_notifications', 6 );
\ No newline at end of file
Index: bp-notifications/bp-notifications-template.php
===================================================================
--- bp-notifications/bp-notifications-template.php (revision 8692)
+++ bp-notifications/bp-notifications-template.php (working copy)
@@ -792,7 +792,7 @@
// Start the output buffer
ob_start(); ?>
- <a href="<?php bp_the_notification_mark_unread_url(); ?>" class="mark-unread primary"><?php _e( 'Unread', 'buddypress' ); ?></a>
+ <a href="<?php bp_the_notification_mark_unread_url(); ?>" class="mark-unread primary"><?php _x( 'Unread', 'Notification screen action', 'buddypress' ); ?></a>
<?php $retval = ob_get_clean();
Index: bp-templates/bp-legacy/buddypress/members/single/groups/invites.php
===================================================================
--- bp-templates/bp-legacy/buddypress/members/single/groups/invites.php (revision 8692)
+++ bp-templates/bp-legacy/buddypress/members/single/groups/invites.php (working copy)
@@ -11,7 +11,7 @@
<a href="<?php bp_group_permalink(); ?>"><?php bp_group_avatar( 'type=thumb&width=50&height=50' ); ?></a>
</div>
- <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( _n( '1 member', '%d members', bp_get_group_total_members( false ), 'buddypress' ), bp_get_group_total_members( false ) ); ?></span></h4>
+ <h4><a href="<?php bp_group_permalink(); ?>"><?php bp_group_name(); ?></a><span class="small"> - <?php printf( _nx( '1 member', '%d members', bp_get_group_total_members( false ),'Group member count', 'buddypress' ), bp_get_group_total_members( false ) ); ?></span></h4>
<p class="desc">
<?php bp_group_description_excerpt(); ?>
Index: bp-xprofile/bp-xprofile-admin.php
===================================================================
--- bp-xprofile/bp-xprofile-admin.php (revision 8692)
+++ bp-xprofile/bp-xprofile-admin.php (working copy)
@@ -24,7 +24,7 @@
if ( !bp_current_user_can( 'bp_moderate' ) )
return false;
- add_users_page( __( 'Profile Fields', 'buddypress' ), __( 'Profile Fields', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
+ add_users_page( _x( 'Profile Fields', 'xProfile admin page title', 'buddypress' ), _x( 'Profile Fields', 'Admin Users menu', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
}
add_action( bp_core_admin_hook(), 'xprofile_add_admin_menu' );
@@ -68,7 +68,7 @@
<?php screen_icon( 'users' ); ?>
<h2>
- <?php _e( 'Profile Fields', 'buddypress'); ?>
+ <?php _ex( 'Profile Fields', 'Settings page header', 'buddypress'); ?>
<a id="add_group" class="add-new-h2" href="users.php?page=bp-profile-setup&mode=add_group"><?php _e( 'Add New Field Group', 'buddypress' ); ?></a>
</h2>
Index: bp-xprofile/bp-xprofile-loader.php
===================================================================
--- bp-xprofile/bp-xprofile-loader.php (revision 8692)
+++ bp-xprofile/bp-xprofile-loader.php (working copy)
@@ -38,7 +38,7 @@
public function __construct() {
parent::start(
'xprofile',
- __( 'Extended Profiles', 'buddypress' ),
+ _x( 'Extended Profiles', 'Component page <title>', 'buddypress' ),
buddypress()->plugin_dir,
array(
'adminbar_myaccount_order' => 20
@@ -110,15 +110,15 @@
$this->visibility_levels = array(
'public' => array(
'id' => 'public',
- 'label' => __( 'Everyone', 'buddypress' )
+ 'label' => _x( 'Everyone', 'Visibility level setting', 'buddypress' )
),
'adminsonly' => array(
'id' => 'adminsonly',
- 'label' => __( 'Only Me', 'buddypress' )
+ 'label' => _x( 'Only Me', 'Visibility level setting', 'buddypress' )
),
'loggedin' => array(
'id' => 'loggedin',
- 'label' => __( 'All Members', 'buddypress' )
+ 'label' => _x( 'All Members', 'Visibility level setting', 'buddypress' )
)
);
@@ -125,7 +125,7 @@
if ( bp_is_active( 'friends' ) ) {
$this->visibility_levels['friends'] = array(
'id' => 'friends',
- 'label' => __( 'My Friends', 'buddypress' )
+ 'label' => _x( 'My Friends', 'Visibility level setting', 'buddypress' )
);
}
@@ -165,7 +165,7 @@
// Add 'Profile' to the main navigation
$main_nav = array(
- 'name' => __( 'Profile', 'buddypress' ),
+ 'name' => _x( 'Profile', 'Profile header menu', 'buddypress' ),
'slug' => $this->slug,
'position' => 20,
'screen_function' => 'xprofile_screen_display_profile',
@@ -186,7 +186,7 @@
// Add the subnav items to the profile
$sub_nav[] = array(
- 'name' => __( 'View', 'buddypress' ),
+ 'name' => _x( 'Profile', 'Profile header menu', 'buddypress' ),
'slug' => 'public',
'parent_url' => $profile_link,
'parent_slug' => $this->slug,
@@ -196,7 +196,7 @@
// Edit Profile
$sub_nav[] = array(
- 'name' => __( 'Edit', 'buddypress' ),
+ 'name' => _x( 'Edit','Profile header sub menu', 'buddypress' ),
'slug' => 'edit',
'parent_url' => $profile_link,
'parent_slug' => $this->slug,
@@ -208,7 +208,7 @@
// Change Avatar
if ( buddypress()->avatar->show_avatars ) {
$sub_nav[] = array(
- 'name' => __( 'Change Profile Photo', 'buddypress' ),
+ 'name' => _x( 'Change Profile Photo', 'Profile header sub menu', 'buddypress' ),
'slug' => 'change-avatar',
'parent_url' => $profile_link,
'parent_slug' => $this->slug,
@@ -251,7 +251,7 @@
$settings_slug = bp_get_settings_slug();
bp_core_new_subnav_item( array(
- 'name' => __( 'Profile', 'buddypress' ),
+ 'name' => _x( 'Profile', 'Profile settings sub nav', 'buddypress' ),
'slug' => 'profile',
'parent_url' => trailingslashit( $user_domain . $settings_slug ),
'parent_slug' => $settings_slug,
@@ -280,7 +280,7 @@
$wp_admin_nav[] = array(
'parent' => $bp->my_account_menu_id,
'id' => 'my-account-' . $this->id,
- 'title' => __( 'Profile', 'buddypress' ),
+ 'title' => _x( 'Profile', 'My Account Profile', 'buddypress' ),
'href' => trailingslashit( $profile_link )
);
@@ -288,7 +288,7 @@
$wp_admin_nav[] = array(
'parent' => 'my-account-' . $this->id,
'id' => 'my-account-' . $this->id . '-public',
- 'title' => __( 'View', 'buddypress' ),
+ 'title' => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
'href' => trailingslashit( $profile_link . 'public' )
);
@@ -296,7 +296,7 @@
$wp_admin_nav[] = array(
'parent' => 'my-account-' . $this->id,
'id' => 'my-account-' . $this->id . '-edit',
- 'title' => __( 'Edit', 'buddypress' ),
+ 'title' => _x( 'Edit', 'My Account Profile sub nav', 'buddypress' ),
'href' => trailingslashit( $profile_link . 'edit' )
);
@@ -305,7 +305,7 @@
$wp_admin_nav[] = array(
'parent' => 'my-account-' . $this->id,
'id' => 'my-account-' . $this->id . '-change-avatar',
- 'title' => __( 'Change Profile Photo', 'buddypress' ),
+ 'title' => _x( 'Change Profile Photo', 'My Account Profile sub nav', 'buddypress' ),
'href' => trailingslashit( $profile_link . 'change-avatar' )
);
}
@@ -332,12 +332,12 @@
if ( bp_is_profile_component() ) {
if ( bp_is_my_profile() ) {
- $bp->bp_options_title = __( 'My Profile', 'buddypress' );
+ $bp->bp_options_title = _x( 'My Profile', 'Page title', 'buddypress' );
} else {
$bp->bp_options_avatar = bp_core_fetch_avatar( array(
'item_id' => bp_displayed_user_id(),
'type' => 'thumb',
- 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
+ 'alt' => sprintf( _x( 'Profile picture of %s', 'Avatar alt', 'buddypress' ), bp_get_displayed_user_fullname() )
) );
$bp->bp_options_title = bp_get_displayed_user_fullname();
}
@@ -362,7 +362,7 @@
$wp_admin_nav[] = array(
'parent' => 'my-account-' . buddypress()->settings->id,
'id' => 'my-account-' . buddypress()->settings->id . '-profile',
- 'title' => __( 'Profile', 'buddypress' ),
+ 'title' => _x( 'Profile', 'My Account Settings sub nav', 'buddypress' ),
'href' => trailingslashit( $settings_link . 'profile' )
);
@@ -376,4 +376,4 @@
if ( !isset( $bp->profile->id ) )
$bp->profile = new BP_XProfile_Component();
}
-add_action( 'bp_setup_components', 'bp_setup_xprofile', 2 );
+add_action( 'bp_setup_components', 'bp_setup_xprofile', 2 );
\ No newline at end of file