Changeset 8678

Timestamp:

07/23/2014 06:40:28 PM (9 years ago)

Author:

djpaul

Message:

More "Avatar" to "Profile Photo" renaming.

See #5758 and r8677

Location:

trunk/src

Files:

• bp-groups/bp-groups-actions.php (modified) (1 diff)
• bp-groups/bp-groups-screens.php (modified) (2 diffs)
• bp-groups/bp-groups-template.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress/groups/create.php (modified) (2 diffs)
• bp-templates/bp-legacy/buddypress/groups/single/admin.php (modified) (2 diffs)
• bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php (modified) (3 diffs)
• bp-xprofile/bp-xprofile-actions.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-screens.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-actions.php

@@ -307 +307 @@
 
             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'] ) ) )
-                bp_core_add_message( __( 'There was an error saving the group avatar, please try uploading again.', 'buddypress' ), 'error' );
+                bp_core_add_message( __( 'There was an error saving the group profile photo, please try uploading again.', 'buddypress' ), 'error' );
             else
-                bp_core_add_message( __( 'The group avatar was uploaded successfully!', 'buddypress' ) );
+                bp_core_add_message( __( 'The group profile photo was uploaded successfully!', 'buddypress' ) );
         }
     }

trunk/src/bp-groups/bp-groups-screens.php

@@ -647 +647 @@
 
         if ( bp_core_delete_existing_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group' ) ) ) {
-            bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
+            bp_core_add_message( __( 'The group profile photo was deleted successfully!', 'buddypress' ) );
         } else {
-            bp_core_add_message( __( 'There was a problem deleting that avatar; please try again.', 'buddypress' ), 'error' );
+            bp_core_add_message( __( 'There was a problem deleting the group profile photo; please try again.', 'buddypress' ), 'error' );
         }
     }
@@ -692 +692 @@
 
         if ( !bp_core_avatar_handle_crop( $args ) ) {
-            bp_core_add_message( __( 'There was a problem cropping the avatar.', 'buddypress' ), 'error' );
+            bp_core_add_message( __( 'There was a problem cropping the group profile photo.', 'buddypress' ), 'error' );
         } else {
-            bp_core_add_message( __( 'The new group avatar was uploaded successfully.', 'buddypress' ) );
+            bp_core_add_message( __( 'The new group profile photo was uploaded successfully.', 'buddypress' ) );
         }
     }

trunk/src/bp-groups/bp-groups-template.php

@@ -800 +800 @@
             'class'  => 'avatar',
             'id'     => false,
-            'alt'    => sprintf( __( 'Group creator avatar of %s', 'buddypress' ),  bp_core_get_user_displayname( $group->creator_id ) )
+            'alt'    => sprintf( __( 'Group creator profile photo of %s', 'buddypress' ),  bp_core_get_user_displayname( $group->creator_id ) )
         );
 

trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php

@@ -140 +140 @@
 
                     <div class="main-column">
-                        <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>
+                        <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>
 
                         <p>
@@ -148 +148 @@
                         </p>
 
-                        <p><?php _e( 'To skip the avatar upload process, hit the "Next Step" button.', 'buddypress' ); ?></p>
+                        <p><?php _e( 'To skip the group profile photo upload process, hit the "Next Step" button.', 'buddypress' ); ?></p>
                     </div><!-- .main-column -->
 

trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php

@@ -125 +125 @@
     <?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
 
-            <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>
+            <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>
 
             <p>
@@ -135 +135 @@
             <?php if ( bp_get_group_has_avatar() ) : ?>
 
-                <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>
-
-                <?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' ) ) ); ?>
+                <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>
+
+                <?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' ) ) ); ?>
 
             <?php endif; ?>

trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php

@@ -5 +5 @@
 <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
 
-    <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>
+    <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>
 
     <form action="" method="post" id="avatar-upload-form" class="standard-form" enctype="multipart/form-data">
@@ -21 +21 @@
 
             <?php if ( bp_get_user_has_avatar() ) : ?>
-                <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>
+                <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>
                 <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>
             <?php endif; ?>
@@ -53 +53 @@
 <?php else : ?>
 
-    <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>
+    <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>
 
 <?php endif; ?>

trunk/src/bp-xprofile/bp-xprofile-actions.php

@@ -37 +37 @@
 
     if ( bp_core_delete_existing_avatar( array( 'item_id' => bp_displayed_user_id() ) ) )
-        bp_core_add_message( __( 'Your avatar was deleted successfully!', 'buddypress' ) );
+        bp_core_add_message( __( 'Your profile photo was deleted successfully!', 'buddypress' ) );
     else
-        bp_core_add_message( __( 'There was a problem deleting that avatar; please try again.', 'buddypress' ), 'error' );
+        bp_core_add_message( __( 'There was a problem deleting your profile photo; please try again.', 'buddypress' ), 'error' );
 
     bp_core_redirect( wp_get_referer() );

trunk/src/bp-xprofile/bp-xprofile-screens.php

@@ -210 +210 @@
 
         if ( ! bp_core_avatar_handle_crop( $args ) ) {
-            bp_core_add_message( __( 'There was a problem cropping your avatar.', 'buddypress' ), 'error' );
+            bp_core_add_message( __( 'There was a problem cropping your profile photo.', 'buddypress' ), 'error' );
         } else {
             do_action( 'xprofile_avatar_uploaded' );
-            bp_core_add_message( __( 'Your new avatar was uploaded successfully.', 'buddypress' ) );
+            bp_core_add_message( __( 'Your new profile photo was uploaded successfully.', 'buddypress' ) );
             bp_core_redirect( bp_displayed_user_domain() );
         }