From 295237f41f5184cd19ceb23cd31b00883e56742d Mon Sep 17 00:00:00 2001 From: Lance Willett Date: Thu, 27 Sep 2012 17:44:54 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@22066 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-content/themes/twentytwelve/functions.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php index a29a2eff61..c54fe08eb7 100644 --- a/wp-content/themes/twentytwelve/functions.php +++ b/wp-content/themes/twentytwelve/functions.php @@ -115,20 +115,18 @@ function twentytwelve_scripts_styles() { /* 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( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' ); - $subset = _x( ' ', 'Open Sans font: add new subset (greek, cyrllic, vietnamese)', 'twentytwelve' ); - - if ( $subset == 'cyrillic' ) + 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'; $protocol = is_ssl() ? 'https' : 'http';