Changeset 12791

Timestamp:

11/19/2020 12:33:58 PM (4 years ago)

Author:

imath

Message:

i18n: improve translator comments for the "Active %s" string

Make sure the same translator comment is used for every occurrences of this string.

Fixes #8398

Location:

trunk

Files:

• src/bp-blogs/bp-blogs-template.php (modified) (1 diff)
• src/bp-core/bp-core-functions.php (modified) (2 diffs)
• src/bp-core/classes/class-bp-core-user.php (modified) (1 diff)
• src/bp-groups/bp-groups-blocks.php (modified) (1 diff)
• src/bp-groups/bp-groups-widgets.php (modified) (1 diff)
• src/bp-groups/classes/class-bp-groups-invite-template.php (modified) (1 diff)
• src/bp-groups/classes/class-bp-groups-widget.php (modified) (1 diff)
• src/bp-members/bp-members-blocks.php (modified) (1 diff)
• src/bp-members/bp-members-template.php (modified) (2 diffs)
• src/bp-templates/bp-legacy/buddypress/groups/groups-loop.php (modified) (1 diff)
• src/bp-templates/bp-legacy/buddypress/groups/single/cover-image-header.php (modified) (1 diff)
• src/bp-templates/bp-legacy/buddypress/groups/single/group-header.php (modified) (1 diff)
• src/bp-templates/bp-nouveau/buddypress/groups/groups-loop.php (modified) (1 diff)
• src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php (modified) (1 diff)
• src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php (modified) (1 diff)
• tests/phpunit/testcases/blogs/template.php (modified) (2 diffs)
• tests/phpunit/testcases/members/template.php (modified) (2 diffs)

trunk/src/bp-blogs/bp-blogs-template.php

@@ -639 +639 @@
         if ( true === $r['active_format'] ) {
             /* translators: %s: human time diff of the last time the site was active. */
-            $r['active_format'] = _x( 'active %s', 'last time the site was active', 'buddypress' );
+            $r['active_format'] = _x( 'Active %s', 'last time the site was active', 'buddypress' );
         }
 

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

@@ -1576 +1576 @@
  *
  * @param int|string $last_activity_date The date of last activity.
- * @param string     $string             A sprintf()-able statement of the form 'active %s'.
+ * @param string     $string             A sprintf()-able statement of the form 'Active %s'.
  * @return string $last_active A string of the form '3 years ago'.
  */
@@ -1598 +1598 @@
      * @param string $last_active        Last activity string based on time since date given.
      * @param string $last_activity_date The date of last activity.
-     * @param string $string             A sprintf()-able statement of the form 'active %s'.
+     * @param string $string             A sprintf()-able statement of the form 'Active %s'.
      */
     return apply_filters( 'bp_core_get_last_activity', $last_active, $last_activity_date, $string );

trunk/src/bp-core/classes/class-bp-core-user.php

@@ -206 +206 @@
 
         /* translators: %s: human time diff of the last time the user was active on the site. */
-        $this->last_active = bp_core_get_last_activity( bp_get_user_last_activity( $this->id ), _x( 'active %s', 'last time the user was active', 'buddypress' ) );
+        $this->last_active = bp_core_get_last_activity( bp_get_user_last_activity( $this->id ), _x( 'Active %s', 'last time the user was active', 'buddypress' ) );
     }
 

trunk/src/bp-groups/bp-groups-blocks.php

@@ -304 +304 @@
                 '<time datetime="%1$s">%2$s</time>',
                 esc_attr( bp_core_get_iso8601_date( $group->last_activity ) ),
-                /* translators: %s: a human time diff. */
+                /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
                 sprintf( esc_html__( 'Active %s', 'buddypress' ), bp_get_group_last_active( $group ) )
             );

trunk/src/bp-groups/bp-groups-widgets.php

@@ -77 +77 @@
                             <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>">
                                 <?php
-                                /* translators: %s: last activity timestamp (e.g. "active 1 hour ago") */
-                                printf( _x( 'active %s', 'last time the group was active', 'buddypress' ), bp_get_group_last_active() );
+                                /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
+                                printf( _x( 'Active %s', 'last time the group was active', 'buddypress' ), bp_get_group_last_active() );
                                 ?>
                             </span>

trunk/src/bp-groups/classes/class-bp-groups-invite-template.php

@@ -276 +276 @@
         $this->invite->user->user_link = "<a href='{$this->invite->user->user_url}'>{$this->invite->user->fullname}</a>";
 
-        /* translators: %s: last activity timestamp (e.g. "active 1 hour ago") */
-        $this->invite->user->last_active = bp_core_get_last_activity( $this->invite->user->last_activity, __( 'active %s', 'buddypress' ) );
+        /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
+        $this->invite->user->last_active = bp_core_get_last_activity( $this->invite->user->last_activity, __( 'Active %s', 'buddypress' ) );
 
         if ( bp_is_active( 'groups' ) ) {

trunk/src/bp-groups/classes/class-bp-groups-widget.php

@@ -150 +150 @@
                                         bp_group_member_count();
                                     } else {
-                                        /* translators: %s: last activity timestamp (e.g. "active 1 hour ago") */
-                                        printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() );
+                                        /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
+                                        printf( __( 'Active %s', 'buddypress' ), bp_get_group_last_active() );
                                     }
                                 ?>

trunk/src/bp-members/bp-members-blocks.php

@@ -333 +333 @@
                     '<time datetime="%1$s">%2$s</time>',
                     esc_attr( bp_core_get_iso8601_date( $member->last_activity ) ),
-                    /* translators: %s: a human time diff. */
+                    /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
                     sprintf( esc_html__( 'Active %s', 'buddypress' ), bp_core_time_since( $member->last_activity ) )
                 );

trunk/src/bp-members/bp-members-template.php

@@ -956 +956 @@
         // Backwards compatibility for anyone forcing a 'true' active_format.
         if ( true === $r['active_format'] ) {
-            $r['active_format'] = __( 'active %s', 'buddypress' );
+            /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
+            $r['active_format'] = __( 'Active %s', 'buddypress' );
         }
 
@@ -1687 +1688 @@
     function bp_get_last_activity( $user_id = 0 ) {
 
-        if ( empty( $user_id ) )
+        if ( empty( $user_id ) ) {
             $user_id = bp_displayed_user_id();
-
-        $last_activity = bp_core_get_last_activity( bp_get_user_last_activity( $user_id ), __('active %s', 'buddypress') );
+        }
+
+        /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
+        $last_activity = bp_core_get_last_activity( bp_get_user_last_activity( $user_id ), __('Active %s', 'buddypress') );
 
         /**

trunk/src/bp-templates/bp-legacy/buddypress/groups/groups-loop.php

@@ -65 +65 @@
             <div class="item">
                 <div class="item-title"><?php bp_group_link(); ?></div>
-                <div class="item-meta"><span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></span></div>
+                <div class="item-meta">
+                    <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>">
+                        <?php
+                        /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
+                        printf( __( 'Active %s', 'buddypress' ), bp_get_group_last_active() );
+                        ?>
+                    </span>
+                </div>
 
                 <div class="item-desc"><?php bp_group_description_excerpt(); ?></div>

trunk/src/bp-templates/bp-legacy/buddypress/groups/single/cover-image-header.php

@@ -61 +61 @@
 
                 <span class="highlight"><?php bp_group_type(); ?></span>
-                <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></span>
+                <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>">
+                    <?php
+                    /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
+                    printf( __( 'Active %s', 'buddypress' ), bp_get_group_last_active() );
+                    ?>
+                </span>
 
                 <?php bp_group_description(); ?>

trunk/src/bp-templates/bp-legacy/buddypress/groups/single/group-header.php

@@ -70 +70 @@
 <div id="item-header-content">
     <span class="highlight"><?php bp_group_type(); ?></span>
-    <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>"><?php printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() ); ?></span>
+    <span class="activity" data-livestamp="<?php bp_core_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ); ?>">
+        <?php
+        /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
+        printf( __( 'Active %s', 'buddypress' ), bp_get_group_last_active() );
+        ?>
+    </span>
 
     <?php

trunk/src/bp-templates/bp-nouveau/buddypress/groups/groups-loop.php

@@ -45 +45 @@
                                 <?php
                                     printf(
-                                        /* translators: %s: last activity timestamp (e.g. "active 1 hour ago") */
+                                        /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
                                         esc_html__( 'Active %s', 'buddypress' ),
                                         sprintf(

trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/cover-image-header.php

@@ -32 +32 @@
                     <?php
                         printf(
-                            /* translators: %s: last activity timestamp (e.g. "active 1 hour ago") */
+                            /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
                             esc_html__( 'Active %s', 'buddypress' ),
                             sprintf(

trunk/src/bp-templates/bp-nouveau/buddypress/groups/single/group-header.php

@@ -29 +29 @@
         <?php
             printf(
-                /* translators: %s: last activity timestamp (e.g. "active 1 hour ago") */
+                /* translators: %s: last activity timestamp (e.g. "Active 1 hour ago") */
                 esc_html__( 'Active %s', 'buddypress' ),
                 sprintf(

trunk/tests/phpunit/testcases/blogs/template.php

@@ -17 +17 @@
         $blogs_template->blog->last_activity = $time;
 
-        $this->assertEquals( bp_core_get_last_activity( $time, __( 'active %s', 'buddypress' ) ), bp_get_blog_last_active() );
+        $this->assertEquals( bp_core_get_last_activity( $time, __( 'Active %s', 'buddypress' ) ), bp_get_blog_last_active() );
 
         $blogs_template->blog = null;
@@ -34 +34 @@
         $blogs_template->blog->last_activity = $time;
 
-        $this->assertEquals( bp_core_get_last_activity( $time, __( 'active %s', 'buddypress' ) ), bp_get_blog_last_active( array( 'active_format' => true, ) ) );
+        $this->assertEquals( bp_core_get_last_activity( $time, __( 'Active %s', 'buddypress' ) ), bp_get_blog_last_active( array( 'active_format' => true, ) ) );
 
         $blogs_template->blog = null;

trunk/tests/phpunit/testcases/members/template.php

@@ -235 +235 @@
         $members_template->member->last_activity = $time;
 
-        $this->assertEquals( bp_core_get_last_activity( $time, __( 'active %s', 'buddypress' ) ), bp_get_member_last_active() );
+        $this->assertEquals( bp_core_get_last_activity( $time, __( 'Active %s', 'buddypress' ) ), bp_get_member_last_active() );
     }
 
@@ -250 +250 @@
         $members_template->member->last_activity = $time;
 
-        $this->assertEquals( bp_core_get_last_activity( $time, __( 'active %s', 'buddypress' ) ), bp_get_member_last_active( array( 'active_format' => true, ) ) );
+        $this->assertEquals( bp_core_get_last_activity( $time, __( 'Active %s', 'buddypress' ) ), bp_get_member_last_active( array( 'active_format' => true, ) ) );
     }