<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[22049] trunk/wp-content/themes/twentytwelve: Simplify the Open Sans translator voodoo.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22049">22049</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-27 07:30:27 +0000 (Thu, 27 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify the Open Sans translator voodoo. see <a href="http://core.trac.wordpress.org/ticket/21751">#21751</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelveheaderphp">trunk/wp-content/themes/twentytwelve/header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (22048 => 22049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-09-27 07:01:16 UTC (rev 22048)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-09-27 07:30:27 UTC (rev 22049)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * Adds JavaScript for handling the navigation menu hide-and-show behavior.
</span><span class="cx"> */
</span><del>- wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20120920', true );
</del><ins>+ wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '1.0', true );
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Loads our special font CSS file.
</span><span class="lines">@@ -112,27 +112,29 @@
</span><span class="cx"> * }
</span><span class="cx"> * add_action( 'wp_enqueue_scripts', 'mytheme_dequeue_fonts', 11 );
</span><span class="cx"> */
</span><del>- /* translators: If there are characters in your language that are not supported by Open Sans,
- enter 'disable-open-sans'. Otherwise enter 'enable-open-sans'. Do not translate into your own language. */
- if ( false === strpos( _x( 'enable-open-sans', 'Open Sans font: enable or disable', 'twentytwelve' ), 'disable' ) ) {
</del><ins>+
+ /* 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' ) ) {
+
</ins><span class="cx"> $subsets = 'latin,latin-ext';
</span><del>- /* translators: To add an additional Open Sans character subset specific to your language enter 'greek', 'cyrillic' or 'vietnamese'.
- Otherwise enter 'open-sans-subset'. Do not translate into your own language. */
- $add_subset = _x( 'open-sans-subset', 'Additional Open Sans font subset: greek, cyrillic or vietnamese', 'twentytwelve' );
</del><span class="cx">
</span><del>- if ( in_array( $add_subset, array( 'greek', 'cyrillic', 'vietnamese' ) ) ) {
- $character_sets = array(
- 'greek' => 'greek,greek-ext',
- 'cyrillic' => 'cyrillic,cyrillic-ext',
- 'vietnamese' => 'vietnamese'
- );
- $subsets = implode( ',', array( $subsets, $character_sets[ $add_subset ] ) );
- }
</del><ins>+ /* 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. */
</ins><span class="cx">
</span><ins>+ $subset = _x( '', 'Open Sans font: add new subset (greek, cyrllic, vietnamese)', 'twentytwelve' );
+
+ if ( $subset == 'cyrillic' )
+ $subsets .= ',cyrillic,cyrillic-ext';
+ elseif ( $subset == 'greek' )
+ $subsets .= ',greek,greek-ext';
+ elseif ( $subsets == 'vietnamese' )
+ $subsets .= ',vietnamese';
+
</ins><span class="cx"> $protocol = is_ssl() ? 'https' : 'http';
</span><span class="cx"> $query_args = array(
</span><span class="cx"> 'family' => 'Open+Sans:400italic,700italic,400,700',
</span><del>- 'subset' => $subsets
</del><ins>+ 'subset' => $subsets,
</ins><span class="cx"> );
</span><span class="cx"> wp_enqueue_style( 'twentytwelve-fonts', add_query_arg( $query_args, "$protocol://fonts.googleapis.com/css" ), array(), null );
</span><span class="cx"> }
</span><span class="lines">@@ -141,15 +143,6 @@
</span><span class="cx"> * Loads our main stylesheet.
</span><span class="cx"> */
</span><span class="cx"> wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
</span><del>-
- /*
- * Loads HTML5 JavaScript file to add support for HTML5 elements in older IE versions.
- * Ideally, should load after main CSS file.
- * See html5.js link in header.php.
- *
- * @todo depends on IE dependency being in core for JS enqueuing
- * before we can move here properly: see http://core.trac.wordpress.org/ticket/16024
- */
</del><span class="cx"> }
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelveheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/header.php (22048 => 22049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/header.php 2012-09-27 07:01:16 UTC (rev 22048)
+++ trunk/wp-content/themes/twentytwelve/header.php 2012-09-27 07:30:27 UTC (rev 22049)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> <title><?php wp_title( '|', true, 'right' ); ?></title>
</span><span class="cx"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="cx"> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</span><ins>+<?php // Loads HTML5 JavaScript file to add support for HTML5 elements in older IE versions. ?>
</ins><span class="cx"> <!--[if lt IE 9]>
</span><span class="cx"> <script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
</span><span class="cx"> <![endif]-->
</span></span></pre>
</div>
</div>
</body>
</html>