Changeset 27284

Timestamp:

02/26/2014 04:49:24 PM (11 years ago)

Author:

nacin

Message:

Use placeholders in strings in wp_sprintf_l() to ensure spaces are not lost in translation.

props andy.
fixes #26651.

File:

• trunk/src/wp-includes/formatting.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -3432 +3432 @@
     /**
      * Filter the translated delimiters used by wp_sprintf_l().
+     * Placeholders (%s) are included to assist translators and then
+     * removed before the array of strings reaches the filter.
      *
      * Please note: Ampersands and entities should be avoided here.
@@ -3440 +3442 @@
      */
     $l = apply_filters( 'wp_sprintf_l', array(
-        /* translators: used between list items, there is a space after the comma */
-        'between'          => __(', '),
-        /* translators: used between list items, there is a space after the and */
-        'between_last_two' => __(', and '),
-        /* translators: used between only two list items, there is a space after the and */
-        'between_only_two' => __(' and '),
+        /* translators: used to join items in a list with more than 2 items */
+        'between'          => sprintf( __('%s, %s'), '', '' ),
+        /* translators: used to join last two items in a list with more than 2 times */
+        'between_last_two' => sprintf( __('%s, and %s'), '', '' ),
+        /* translators: used to join items in a list with only 2 items */
+        'between_only_two' => sprintf( __('%s and %s'), '', '' ),
     ) );