<!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>[30924] branches/4.1: Twenty Fifteen: Don't escape translated strings.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/30924">30924</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/30924","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-12-16 20:32:03 +0000 (Tue, 16 Dec 2014)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Fifteen: Don't escape translated strings.
Replace every unnecessary instance of `esc_html__()` and `esc_html_e()` with just `__()` and `_e()`.
Merges <a href="https://core.trac.wordpress.org/changeset/30896">[30896]</a> to the 4.1 branch.
see <a href="https://core.trac.wordpress.org/ticket/30724">#30724</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches41srcwpcontentthemestwentyfifteen404php">branches/4.1/src/wp-content/themes/twentyfifteen/404.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteenauthorbiophp">branches/4.1/src/wp-content/themes/twentyfifteen/author-bio.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteencommentsphp">branches/4.1/src/wp-content/themes/twentyfifteen/comments.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteencontentlinkphp">branches/4.1/src/wp-content/themes/twentyfifteen/content-link.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteencontentnonephp">branches/4.1/src/wp-content/themes/twentyfifteen/content-none.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteencontentpagephp">branches/4.1/src/wp-content/themes/twentyfifteen/content-page.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteencontentsearchphp">branches/4.1/src/wp-content/themes/twentyfifteen/content-search.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteencontentphp">branches/4.1/src/wp-content/themes/twentyfifteen/content.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteenfooterphp">branches/4.1/src/wp-content/themes/twentyfifteen/footer.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteenfunctionsphp">branches/4.1/src/wp-content/themes/twentyfifteen/functions.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteenheaderphp">branches/4.1/src/wp-content/themes/twentyfifteen/header.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteenimagephp">branches/4.1/src/wp-content/themes/twentyfifteen/image.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteeninccustomizerphp">branches/4.1/src/wp-content/themes/twentyfifteen/inc/customizer.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteeninctemplatetagsphp">branches/4.1/src/wp-content/themes/twentyfifteen/inc/template-tags.php</a></li>
<li><a href="#branches41srcwpcontentthemestwentyfifteensearchphp">branches/4.1/src/wp-content/themes/twentyfifteen/search.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches41">branches/4.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.1
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.1 2014-12-16 20:29:28 UTC (rev 30923)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.1 2014-12-16 20:32:03 UTC (rev 30924)
</ins><a id="branches41"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.1</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,30801-30813,30817,30821,30823-30824,30829-30832,30835,30837,30839-30844,30846-30847,30849,30852,30854,30856-30857,30860,30865-30867,30871-30874,30879,30884,30887-30891,30900,30903,30921
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,30801-30813,30817,30821,30823-30824,30829-30832,30835,30837,30839-30844,30846-30847,30849,30852,30854,30856-30857,30860,30865-30867,30871-30874,30879,30884,30887-30891,30896,30900,30903,30921
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches41srcwpcontentthemestwentyfifteen404php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/404.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/404.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/404.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,11 +14,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <section class="error-404 not-found">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="page-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="page-title"><?php esc_html_e( 'Oops! That page can’t be found.', 'twentyfifteen' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="page-title"><?php _e( 'Oops! That page can’t be found.', 'twentyfifteen' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .page-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="page-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyfifteen' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentyfifteen' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .page-content -->
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteenauthorbiophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/author-bio.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/author-bio.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/author-bio.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="author-info">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="author-heading"><?php esc_html_e( 'Published by', 'twentyfifteen' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="author-heading"><?php _e( 'Published by', 'twentyfifteen' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="author-avatar">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteencommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/comments.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/comments.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If comments are closed and there are comments, let's leave a little note, shall we?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php comment_form(); ?>
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteencontentlinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/content-link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/content-link.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/content-link.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,16 +28,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Name of current post */
</span><span class="cx" style="display: block; padding: 0 10px"> the_content( sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html__( 'Continue reading %s', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Continue reading %s', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> the_title( '<span class="screen-reader-text">', '</span>', false )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_link_pages( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'before' => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</div>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_before' => '<span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => '</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'pagelink' => '<span class="screen-reader-text">' . esc_html__( 'Page', 'twentyfifteen' ) . ' </span>%',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'separator' => '<span class="screen-reader-text">, </span>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-footer">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyfifteen_entry_meta(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- .entry-footer -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteencontentnonephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/content-none.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/content-none.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/content-none.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <section class="no-results not-found">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="page-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="page-title"><?php esc_html_e( 'Nothing Found', 'twentyfifteen' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="page-title"><?php _e( 'Nothing Found', 'twentyfifteen' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .page-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="page-content">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,12 +23,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_search() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfifteen' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfifteen' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'twentyfifteen' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'It seems we can’t find what you’re looking for. Perhaps searching can help.', 'twentyfifteen' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php get_search_form(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteencontentpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/content-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/content-page.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/content-page.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,16 +22,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> wp_link_pages( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'before' => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</div>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_before' => '<span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => '</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'pagelink' => '<span class="screen-reader-text">' . esc_html__( 'Page', 'twentyfifteen' ) . ' </span>%',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'separator' => '<span class="screen-reader-text">, </span>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-content -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteencontentsearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/content-search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/content-search.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/content-search.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,12 +25,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-footer">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyfifteen_entry_meta(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-footer -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer><!-- .entry-footer -->' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteencontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/content.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/content.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,16 +30,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Name of current post */
</span><span class="cx" style="display: block; padding: 0 10px"> the_content( sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_html__( 'Continue reading %s', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Continue reading %s', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> the_title( '<span class="screen-reader-text">', '</span>', false )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_link_pages( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'before' => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</div>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_before' => '<span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => '</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'pagelink' => '<span class="screen-reader-text">' . esc_html__( 'Page', 'twentyfifteen' ) . ' </span>%',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'separator' => '<span class="screen-reader-text">, </span>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-footer">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyfifteen_entry_meta(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-footer -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteenfooterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/footer.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/footer.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'twentyfifteen_credits' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfifteen' ) ); ?>"><?php printf( esc_html__( 'Proudly powered by %s', 'twentyfifteen' ), 'WordPress' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyfifteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentyfifteen' ), 'WordPress' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .site-info -->
</span><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .site-footer -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/functions.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/functions.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,8 +228,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20141010', true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'twentyfifteen-script', 'screenReaderText', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'expand' => '<span class="screen-reader-text">' . esc_html__( 'expand child menu', 'twentyfifteen' ) . '</span>',
- 'collapse' => '<span class="screen-reader-text">' . esc_html__( 'collapse child menu', 'twentyfifteen' ) . '</span>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'expand' => '<span class="screen-reader-text">' . __( 'expand child menu', 'twentyfifteen' ) . '</span>',
+ 'collapse' => '<span class="screen-reader-text">' . __( 'collapse child menu', 'twentyfifteen' ) . '</span>',
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', 'twentyfifteen_scripts' );
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteenheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/header.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/header.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <body <?php body_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="page" class="hfeed site">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'twentyfifteen' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'twentyfifteen' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="sidebar" class="sidebar">
</span><span class="cx" style="display: block; padding: 0 10px"> <header id="masthead" class="site-header" role="banner">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="site-description"><?php echo esc_html( $description ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button class="secondary-toggle"><?php esc_html_e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button class="secondary-toggle"><?php _e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .site-branding -->
</span><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .site-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteenimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/image.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/image.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <nav id="image-navigation" class="navigation image-navigation">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-links">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="nav-previous"><?php previous_image_link( false, esc_html__( 'Previous Image', 'twentyfifteen' ) ); ?></div><div class="nav-next"><?php next_image_link( false, esc_html__( 'Next Image', 'twentyfifteen' ) ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentyfifteen' ) ); ?></div><div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentyfifteen' ) ); ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .nav-links -->
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- .image-navigation -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,11 +56,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> the_content();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_link_pages( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'before' => '<div class="page-links"><span class="page-links-title">' . esc_html__( 'Pages:', 'twentyfifteen' ) . '</span>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'after' => '</div>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_before' => '<span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_after' => '</span>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'pagelink' => '<span class="screen-reader-text">' . esc_html__( 'Page', 'twentyfifteen' ) . ' </span>%',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'pagelink' => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'separator' => '<span class="screen-reader-text">, </span>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-footer">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyfifteen_entry_meta(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php edit_post_link( esc_html__( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-footer -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-## -->
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/inc/customizer.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control( 'color_scheme', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Base Color Scheme', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Base Color Scheme', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'select',
</span><span class="cx" style="display: block; padding: 0 10px"> 'choices' => twentyfifteen_get_color_scheme_choices(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,8 +48,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'sidebar_textcolor', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Header and Sidebar Text Color', 'twentyfifteen' ),
- 'description' => esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Header and Sidebar Text Color', 'twentyfifteen' ),
+ 'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,13 +64,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'header_background_color', array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Header and Sidebar Background Color', 'twentyfifteen' ),
- 'description' => esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Header and Sidebar Background Color', 'twentyfifteen' ),
+ 'description' => __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add an additional description to the header image section.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_customize->get_section( 'header_image' )->description = esc_html__( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_customize->get_section( 'header_image' )->description = __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'customize_register', 'twentyfifteen_customize_register', 11 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_get_color_schemes() {
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'twentyfifteen_color_schemes', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'default' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Default', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Default', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'colors' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> '#f1f1f1',
</span><span class="cx" style="display: block; padding: 0 10px"> '#ffffff',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'dark' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Dark', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Dark', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'colors' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> '#111111',
</span><span class="cx" style="display: block; padding: 0 10px"> '#202020',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'yellow' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Yellow', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Yellow', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'colors' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> '#f4ca16',
</span><span class="cx" style="display: block; padding: 0 10px"> '#ffdf00',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'pink' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Pink', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Pink', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'colors' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> '#ffe5d1',
</span><span class="cx" style="display: block; padding: 0 10px"> '#e53b51',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'purple' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Purple', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Purple', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'colors' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> '#674970',
</span><span class="cx" style="display: block; padding: 0 10px"> '#2e2256',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'blue' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => esc_html__( 'Blue', 'twentyfifteen' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Blue', 'twentyfifteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'colors' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> '#e9f2f9',
</span><span class="cx" style="display: block; padding: 0 10px"> '#55c3dc',
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteeninctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,14 +20,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <nav class="navigation comment-navigation" role="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-links">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $prev_link = get_previous_comments_link( esc_html__( 'Older Comments', 'twentyfifteen' ) ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) ) ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( '<div class="nav-previous">%s</div>', $prev_link );
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $next_link = get_next_comments_link( esc_html__( 'Newer Comments', 'twentyfifteen' ) ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $next_link = get_next_comments_link( __( 'Newer Comments', 'twentyfifteen' ) ) ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( '<div class="nav-next">%s</div>', $next_link );
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_entry_meta() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_sticky() && is_home() && ! is_paged() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( '<span class="sticky-post">%s</span>', esc_html__( 'Featured', 'twentyfifteen' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( '<span class="sticky-post">%s</span>', __( 'Featured', 'twentyfifteen' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $format = get_post_format();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="comments-link">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- comments_popup_link( esc_html__( 'Leave a comment', 'twentyfifteen' ), esc_html__( '1 Comment', 'twentyfifteen' ), esc_html__( '% Comments', 'twentyfifteen' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ comments_popup_link( __( 'Leave a comment', 'twentyfifteen' ), __( '1 Comment', 'twentyfifteen' ), __( '% Comments', 'twentyfifteen' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</span>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_permalink( get_the_ID() ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Name of current post */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( esc_html__( 'Continue reading %s', 'twentyfifteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Continue reading %s', 'twentyfifteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> return ' … ' . $link;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches41srcwpcontentthemestwentyfifteensearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.1/src/wp-content/themes/twentyfifteen/search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.1/src/wp-content/themes/twentyfifteen/search.php 2014-12-16 20:29:28 UTC (rev 30923)
+++ branches/4.1/src/wp-content/themes/twentyfifteen/search.php 2014-12-16 20:32:03 UTC (rev 30924)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( have_posts() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="page-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="page-title"><?php printf( esc_html__( 'Search Results for: %s', 'twentyfifteen' ), get_search_query() ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyfifteen' ), get_search_query() ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .page-header -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>