Changeset 22066

Timestamp:

09/27/2012 05:44:54 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Twelve: better logic for on/off setting to be translated to turn off the font if translators explicitly say so. Also minor fixes to spelling and to use yoda comparison. Fixes #21751.

File:

• trunk/wp-content/themes/twentytwelve/functions.php (modified) (1 diff)

trunk/wp-content/themes/twentytwelve/functions.php

@@ -116 +116 @@
     /* translators: If there are characters in your language that are not supported
        by Open Sans, translate this to 'off'. Do not translate into your own language. */
-    if ( 'off' == _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
-
+    if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
         $subsets = 'latin,latin-ext';
 
         /* translators: To add an additional Open Sans character subset specific to your language, translate
            this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language. */
-
-        $subset = _x( ' ', 'Open Sans font: add new subset (greek, cyrllic, vietnamese)', 'twentytwelve' );
-
-        if ( $subset == 'cyrillic' )
+        $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
+
+        if ( 'cyrillic' == $subset )
             $subsets .= ',cyrillic,cyrillic-ext';
-        elseif ( $subset == 'greek' )
+        elseif ( 'greek' == $subset )
             $subsets .= ',greek,greek-ext';
-        elseif ( $subsets == 'vietnamese' )
+        elseif ( 'vietnamese' == $subset )
             $subsets .= ',vietnamese';