Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@22066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Lance Willett 2012-09-27 17:44:54 +00:00
parent 115d53941b
commit 1692675bfc
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-content/themes/twentytwelve/functions.php
View File

@ -115,20 +115,18 @@ function twentytwelve_scripts_styles() {
/* translators: If there are characters in your language that are not supported /* 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. */ 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'; $subsets = 'latin,latin-ext';
/* translators: To add an additional Open Sans character subset specific to your language, translate /* 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. */ 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 ( 'cyrillic' == $subset )
if ( $subset == 'cyrillic' )
$subsets .= ',cyrillic,cyrillic-ext'; $subsets .= ',cyrillic,cyrillic-ext';
elseif ( $subset == 'greek' ) elseif ( 'greek' == $subset )
$subsets .= ',greek,greek-ext'; $subsets .= ',greek,greek-ext';
elseif ( $subsets == 'vietnamese' ) elseif ( 'vietnamese' == $subset )
$subsets .= ',vietnamese'; $subsets .= ',vietnamese';
$protocol = is_ssl() ? 'https' : 'http'; $protocol = is_ssl() ? 'https' : 'http';