Changeset 55279

Timestamp:

02/07/2023 05:26:14 PM (18 months ago)

Author:

audrasjb

Message:

I18N: Introduce word_count_type property to WP_Locale.

This changesets adds a word_count_type property, so that it does not need to be translated separately across multiple projects.

List of changes:

• New property: WP_Locale::word_count_type.
• New method: WP_Locale::get_word_count_type().
• New function: wp_get_word_count_type() as a wrapper for WP_Locale::get_word_count_type().
• All _x( 'words', 'Word count type. Do not translate!' ) strings have been replaced with a call to wp_get_word_count_type().

Props pedromendonca, desrosj, costdev, mukesh27, johnbillion.
Fixes #56698.

Location:

trunk

Files:

• src/wp-includes/class-wp-locale.php (modified) (3 diffs)
• src/wp-includes/formatting.php (modified) (1 diff)
• src/wp-includes/l10n.php (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/phpunit/tests/locale.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-locale.php

@@ -112 +112 @@
      */
     public $list_item_separator;
+
+
+
+
+
+
+
+
+
+
 
     /**
@@ -237 +247 @@
             $this->text_direction = 'rtl';
         }
+
+
+
     }
 
@@ -397 +410 @@
         return $this->list_item_separator;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/src/wp-includes/formatting.php

@@ -3946 +3946 @@
     $num_words     = (int) $num_words;
 
-    /*
-     * translators: If your word count is based on single characters (e.g. East Asian characters),
-     * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
-     * Do not translate into your own language.
-     */
-    if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
+    if ( str_starts_with( wp_get_word_count_type(), 'characters' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
         $text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
         preg_match_all( '/./u', $text, $words_array );

trunk/src/wp-includes/l10n.php

@@ -1810 +1810 @@
     return $wp_locale->get_list_item_separator();
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-includes/script-loader.php

@@ -1832 +1832 @@
         'wordCountL10n',
         array(
-            /*
-             * translators: If your word count is based on single characters (e.g. East Asian characters),
-             * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
-             * Do not translate into your own language.
-             */
-            'type'       => _x( 'words', 'Word count type. Do not translate!' ),
+            'type'       => wp_get_word_count_type(),
             'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array(),
         )

trunk/tests/phpunit/tests/locale.php

@@ -174 +174 @@
         $this->assertFalse( $this->locale->is_rtl() );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }