<!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>[BuddyPress][6239] trunk/bp-core/admin/bp-core-update.php: Improve i18n in the Setup/Install wizard.</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://buddypress.trac.wordpress.org/changeset/6239">6239</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-08-07 17:55:17 +0000 (Tue, 07 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre> Improve i18n in the Setup/Install wizard. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4389">#4389</a>, props Dianakc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (6238 => 6239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2012-08-06 19:37:52 UTC (rev 6238)
+++ trunk/bp-core/admin/bp-core-update.php 2012-08-07 17:55:17 UTC (rev 6239)
</span><span class="lines">@@ -130,17 +130,20 @@
</span><span class="cx"> // Bail if user is not capable of being here
</span><span class="cx"> if ( ! bp_current_user_can( 'activate_plugins' ) )
</span><span class="cx"> wp_die( 'You do not have sufficient permissions to access this page.' );
</span><del>-
- // Update or Setup
- $type = ( 'update' == bp_get_maintenance_mode() ) ? __( 'Update', 'buddypress' ) : __( 'Setup', 'buddypress' );
-
</del><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap" id="bp-wizard">
</span><span class="cx">
</span><span class="cx"> <?php screen_icon( 'buddypress' ); ?>
</span><span class="cx">
</span><del>- <h2><?php printf( __( 'BuddyPress %s', 'buddypress' ), $type ); ?></h2>
</del><ins>+ <h2>
+ <?php
+ if ( 'update' == bp_get_maintenance_mode() )
+ _e( 'BuddyPress Update', 'buddypress' );
+ else
+ _e( 'BuddyPress Setup', 'buddypress' );
+ ?>
+ </h2>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> do_action( 'bp_admin_notices' );
</span><span class="lines">@@ -682,12 +685,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function step_finish() {
</span><ins>+ ?>
+ <p>
+ <?php
+ if ( 'update' == bp_get_maintenance_mode() )
+ _e( "The BuddyPress update is complete, and your site is ready to go!", 'buddypress' );
+ else
+ _e( "The BuddyPress setup is complete, and your site is ready to go!", 'buddypress' );
+ ?>
+ </p>
</ins><span class="cx">
</span><del>- // What type of action is happening here?
- $type = ( bp_get_maintenance_mode() == 'install' ) ? __( 'setup', 'buddypress' ) : __( 'update', 'buddypress' ); ?>
-
- <p><?php printf( __( "The BuddyPress %1\$s is complete, and your site is ready to go!", 'buddypress' ), $type ); ?></p>
-
</del><span class="cx"> <div class="submit clear">
</span><span class="cx"> <input type="hidden" name="save" value="finish" />
</span><span class="cx"> <input type="hidden" name="step" value="<?php echo esc_attr( $this->current_step() ); ?>" />
</span></span></pre>
</div>
</div>
</body>
</html>