Changeset 12104 for trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php

Timestamp:

05/21/2018 01:00:36 AM (8 years ago)

Author:

djpaul

Message:

Templates, Nouveau: string improvements

File:

• trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php (modified) (7 diffs)

trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php

@@ -312 +312 @@
                                 'link_text' => sprintf(
                                         '<span class="bp-screen-reader-text">%1$s</span>',
-                                        esc_html__( 'View Conversation', 'buddypress' )
+                                        __( 'View Conversation', 'buddypress' )
                                 ),
                         );
@@ -340 +340 @@
                                         'id'              => 'acomment-comment-' . $activity_id,
                                         'class'           => 'button acomment-reply bp-primary-action bp-tooltip',
-                                        'data-bp-tooltip' => __( 'Comment', 'buddypress' ),
+                                        'data-bp-tooltip' => _x( 'Comment', 'button', 'buddypress' ),
                                         'aria-expanded'   => 'false',
                                 ),
                                 'link_text'  => sprintf(
                                         '<span class="bp-screen-reader-text">%1$s</span> <span class="comment-count">%2$s</span>',
-                                        esc_html__( 'Comment', 'buddypress' ),
+                                        _x( 'Comment', 'link', 'buddypress' ),
                                         esc_html( bp_activity_get_comment_count() )
                                 ),
@@ -454 +454 @@
                                 'link_class'      => 'button item-button bp-secondary-action bp-tooltip delete-activity confirm',
                                 'link_rel'        => 'nofollow',
-                                'data_bp_tooltip' => __( 'Delete', 'buddypress' ),
-                                'link_text'       => __( 'Delete', 'buddypress' ),
+                                'data_bp_tooltip' => _x( 'Delete', 'button', 'buddypress' ),
+                                'link_text'       => _x( 'Delete', 'button', 'buddypress' ),
                                 'link_href'       => bp_get_activity_delete_url(),
                         );
@@ -499 +499 @@
                                 'button_attr'       => array(
                                         'class'           => 'bp-secondary-action spam-activity confirm button item-button bp-tooltip',
-                                        'id'              =>  'activity_make_spam_' . $activity_id,
-                                        'data-bp-tooltip' =>  __( 'Spam', 'buddypress' ),
+                                        'id'              => 'activity_make_spam_' . $activity_id,
+                                        'data-bp-tooltip' => _x( 'Spam', 'button', 'buddypress' ),
                                         ),
                                 'link_text'  => sprintf(
                                         /** @todo: use a specific css rule for this *************************************************************/
                                         '<span class="dashicons dashicons-flag" style="color:#a00;vertical-align:baseline;width:18px;height:18px" aria-hidden="true"></span><span class="bp-screen-reader-text">%s</span>',
-                                        esc_html__( 'Spam', 'buddypress' )
+                                        esc_html_x( 'Spam', 'button', 'buddypress' )
                                 ),
                         );
@@ -795 +795 @@
                                 'parent_attr'       => $parent_attr,
                                 'button_element'    => $button_element,
-                                'link_text'         => __( 'Reply', 'buddypress' ),
-                                'button_attr'       =>  array(
+                                'link_text'         => _x( 'Reply', 'link', 'buddypress' ),
+                                'button_attr'       => array(
                                         'class' => "acomment-reply bp-primary-action",
                                         'id'    => sprintf( 'acomment-reply-%1$s-from-%2$s', $activity_id, $activity_comment_id ),
@@ -809 +809 @@
                                 'parent_attr'       => $parent_attr,
                                 'button_element'    => $button_element,
-                                'link_text'         => __( 'Delete', 'buddypress' ),
+                                'link_text'         => _x( 'Delete', 'link', 'buddypress' ),
                                 'button_attr'       => array(
                                         'class' => 'delete acomment-delete confirm bp-secondary-action',
                                         'rel'   => 'nofollow',
-                                        ),
+                                ),
                         ),
                 );
@@ -836 +836 @@
                                 'parent_attr'       => $parent_attr,
                                 'button_element'    => $button_element,
-                                'link_text'         => __( 'Spam', 'buddypress' ),
+                                'link_text'         => _x( 'Spam', 'link', 'buddypress' ),
                                 'button_attr'       => array(
                                         'id'     => "activity_make_spam_{$activity_comment_id}",