<!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>[19140] trunk/wp-admin: Yank version numbers out of 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, #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/19140">19140</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-11-03 23:55:03 +0000 (Thu, 03 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Yank version numbers out of translated strings. TODO decide whether this should be major version only, which probably means about.php should also contain text about x.y vs x.y.z. see <a href="http://core.trac.wordpress.org/ticket/18742">#18742</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminaboutphp">trunk/wp-admin/about.php</a></li>
<li><a href="#trunkwpadmincreditsphp">trunk/wp-admin/credits.php</a></li>
<li><a href="#trunkwpadminfreedomsphp">trunk/wp-admin/freedoms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminaboutphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/about.php (19139 => 19140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/about.php        2011-11-03 23:41:45 UTC (rev 19139)
+++ trunk/wp-admin/about.php        2011-11-03 23:55:03 UTC (rev 19140)
</span><span class="lines">@@ -12,19 +12,21 @@
</span><span class="cx"> $title = __( 'About' );
</span><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><ins>+list( $display_version ) = explode( '-', $wp_version );
+
</ins><span class="cx"> include( './admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap about-wrap">
</span><span class="cx">
</span><del>-<h1><?php _e( 'Welcome to WordPress 3.3!' ); ?></h1>
</del><ins>+<h1><?php printf( __( 'Welcome to WordPress %s!' ), $display_version ); ?></h1>
</ins><span class="cx">
</span><span class="cx"> <div class="about-text"><?php _e( 'WordPress is web software you can use to create a beautiful website or blog. We like to say that WordPress is both free and priceless at the same time.' ); ?></div>
</span><span class="cx">
</span><del>-<div class="wp-badge"><?php _e( 'Version 3.3' ); ?></div>
</del><ins>+<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
</ins><span class="cx">
</span><span class="cx"> <h2 class="nav-tab-wrapper">
</span><span class="cx">         <a href="about.php" class="nav-tab nav-tab-active">
</span><del>-                <?php _e( 'What&#8217;s New in 3.3' ); ?>
</del><ins>+                <?php printf( __( 'What&#8217;s New in %s' ), $display_version ); ?>
</ins><span class="cx">         </a><a href="credits.php" class="nav-tab">
</span><span class="cx">                 <?php _e( 'Credits' ); ?>
</span><span class="cx">         </a><a href="freedoms.php" class="nav-tab">
</span></span></pre></div>
<a id="trunkwpadmincreditsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/credits.php (19139 => 19140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/credits.php        2011-11-03 23:41:45 UTC (rev 19139)
+++ trunk/wp-admin/credits.php        2011-11-03 23:55:03 UTC (rev 19140)
</span><span class="lines">@@ -78,19 +78,21 @@
</span><span class="cx">         $data = '<a href="' . esc_url( $data[1] ) . '">' . $data[0] . '</a>';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+list( $display_version ) = explode( '-', $wp_version );
+
</ins><span class="cx"> include( './admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap about-wrap">
</span><span class="cx">
</span><del>-<h1><?php _e( 'Welcome to WordPress 3.3!' ); ?></h1>
</del><ins>+<h1><?php printf( __( 'Welcome to WordPress %s!' ), $display_version ); ?></h1>
</ins><span class="cx">
</span><span class="cx"> <div class="about-text"><?php _e( 'WordPress is web software you can use to create a beautiful website or blog. We like to say that WordPress is both free and priceless at the same time.' ); ?></div>
</span><span class="cx">
</span><del>-<div class="wp-badge"><?php _e( 'Version 3.3' ); ?></div>
</del><ins>+<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
</ins><span class="cx">
</span><span class="cx"> <h2 class="nav-tab-wrapper">
</span><del>-        <a href="about.php" class="nav-tab">
-                <?php _e( 'What&#8217;s New in 3.3' ); ?>
</del><ins>+        <a href="about.php" class="nav-tab nav-tab-active">
+                <?php printf( __( 'What&#8217;s New in %s' ), $display_version ); ?>
</ins><span class="cx">         </a><a href="credits.php" class="nav-tab nav-tab-active">
</span><span class="cx">                 <?php _e( 'Credits' ); ?>
</span><span class="cx">         </a><a href="freedoms.php" class="nav-tab">
</span></span></pre></div>
<a id="trunkwpadminfreedomsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/freedoms.php (19139 => 19140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/freedoms.php        2011-11-03 23:41:45 UTC (rev 19139)
+++ trunk/wp-admin/freedoms.php        2011-11-03 23:55:03 UTC (rev 19140)
</span><span class="lines">@@ -12,19 +12,21 @@
</span><span class="cx"> $title = __( 'Freedoms' );
</span><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><ins>+list( $display_version ) = explode( '-', $wp_version );
+
</ins><span class="cx"> include( './admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap about-wrap">
</span><span class="cx">
</span><del>-<h1><?php _e( 'Welcome to WordPress 3.3!' ); ?></h1>
</del><ins>+<h1><?php printf( __( 'Welcome to WordPress %s!' ), $display_version ); ?></h1>
</ins><span class="cx">
</span><span class="cx"> <div class="about-text"><?php _e( 'WordPress is web software you can use to create a beautiful website or blog. We like to say that WordPress is both free and priceless at the same time.' ); ?></div>
</span><span class="cx">
</span><del>-<div class="wp-badge"><?php _e( 'Version 3.3' ); ?></div>
</del><ins>+<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
</ins><span class="cx">
</span><span class="cx"> <h2 class="nav-tab-wrapper">
</span><del>-        <a href="about.php" class="nav-tab">
-                <?php _e( 'What&#8217;s New in 3.3' ); ?>
</del><ins>+        <a href="about.php" class="nav-tab nav-tab-active">
+                <?php printf( __( 'What&#8217;s New in %s' ), $display_version ); ?>
</ins><span class="cx">         </a><a href="credits.php" class="nav-tab">
</span><span class="cx">                 <?php _e( 'Credits' ); ?>
</span><span class="cx">         </a><a href="freedoms.php" class="nav-tab nav-tab-active">
</span></span></pre>
</div>
</div>
</body>
</html>