Ticket #5784: 5784.02.patch

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

@@ -596 +596 @@
                                                 <div id="post-body-content">
                                                         <div id="postdiv">
                                                                 <div id="bp_activity_action" class="postbox">
-                                                                        <h3><?php _e( 'Action', 'buddypress' ); ?></h3>
+                                                                        <h3><?php _ex( 'Action', 'Activity editor column header', 'buddypress' ); ?></h3>
                                                                         <div class="inside">
                                                                                 <?php wp_editor( stripslashes( $activity->action ), 'bp-activities-action', array( 'media_buttons' => false, 'textarea_rows' => 7, 'teeny' => true, 'quicktags' => array( 'buttons' => 'strong,em,link,block,del,ins,img,code,spell,close' ) ) ); ?>
                                                                         </div>
                                                                 </div>
 
                                                                 <div id="bp_activity_content" class="postbox">
-                                                                        <h3><?php _e( 'Content', 'buddypress' ); ?></h3>
+                                                                        <h3><?php _ex( 'Content', 'Activity editor column header', 'buddypress' ); ?></h3>
                                                                         <div class="inside">
                                                                                 <?php wp_editor( stripslashes( $activity->content ), 'bp-activities-content', array( 'media_buttons' => false, 'teeny' => true, 'quicktags' => array( 'buttons' => 'strong,em,link,block,del,ins,img,code,spell,close' ) ) ); ?>
                                                                         </div>
@@ -665 +665 @@
 
                                 <div class="misc-pub-section curtime misc-pub-section-last">
                                         <?php
-                                        // translators: Publish box date format, see http://php.net/date
-                                        $datef = __( 'M j, Y @ G:i', 'buddypress' );
+                                        // Publish box date format, see http://php.net/date
+                                        $datef = _x( 'M j, Y @ G:i', 'Publish box date format', 'buddypress' );
                                         $date  = date_i18n( $datef, strtotime( $item->date_recorded ) );
                                         ?>
-                                        <span id="timestamp"><?php printf( __( 'Submitted on: <strong>%1$s</strong>', 'buddypress' ), $date ); ?></span>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e( 'Edit', 'buddypress' ); ?></a>
+                                        <span id="timestamp"><?php printf( _x( 'Submitted on: <strong>%1$s</strong>', 'publishing action', 'buddypress' ), $date ); ?></span>&nbsp;<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e( 'Edit', 'buddypress' ); ?></a>
 
                                         <div id='timestampdiv' class='hide-if-js'>
                                                 <?php touch_time( 1, 0, 5 ); ?>
@@ -702 +702 @@
 function bp_activity_admin_edit_metabox_link( $item ) {
 ?>
 
-        <label class="screen-reader-text" for="bp-activities-link"><?php _e( 'Link', 'buddypress' ); ?></label>
+        <label class="screen-reader-text" for="bp-activities-link"><?php _ex( 'Link', 'Link metabox for the Activity admin edit screen', 'buddypress' ); ?></label>
         <input type="url" name="bp-activities-link" value="<?php echo esc_url( $item->primary_link ); ?>" />
         <p><?php _e( 'Activity generated by posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item.', 'buddypress' ); ?></p>
 
@@ -719 +719 @@
 function bp_activity_admin_edit_metabox_userid( $item ) {
 ?>
 
-        <label class="screen-reader-text" for="bp-activities-userid"><?php _e( 'Author ID', 'buddypress' ); ?></label>
+        <label class="screen-reader-text" for="bp-activities-userid"><?php _ex( 'Author ID', 'Activity admin edit screen', 'buddypress' ); ?></label>
         <input type="number" name="bp-activities-userid" value="<?php echo esc_attr( $item->user_id ); ?>" min="1" />
 
 <?php
@@ -813 +813 @@
 function bp_activity_admin_edit_metabox_itemids( $item ) {
 ?>
 
-        <label for="bp-activities-primaryid"><?php _e( 'Primary Item ID', 'buddypress' ); ?></label>
+        <label for="bp-activities-primaryid"><?php _ex( 'Primary Item ID', 'Primary item ID/Secondary item ID metabox for the Activity admin edit screen', 'buddypress' ); ?></label>
         <input type="number" name="bp-activities-primaryid" id="bp-activities-primaryid" value="<?php echo esc_attr( $item->item_id ); ?>" min="0" />
         <br />
 
-        <label for="bp-activities-secondaryid"><?php _e( 'Secondary Item ID', 'buddypress' ); ?></label>
+        <label for="bp-activities-secondaryid"><?php _ex( 'Secondary Item ID', 'Primary item ID/Secondary item ID metabox for the Activity admin edit screen.', 'buddypress' ); ?></label>
         <input type="number" name="bp-activities-secondaryid" id="bp-activities-secondaryid" value="<?php echo esc_attr( $item->secondary_item_id ); ?>" min="0" />
 
         <p><?php _e( 'These identify the object that created this activity. For example, the fields could reference a pair of site and comment IDs.', 'buddypress' ); ?></p>
@@ -873 +873 @@
                                 // Display each error as a list item
                                 foreach ( $errors as $error ) {
                                         // Translators: This is a bulleted list of item IDs
-                                        $error_msg .= '<li>' . sprintf( __( '#%s', 'buddypress' ), number_format_i18n( $error ) ) . '</li>';
+                                        $error_msg .= '<li>' . sprintf( _x( '#%s', 'is a bulleted list of item IDs', 'buddypress' ), number_format_i18n( $error ) ) . '</li>';
                                 }
 
                                 $error_msg  .= '</ul>';
@@ -931 +931 @@
                                 <td colspan="4">
                                         <form method="get" action="">
 
-                                                <h5 id="bp-replyhead"><?php _e( 'Reply to Activity', 'buddypress' ); ?></h5>
+                                                <h5 id="bp-replyhead"><?php _ex( 'Reply to Activity', 'Activity reply form', 'buddypress' ); ?></h5>
                                                 <?php wp_editor( '', 'bp-activities', array( 'dfw' => false, 'media_buttons' => false, 'quicktags' => array( 'buttons' => 'strong,em,link,block,del,ins,img,code,spell,close' ), 'tinymce' => false, ) ); ?>
 
                                                 <p id="bp-replysubmit" class="submit">

src/bp-activity/bp-activity-filters.php

@@ -382 +382 @@
 
         // Run the text through the excerpt function. If it's too short, the original text will be
         // returned.
+        // translators: the excerpt ending 
         $excerpt        = bp_create_excerpt( $text, $excerpt_length, array( 'ending' => __( '…', 'buddypress' ) ) );
 
         // If the text returned by bp_create_excerpt() is different from the original text (ie it's
@@ -564 +565 @@
         }
 
         $strings = array_merge( $strings, array(
-                'newest' => __( 'Load Newest', 'buddypress' ),
+                'newest' => _x( 'Load Newest', 'Activity heartbeat', 'buddypress' ),
                 'pulse'  => absint( $pulse ),
         ) );
 

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

@@ -817 +817 @@
         }
 
         // Setup the strings
-        $unknown_text   = apply_filters( 'bp_core_time_since_unknown_text',   __( 'sometime',  'buddypress' ) );
-        $right_now_text = apply_filters( 'bp_core_time_since_right_now_text', __( 'right now', 'buddypress' ) );
-        $ago_text       = apply_filters( 'bp_core_time_since_ago_text',       __( '%s ago',    'buddypress' ) );
+        $unknown_text   = apply_filters( 'bp_core_time_since_unknown_text',   _x( 'sometime', 'BP time_since calculation:  synonym of unknow', 'buddypress' ) );
+        $right_now_text = apply_filters( 'bp_core_time_since_right_now_text', _x( 'right now', 'BP time_since calculation', 'buddypress' ) );
+        $ago_text       = apply_filters( 'bp_core_time_since_ago_text',       _x( '%s ago', 'BP time_since calculation', 'buddypress' ) );
 
         // array of time period chunks
         $chunks = array(
@@ -1115 +1115 @@
 
         // Setup a default string if none was passed
         $string = empty( $string )
-                ? __( '%s', 'buddypress' )
+                ? _x( '%s', 'Format of last activity time of the form 3 years ago', 'buddypress' )
                 : $string;
 
         // Use the string if a last activity date was passed

src/bp-core/bp-core-template.php

@@ -294 +294 @@
                 $time = date_i18n( get_option( 'time_format' ), $time_offset );
 
                 // Return string formatted with date and time
-                $date = sprintf( __( '%1$s at %2$s', 'buddypress' ), $date, $time );
+                $date = sprintf( _x( '%1$s at %2$s', 'Date and time. Used by bp_format_time', 'buddypress' ), $date, $time );
         }
 
         return apply_filters( 'bp_format_time', $date );
@@ -539 +539 @@
         $filter_shortcodes_default = is_bool( $options ) ? $options : true;
 
         $r = bp_parse_args( $options, array(
-                'ending'            => __( ' […]', 'buddypress' ),
+                'ending'            => _x( ' […]', 'exerpt ending text. Use space[...]', 'buddypress' ),
                 'exact'             => false,
                 'html'              => true,
                 'filter_shortcodes' => $filter_shortcodes_default

src/bp-core/bp-core-widgets.php

@@ -79 +79 @@
                         <?php do_action( 'bp_before_login_widget_loggedout' ); ?>
 
                         <form name="bp-login-form" id="bp-login-widget-form" class="standard-form" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
-                                <label for="bp-login-widget-user-login"><?php _e( 'Username', 'buddypress' ); ?></label>
+                                <label for="bp-login-widget-user-login"><?php _ex( 'Username', 'Login widget', 'buddypress' ); ?></label>
                                 <input type="text" name="log" id="bp-login-widget-user-login" class="input" value="" />
 
-                                <label for="bp-login-widget-user-pass"><?php _e( 'Password', 'buddypress' ); ?></label>
+                                <label for="bp-login-widget-user-pass"><?php _ex( 'Password', 'Login widget', 'buddypress' ); ?></label>
                                 <input type="password" name="pwd" id="bp-login-widget-user-pass" class="input" value=""  />
 
-                                <div class="forgetmenot"><label><input name="rememberme" type="checkbox" id="bp-login-widget-rememberme" value="forever" /> <?php _e( 'Remember Me', 'buddypress' ); ?></label></div>
+                                <div class="forgetmenot"><label><input name="rememberme" type="checkbox" id="bp-login-widget-rememberme" value="forever" /> <?php _ex( 'Remember Me', 'Login widget', 'buddypress' ); ?></label></div>
 
-                                <input type="submit" name="wp-submit" id="bp-login-widget-submit" value="<?php esc_attr_e( 'Log In', 'buddypress' ); ?>" />
+                                <input type="submit" name="wp-submit" id="bp-login-widget-submit" value="<?php echo esc_attr_x( 'Log In', 'Login widget', 'buddypress' ); ?>" />
 
                                 <?php if ( bp_get_signup_allowed() ) : ?>
 
-                                        <span class="bp-login-widget-register-link"><?php printf( __( '<a href="%s" title="Register for a new account">Register</a>', 'buddypress' ), bp_get_signup_page() ); ?></span>
+                                        <span class="bp-login-widget-register-link"><?php printf( _x( '<a href="%s" title="Register for a new account">Register</a>', 'Login widget', 'buddypress' ), bp_get_signup_page() ); ?></span>
 
                                 <?php endif; ?>
 

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

@@ -1010 +1010 @@
 
                         $matches[] = array(
                                 // translators: 1: user_login, 2: user_email
-                                'label' => sprintf( __( '%1$s (%2$s)', 'buddypress' ), $user->name, $user->ID ),
+                                'label' => sprintf( _x( '%1$s (%2$s)', '1 is user_login, 2 is user_email', 'buddypress' ), $user->name, $user->ID ),
                                 'value' => $user->ID,
                         );
                 }

src/bp-templates/bp-legacy/buddypress/members/register.php

@@ -29 +29 @@
 
                                 <h4><?php _e( 'Account Details', 'buddypress' ); ?></h4>
 
-                                <label for="signup_username"><?php _e( 'Username', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
+                                <label for="signup_username"><?php _ex( 'Username', 'Basic Account Details', 'buddypress' ); ?> <?php _ex( '(required)', 'Basic Account Details', 'buddypress' ); ?></label>
                                 <?php do_action( 'bp_signup_username_errors' ); ?>
                                 <input type="text" name="signup_username" id="signup_username" value="<?php bp_signup_username_value(); ?>" />
 
-                                <label for="signup_email"><?php _e( 'Email Address', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
+                                <label for="signup_email"><?php _ex( 'Email Address', 'Basic Account Details', 'buddypress' ); ?> <?php _ex( '(required)', 'Basic Account Details', 'buddypress' ); ?></label>
                                 <?php do_action( 'bp_signup_email_errors' ); ?>
                                 <input type="text" name="signup_email" id="signup_email" value="<?php bp_signup_email_value(); ?>" />
 
-                                <label for="signup_password"><?php _e( 'Choose a Password', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
+                                <label for="signup_password"><?php _ex( 'Choose a Password', 'Basic Account Details', 'buddypress' ); ?> <?php _ex( '(required)', 'Basic Account Details', 'buddypress' ); ?></label>
                                 <?php do_action( 'bp_signup_password_errors' ); ?>
                                 <input type="password" name="signup_password" id="signup_password" value="" class="password-entry" />
                                 <div id="pass-strength-result"></div>
 
-                                <label for="signup_password_confirm"><?php _e( 'Confirm Password', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
+                                <label for="signup_password_confirm"><?php _ex( 'Confirm Password', 'Basic Account Details', 'buddypress' ); ?> <?php _ex( '(required)', 'Basic Account Details', 'buddypress' ); ?></label>
                                 <?php do_action( 'bp_signup_password_confirm_errors' ); ?>
                                 <input type="password" name="signup_password_confirm" id="signup_password_confirm" value="" class="password-entry-confirm" />
 
@@ -60 +60 @@
 
                                 <div class="register-section" id="profile-details-section">
 
-                                        <h4><?php _e( 'Profile Details', 'buddypress' ); ?></h4>
+                                        <h4><?php _ex( 'Profile Details', 'Profile Details screen title', 'buddypress' ); ?></h4>
 
                                         <?php /* Use the profile field loop to render input fields for the 'base' profile field group */ ?>
                                         <?php if ( bp_is_active( 'xprofile' ) ) : if ( bp_has_profile( array( 'profile_group_id' => 1, 'fetch_field_data' => false ) ) ) : while ( bp_profile_groups() ) : bp_the_profile_group(); ?>
@@ -77 +77 @@
 
                                                         if ( bp_current_user_can( 'bp_xprofile_change_field_visibility' ) ) : ?>
                                                                 <p class="field-visibility-settings-toggle" id="field-visibility-settings-toggle-<?php bp_the_profile_field_id() ?>">
-                                                                        <?php printf( __( 'This field can be seen by: <span class="current-visibility-level">%s</span>', 'buddypress' ), bp_get_the_profile_field_visibility_level_label() ) ?> <a href="#" class="visibility-toggle-link"><?php _ex( 'Change', 'Change profile field visibility level', 'buddypress' ); ?></a>
+                                                                        <?php printf( _x( 'This field can be seen by: <span class="current-visibility-level">%s</span>', 'Profile field visibility', 'buddypress' ), bp_get_the_profile_field_visibility_level_label() ) ?> <a href="#" class="visibility-toggle-link"><?php _ex( 'Change', 'Change profile field visibility level', 'buddypress' ); ?></a>
                                                                 </p>
 
                                                                 <div class="field-visibility-settings" id="field-visibility-settings-<?php bp_the_profile_field_id() ?>">
                                                                         <fieldset>
-                                                                                <legend><?php _e( 'Who can see this field?', 'buddypress' ) ?></legend>
+                                                                                <legend><?php _ex( 'Who can see this field?', 'Profile field visibility', 'buddypress' ) ?></legend>
 
                                                                                 <?php bp_profile_visibility_radio_buttons() ?>
 
                                                                         </fieldset>
-                                                                        <a class="field-visibility-settings-close" href="#"><?php _e( 'Close', 'buddypress' ) ?></a>
+                                                                        <a class="field-visibility-settings-close" href="#"><?php _ex( 'Close', 'Profile field visibility', 'buddypress' ) ?></a>
 
                                                                 </div>
                                                         <?php else : ?>
                                                                 <p class="field-visibility-settings-notoggle" id="field-visibility-settings-toggle-<?php bp_the_profile_field_id() ?>">
-                                                                        <?php printf( __( 'This field can be seen by: <span class="current-visibility-level">%s</span>', 'buddypress' ), bp_get_the_profile_field_visibility_level_label() ) ?>
+                                                                        <?php printf( _x( 'This field can be seen by: <span class="current-visibility-level">%s</span>', 'Profile field visibility', 'buddypress' ), bp_get_the_profile_field_visibility_level_label() ) ?>
                                                                 </p>
                                                         <?php endif ?>
 
@@ -124 +124 @@
 
                                 <div class="register-section" id="blog-details-section">
 
-                                        <h4><?php _e( 'Blog Details', 'buddypress' ); ?></h4>
+                                        <h4><?php _ex( 'Blog Details', 'Blog creation screen title', 'buddypress' ); ?></h4>
 
-                                        <p><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes, I\'d like to create a new site', 'buddypress' ); ?></p>
+                                        <p><input type="checkbox" name="signup_with_blog" id="signup_with_blog" value="1"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _ex( 'Yes, I\'d like to create a new site', 'Blog creation', 'buddypress' ); ?></p>
 
                                         <div id="blog-details"<?php if ( (int) bp_get_signup_with_blog_value() ) : ?>class="show"<?php endif; ?>>
 
-                                                <label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
+                                                <label for="signup_blog_url"><?php _ex( 'Blog URL', 'Blog creation', 'buddypress' ); ?> <?php _ex( '(required)', 'Blog creation', 'buddypress' ); ?></label>
                                                 <?php do_action( 'bp_signup_blog_url_errors' ); ?>
 
                                                 <?php if ( is_subdomain_install() ) : ?>
@@ -139 +139 @@
                                                         <?php echo home_url( '/' ); ?> <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value(); ?>" />
                                                 <?php endif; ?>
 
-                                                <label for="signup_blog_title"><?php _e( 'Site Title', 'buddypress' ); ?> <?php _e( '(required)', 'buddypress' ); ?></label>
+                                                <label for="signup_blog_title"><?php _ex( 'Site Title', 'Blog creation', 'buddypress' ); ?> <?php _ex( '(required)', 'Blog creation', 'buddypress' ); ?></label>
                                                 <?php do_action( 'bp_signup_blog_title_errors' ); ?>
                                                 <input type="text" name="signup_blog_title" id="signup_blog_title" value="<?php bp_signup_blog_title_value(); ?>" />
 
-                                                <span class="label"><?php _e( 'I would like my site to appear in search engines, and in public listings around this network.', 'buddypress' ); ?></span>
+                                                <span class="label"><?php _ex( 'I would like my site to appear in search engines, and in public listings around this network.', 'Blog creation', 'buddypress' ); ?></span>
                                                 <?php do_action( 'bp_signup_blog_privacy_errors' ); ?>
 
                                                 <label><input type="radio" name="signup_blog_privacy" id="signup_blog_privacy_public" value="public"<?php if ( 'public' == bp_get_signup_blog_privacy_value() || !bp_get_signup_blog_privacy_value() ) : ?> checked="checked"<?php endif; ?> /> <?php _e( 'Yes', 'buddypress' ); ?></label>
@@ -162 +162 @@
                         <?php do_action( 'bp_before_registration_submit_buttons' ); ?>
 
                         <div class="submit">
-                                <input type="submit" name="signup_submit" id="signup_submit" value="<?php esc_attr_e( 'Complete Sign Up', 'buddypress' ); ?>" />
+                                <input type="submit" name="signup_submit" id="signup_submit" value="<?php echo esc_attr_x( 'Complete Sign Up', 'Blog creation', 'buddypress' ); ?>" />
                         </div>
 
                         <?php do_action( 'bp_after_registration_submit_buttons' ); ?>