<!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>[17960] trunk/wp-admin: Allow Codex URLs to be translated.</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://trac.wordpress.org/changeset/17960">17960</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-05-18 19:39:24 +0000 (Wed, 18 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow Codex URLs to be translated. Don't offer wp.org/about/ URLs for translation. props zeo, xibe. fixes <a href="http://trac.wordpress.org/ticket/17480">#17480</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpadmincreditsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/credits.php (17959 => 17960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/credits.php 2011-05-18 19:06:09 UTC (rev 17959)
+++ trunk/wp-admin/credits.php 2011-05-18 19:39:24 UTC (rev 17960)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $results = unserialize( wp_remote_retrieve_body( $response ) );
</span><span class="cx">
</span><span class="cx"> if ( !is_array( $results ) )
</span><span class="lines">@@ -61,14 +61,12 @@
</span><span class="cx"> $results = wp_credits();
</span><span class="cx">
</span><span class="cx"> if ( !isset( $results['people'] ) ) {
</span><del>- echo '<p>' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
- 'http://wordpress.org/about/',
- 'http://codex.wordpress.org/Contributing_to_WordPress' ) . '</p>';
</del><ins>+ echo '<p>' . sprintf( __( 'WordPress is created by a <a href="%s">worldwide team</a> of passionate individuals. <a href="http://codex.wordpress.org/Contributing_to_WordPress">Get involved in WordPress</a>.' ), 'http://wordpress.org/about/' ) . '</p>';
</ins><span class="cx"> include( './admin-footer.php' );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-echo '<p>' . __( "WordPress is created by a worldwide team of passionate individuals. We couldn't possibly list them all, but here some of the most influential people currently involved with the project:" ) . "</p>\n";
</del><ins>+echo '<p>' . __( 'WordPress is created by a worldwide team of passionate individuals. We couldn&#8217;t possibly list them all, but here some of the most influential people currently involved with the project:' ) . "</p>\n";
</ins><span class="cx">
</span><span class="cx"> $gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/';
</span><span class="cx">
</span><span class="lines">@@ -93,7 +91,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>-<p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ), 'http://codex.wordpress.org/Contributing_to_WordPress' ); ?></p>
</del><ins>+<p class="clear"><?php _e( 'Want to see your name in lights on this page? <a href="http://codex.wordpress.org/Contributing_to_WordPress">Get involved in WordPress</a>.' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="lines">@@ -115,4 +113,4 @@
</span><span class="cx"> __( 'XML-RPC Developer' );
</span><span class="cx"> __( 'Internationalization' );
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpadminfreedomsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/freedoms.php (17959 => 17960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/freedoms.php 2011-05-18 19:06:09 UTC (rev 17959)
+++ trunk/wp-admin/freedoms.php 2011-05-18 19:39:24 UTC (rev 17960)
</span><span class="lines">@@ -18,25 +18,25 @@
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e( 'Freedoms' ); ?></h2>
</span><span class="cx">
</span><del>-<p><?php _e( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="http://wordpress.org/about/license/">license</a>, the GPL.' ); ?></p>
</del><ins>+<p><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'http://wordpress.org/about/license/' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <ol start="0">
</span><span class="cx"> <li><?php _e( 'You have the freedom to run the program, for any purpose.' ); ?></li>
</span><del>- <li><?php _e( 'You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.' ); ?></li>
</del><ins>+ <li><?php _e( 'You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.' ); ?></li>
</ins><span class="cx"> <li><?php _e( 'You have the freedom to redistribute copies of the original program so you can help your neighbor.' ); ?></li>
</span><span class="cx"> <li><?php _e( 'You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes.' ); ?></li>
</span><del>-</ol>
</del><ins>+</ol>
</ins><span class="cx">
</span><del>-<p><?php _e( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="http://wordpressfoundation.org/trademark-policy/">check out our trademark guidelines</a> first.' ); ?></p>
</del><ins>+<p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'http://wordpressfoundation.org/trademark-policy/' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <p><?php
</span><span class="cx">
</span><span class="cx"> $plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : 'http://wordpress.org/extend/plugins/';
</span><span class="cx"> $themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : 'http://wordpress.org/extend/themes/';
</span><span class="cx">
</span><del>-printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="http://wordpress.org/about/license/">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url ); ?></p>
</del><ins>+printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, 'http://wordpress.org/about/license/' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="http://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
</span><span class="cx">
</span><span class="cx"> </div>
</span><del>-<?php include( './admin-footer.php' ); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php include( './admin-footer.php' ); ?>
</ins></span></pre>
</div>
</div>
</body>
</html>