<!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][8678] trunk/src: More "Avatar" to "Profile Photo" renaming.</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/8678">8678</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-07-23 18:40:28 +0000 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More "Avatar" to "Profile Photo" renaming.
See <a href="http://buddypress.trac.wordpress.org/ticket/5758">#5758</a> and <a href="http://buddypress.trac.wordpress.org/changeset/8677">r8677</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsbpgroupsactionsphp">trunk/src/bp-groups/bp-groups-actions.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsscreensphp">trunk/src/bp-groups/bp-groups-screens.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressgroupscreatephp">trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressgroupssingleadminphp">trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressmemberssingleprofilechangeavatarphp">trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileactionsphp">trunk/src/bp-xprofile/bp-xprofile-actions.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofilescreensphp">trunk/src/bp-xprofile/bp-xprofile-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsbpgroupsactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-actions.php (8677 => 8678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-actions.php 2014-07-23 18:30:22 UTC (rev 8677)
+++ trunk/src/bp-groups/bp-groups-actions.php 2014-07-23 18:40:28 UTC (rev 8678)
</span><span class="lines">@@ -306,9 +306,9 @@
</span><span class="cx"> // Normally we would check a nonce here, but the group save nonce is used instead
</span><span class="cx">
</span><span class="cx"> if ( !bp_core_avatar_handle_crop( array( 'object' => 'group', 'avatar_dir' => 'group-avatars', 'item_id' => $bp->groups->current_group->id, 'original_file' => $_POST['image_src'], 'crop_x' => $_POST['x'], 'crop_y' => $_POST['y'], 'crop_w' => $_POST['w'], 'crop_h' => $_POST['h'] ) ) )
</span><del>- bp_core_add_message( __( 'There was an error saving the group avatar, please try uploading again.', 'buddypress' ), 'error' );
</del><ins>+ bp_core_add_message( __( 'There was an error saving the group profile photo, please try uploading again.', 'buddypress' ), 'error' );
</ins><span class="cx"> else
</span><del>- bp_core_add_message( __( 'The group avatar was uploaded successfully!', 'buddypress' ) );
</del><ins>+ bp_core_add_message( __( 'The group profile photo was uploaded successfully!', 'buddypress' ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-screens.php (8677 => 8678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-screens.php 2014-07-23 18:30:22 UTC (rev 8677)
+++ trunk/src/bp-groups/bp-groups-screens.php 2014-07-23 18:40:28 UTC (rev 8678)
</span><span class="lines">@@ -646,9 +646,9 @@
</span><span class="cx"> check_admin_referer( 'bp_group_avatar_delete' );
</span><span class="cx">
</span><span class="cx"> if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group' ) ) ) {
</span><del>- bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
</del><ins>+ bp_core_add_message( __( 'The group profile photo was deleted successfully!', 'buddypress' ) );
</ins><span class="cx"> } else {
</span><del>- bp_core_add_message( __( 'There was a problem deleting that avatar; please try again.', 'buddypress' ), 'error' );
</del><ins>+ bp_core_add_message( __( 'There was a problem deleting the group profile photo; please try again.', 'buddypress' ), 'error' );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -691,9 +691,9 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( !bp_core_avatar_handle_crop( $args ) ) {
</span><del>- bp_core_add_message( __( 'There was a problem cropping the avatar.', 'buddypress' ), 'error' );
</del><ins>+ bp_core_add_message( __( 'There was a problem cropping the group profile photo.', 'buddypress' ), 'error' );
</ins><span class="cx"> } else {
</span><del>- bp_core_add_message( __( 'The new group avatar was uploaded successfully.', 'buddypress' ) );
</del><ins>+ bp_core_add_message( __( 'The new group profile photo was uploaded successfully.', 'buddypress' ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-template.php (8677 => 8678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-template.php 2014-07-23 18:30:22 UTC (rev 8677)
+++ trunk/src/bp-groups/bp-groups-template.php 2014-07-23 18:40:28 UTC (rev 8678)
</span><span class="lines">@@ -799,7 +799,7 @@
</span><span class="cx"> 'height' => false,
</span><span class="cx"> 'class' => 'avatar',
</span><span class="cx"> 'id' => false,
</span><del>- 'alt' => sprintf( __( 'Group creator avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $group->creator_id ) )
</del><ins>+ 'alt' => sprintf( __( 'Group creator profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $group->creator_id ) )
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressgroupscreatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php (8677 => 8678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php 2014-07-23 18:30:22 UTC (rev 8677)
+++ trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php 2014-07-23 18:40:28 UTC (rev 8678)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> </div><!-- .left-menu -->
</span><span class="cx">
</span><span class="cx"> <div class="main-column">
</span><del>- <p><?php _e( "Upload an image to use as an avatar for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( "Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <p>
</span><span class="cx"> <input type="file" name="file" id="file" />
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> <input type="hidden" name="action" id="action" value="bp_avatar_upload" />
</span><span class="cx"> </p>
</span><span class="cx">
</span><del>- <p><?php _e( 'To skip the avatar upload process, hit the "Next Step" button.', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'To skip the group profile photo upload process, hit the "Next Step" button.', 'buddypress' ); ?></p>
</ins><span class="cx"> </div><!-- .main-column -->
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressgroupssingleadminphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php (8677 => 8678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php 2014-07-23 18:30:22 UTC (rev 8677)
+++ trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php 2014-07-23 18:40:28 UTC (rev 8678)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
</span><span class="cx">
</span><del>- <p><?php _e("Upload an image to use as an avatar for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e("Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <p>
</span><span class="cx"> <input type="file" name="file" id="file" />
</span><span class="lines">@@ -134,9 +134,9 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_group_has_avatar() ) : ?>
</span><span class="cx">
</span><del>- <p><?php _e( "If you'd like to remove the existing avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
</ins><span class="cx">
</span><del>- <?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_title' => __( 'Delete Profile Photo', 'buddypress' ), 'link_text' => __( 'Delete Profile Photo', 'buddypress' ) ) ); ?>
</del><ins>+ <?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_title' => __( 'Delete Group Profile Photo', 'buddypress' ), 'link_text' => __( 'Delete Group Profile Photo', 'buddypress' ) ) ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressmemberssingleprofilechangeavatarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php (8677 => 8678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php 2014-07-23 18:30:22 UTC (rev 8677)
+++ trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php 2014-07-23 18:40:28 UTC (rev 8678)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
</span><span class="cx">
</span><del>- <p><?php _e( 'Your avatar will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'Your profile photo will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <form action="" method="post" id="avatar-upload-form" class="standard-form" enctype="multipart/form-data">
</span><span class="cx">
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_user_has_avatar() ) : ?>
</span><del>- <p><?php _e( "If you'd like to delete your current avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( "If you'd like to delete your current profile phot but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
</ins><span class="cx"> <p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Profile Photo', 'buddypress' ); ?>"><?php _e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><del>- <p><?php _e( 'Your avatar will be used on your profile and throughout the site. To change your avatar, please create an account with <a href="http://gravatar.com">Gravatar</a> using the same email address as you used to register with this site.', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'Your profile photo will be used on your profile and throughout the site. To change your profile photo, please create an account with <a href="http://gravatar.com">Gravatar</a> using the same email address as you used to register with this site.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-actions.php (8677 => 8678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-actions.php 2014-07-23 18:30:22 UTC (rev 8677)
+++ trunk/src/bp-xprofile/bp-xprofile-actions.php 2014-07-23 18:40:28 UTC (rev 8678)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( bp_core_delete_existing_avatar( array( 'item_id' => bp_displayed_user_id() ) ) )
</span><del>- bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
</del><ins>+ bp_core_add_message( __( 'Your profile photo was deleted successfully!', 'buddypress' ) );
</ins><span class="cx"> else
</span><del>- bp_core_add_message( __( 'There was a problem deleting that avatar; please try again.', 'buddypress' ), 'error' );
</del><ins>+ bp_core_add_message( __( 'There was a problem deleting your profile photo; please try again.', 'buddypress' ), 'error' );
</ins><span class="cx">
</span><span class="cx"> bp_core_redirect( wp_get_referer() );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofilescreensphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-screens.php (8677 => 8678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-screens.php 2014-07-23 18:30:22 UTC (rev 8677)
+++ trunk/src/bp-xprofile/bp-xprofile-screens.php 2014-07-23 18:40:28 UTC (rev 8678)
</span><span class="lines">@@ -209,10 +209,10 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( ! bp_core_avatar_handle_crop( $args ) ) {
</span><del>- bp_core_add_message( __( 'There was a problem cropping your avatar.', 'buddypress' ), 'error' );
</del><ins>+ bp_core_add_message( __( 'There was a problem cropping your profile photo.', 'buddypress' ), 'error' );
</ins><span class="cx"> } else {
</span><span class="cx"> do_action( 'xprofile_avatar_uploaded' );
</span><del>- bp_core_add_message( __( 'Your new avatar was uploaded successfully.', 'buddypress' ) );
</del><ins>+ bp_core_add_message( __( 'Your new profile photo was uploaded successfully.', 'buddypress' ) );
</ins><span class="cx"> bp_core_redirect( bp_displayed_user_domain() );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>