<!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][7857] trunk: Modify profile administration verbiage to be more natural and more gender-neutral</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7857">7857</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-12 01:15:51 +0000 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modify profile administration verbiage to be more natural and more gender-neutral
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5391">#5391</a>
Props netweb</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersadminphp">trunk/bp-members/bp-members-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-admin.php (7856 => 7857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-admin.php 2014-02-12 01:07:45 UTC (rev 7856)
+++ trunk/bp-members/bp-members-admin.php 2014-02-12 01:15:51 UTC (rev 7857)
</span><span class="lines">@@ -321,8 +321,8 @@
</span><span class="cx"> 'title' => __( 'Overview', 'buddypress' ),
</span><span class="cx"> 'content' =>
</span><span class="cx"> '<p>' . __( 'This is the admin view of a user's profile.', 'buddypress' ) . '</p>' .
</span><del>- '<p>' . __( 'You can edit the different fields of his extended profile from the main metabox', 'buddypress' ) . '</p>' .
- '<p>' . __( 'You can get some interesting informations about him on right side metaboxes', 'buddypress' ) . '</p>'
</del><ins>+ '<p>' . __( 'In the main column, you can edit the fields of the user's extended profile.', 'buddypress' ) . '</p>' .
+ '<p>' . __( 'In the right-hand column, you can update the user's status, delete the user's avatar, and view recent statistics.', 'buddypress' ) . '</p>'
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Help panel - sidebar links
</span><span class="lines">@@ -554,13 +554,13 @@
</span><span class="cx"> */
</span><span class="cx"> public function user_admin_status_metabox( $user = null ) {
</span><span class="cx">
</span><del>- // bail if no user id or if the user has not activated his account yet..
</del><ins>+ // Bail if no user id or if the user has not activated their account yet
</ins><span class="cx"> if ( empty( $user->ID ) ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ( isset( $user->user_status ) && 2 == $user->user_status ) ) {
</span><del>- echo '<p class="not-activated">' . esc_html__( 'User has not activated his account yet', 'buddypress' ) . '</p><br/>';
</del><ins>+ echo '<p class="not-activated">' . esc_html__( 'User account has not yet been activated', 'buddypress' ) . '</p><br/>';
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="lines">@@ -616,13 +616,13 @@
</span><span class="cx"> */
</span><span class="cx"> public function user_admin_spammer_metabox( $user = null ) {
</span><span class="cx"> ?>
</span><del>- <p><?php printf( __( '%s has been marked as a spammer, this user's BuddyPress datas were removed', 'buddypress' ), esc_html( bp_core_get_user_displayname( $user->ID ) ) ) ;?></p>
</del><ins>+ <p><?php printf( __( '%s has been marked as a spammer. All BuddyPress data associated with the user has been removed', 'buddypress' ), esc_html( bp_core_get_user_displayname( $user->ID ) ) ) ;?></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Render the Stats metabox to moderate inappropriate images.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access public
</span><span class="cx"> * @since BuddyPress (2.0.0)
</span><span class="cx"> *
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> <li class="bp-members-profile-stats"><?php printf( __( 'Last active: <strong>%1$s</strong>', 'buddypress' ), $date ); ?></li>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- // Loading other stats only if user has activated his account
</del><ins>+ // Loading other stats only if user has activated their account
</ins><span class="cx"> if ( empty( $user->user_status ) ) {
</span><span class="cx"> do_action( 'bp_members_admin_user_stats', array( 'user_id' => $user->ID ), $user );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (7856 => 7857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2014-02-12 01:07:45 UTC (rev 7856)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2014-02-12 01:15:51 UTC (rev 7857)
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> add_meta_box( 'bp_xprofile_user_admin_fields_' . sanitize_key( bp_get_the_profile_group_slug() ), esc_html( bp_get_the_profile_group_name() ), array( &$this, 'user_admin_profile_metaboxes' ), $screen_id, 'normal', 'core', array( 'profile_group_id' => absint( bp_get_the_profile_group_id() ) ) );
</span><span class="cx"> endwhile;
</span><span class="cx">
</span><del>- // if a user has been mark as a spammer, his BuddyPress datas are removed !
</del><ins>+ // if a user has been mark as a spammer, remove BP data
</ins><span class="cx"> } else {
</span><span class="cx"> add_meta_box( 'bp_xprofile_user_admin_empty_profile', _x( 'User marked as a spammer', 'xprofile user-admin edit screen', 'buddypress' ), array( &$this, 'user_admin_spammer_metabox' ), $screen_id, 'normal', 'core' );
</span><span class="cx"> }
</span><span class="lines">@@ -876,7 +876,7 @@
</span><span class="cx"> */
</span><span class="cx"> public function user_admin_spammer_metabox( $user = null ) {
</span><span class="cx"> ?>
</span><del>- <p><?php printf( __( '%s has been marked as a spammer, this user's BuddyPress datas were removed', 'buddypress' ), esc_html( bp_core_get_user_displayname( $user->ID ) ) ) ;?></p>
</del><ins>+ <p><?php printf( __( '%s has been marked as a spammer. All BuddyPress data associated with the user has been removed', 'buddypress' ), esc_html( bp_core_get_user_displayname( $user->ID ) ) ) ;?></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>