Skip to:
Content

BuddyPress.org

Changeset 8677


Ignore:
Timestamp:
07/23/2014 06:30:22 PM (12 years ago)
Author:
djpaul
Message:

Rename "Avatar" to "Profile Photo".

"Profile photo" is probably more easily understood by most people (and translators), and better describes what BuddyPress' member and group avatar features actually are; that we're asking for a person's photograph. Sometimes, avatar can mean "graphic" or "illustration".

This subtle change in phrasing also makes BuddyPress more consistent with the significant majority of other online platform services (Twitter, Facebook, etc).

Fixes #5758, props sooskriszta

Location:
trunk/src
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/bp-core/bp-core-admin.php

    r8365 r8677  
    397397                if ( ! empty( $avatar_setting ) ) {
    398398                    // Allow avatar uploads
    399                     add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
     399                    add_settings_field( 'bp-disable-avatar-uploads', __( 'Profile Photo Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
    400400                    register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                    );
    401401                }

  • trunk/src/bp-core/bp-core-avatars.php

    r8673 r8677  
    301301        // Get a fallback for the 'alt' parameter
    302302        if ( empty( $alt ) )
    303                 $alt = __( 'Avatar Image', 'buddypress' );
     303                $alt = __( 'Profile Photo', 'buddypress' );
    304304
    305305        $html_alt = ' alt="' . esc_attr( $alt ) . '"';
    … …  
    854854        // Image alt tag
    855855        if ( empty( $alt ) ) {
    856                 $alt = sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $id ) );
     856                $alt = sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $id ) );
    857857        }
    858858

  • trunk/src/bp-core/bp-core-classes.php

    r8675 r8677  
    824824                wp_cache_set( 'bp_user_url_' . $this->id, $this->user_url, 'bp' );
    825825
    826                 $this->avatar       = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->fullname ) ) );
    827                 $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->fullname ) ) );
    828                 $this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->fullname ), 'width' => 30, 'height' => 30 ) );
     826                $this->avatar       = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->fullname ) ) );
     827                $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->fullname ) ) );
     828                $this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->fullname ), 'width' => 30, 'height' => 30 ) );
    829829                $this->last_active  = bp_core_get_last_activity( bp_get_user_last_activity( $this->id ), __( 'active %s', 'buddypress' ) );
    830830        }

  • trunk/src/bp-core/bp-core-template.php

    r8659 r8677  
    158158
    159159        if ( function_exists( 'bp_core_fetch_avatar' ) )
    160                 echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $comment->user_id ) ) ) ) );
     160                echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $comment->user_id ) ) ) ) );
    161161        else if ( function_exists('get_avatar') )
    162162                get_avatar();
    … …  
    174174
    175175        if ( function_exists( 'bp_core_fetch_avatar' ) )
    176                 echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $post->post_author, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $post->post_author ) ) ) ) );
     176                echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $post->post_author, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $post->post_author ) ) ) ) );
    177177        else if ( function_exists('get_avatar') )
    178178                get_avatar();

  • trunk/src/bp-core/bp-core-widgets.php

    r8453 r8677  
    315315        function __construct() {
    316316                $widget_ops = array(
    317                         'description' => __( 'Avatars of users who are currently online', 'buddypress' ),
     317                        'description' => __( 'Profile photos of online users', 'buddypress' ),
    318318                        'classname' => 'widget_bp_core_whos_online_widget buddypress widget',
    319319                );
    … …  
    418418        function __construct() {
    419419                $widget_ops = array(
    420                         'description' => __( 'Avatars of recently active members', 'buddypress' ),
     420                        'description' => __( 'Profile photos of recently active members', 'buddypress' ),
    421421                        'classname' => 'widget_bp_core_recently_active_widget buddypress widget',
    422422                );

  • trunk/src/bp-core/deprecated/2.1.php

    r8602 r8677  
    390390                        <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
    391391
    392                                 <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
     392                                <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Profile Photo', 'buddypress' ); ?></a></li>
    393393
    394394                        <?php endif; ?>
    … …  
    513513                        <?php endif ?>
    514514
    515                         <li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
     515                        <li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Profile Photo", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
    516516
    517517                        <li><a href="<?php bp_members_component_link( 'settings', 'capabilities' ); ?>"><?php _e( 'User Capabilities', 'buddypress' ); ?></a></li>

  • trunk/src/bp-groups/bp-groups-adminbar.php

    r7859 r8677  
    6262                        'parent' => $bp->group_admin_menu_id,
    6363                        'id'     => 'group-avatar',
    64                         'title'  => __( 'Edit Avatar', 'buddypress' ),
     64                        'title'  => __( 'Edit Profile Photo', 'buddypress' ),
    6565                        'href'   =>  bp_get_groups_action_link( 'admin/group-avatar' )
    6666                ) );

  • trunk/src/bp-groups/bp-groups-loader.php

    r8610 r8677  
    256256                if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {
    257257                        $this->group_creation_steps['group-avatar'] = array(
    258                                 'name'     => __( 'Avatar',   'buddypress' ),
     258                                'name'     => __( 'Profile Photo',   'buddypress' ),
    259259                                'position' => 20
    260260                        );
    … …  
    585585                                        'type'       => 'thumb',
    586586                                        'avatar_dir' => 'group-avatars',
    587                                         'alt'        => __( 'Group Avatar', 'buddypress' )
     587                                        'alt'        => __( 'Group Profile Photo', 'buddypress' )
    588588                                ) );
    589589
    590590                                if ( empty( $bp->bp_options_avatar ) ) {
    591                                         $bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Group Avatar', 'buddypress' ) . '" class="avatar" />';
     591                                        $bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Group Profile Photo', 'buddypress' ) . '" class="avatar" />';
    592592                                }
    593593                        }

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

    r8574 r8677  
    15611561        <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
    15621562
    1563                 <li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
     1563                <li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Profile Photo', 'buddypress' ); ?></a></li>
    15641564
    15651565        <?php endif; ?>
    … …  
    34563456                }
    34573457
    3458                 $this->invite->user->avatar       = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
    3459                 $this->invite->user->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
    3460                 $this->invite->user->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ), 'width' => 30, 'height' => 30 ) );
     3458                $this->invite->user->avatar       = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
     3459                $this->invite->user->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
     3460                $this->invite->user->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->invite->user->fullname ), 'width' => 30, 'height' => 30 ) );
    34613461                $this->invite->user->email        = $this->invite->user->user_email;
    34623462                $this->invite->user->user_url     = bp_core_get_user_domain( $user_id, $this->invite->user->user_nicename, $this->invite->user->user_login );

  • trunk/src/bp-members/bp-members-admin.php

    r8583 r8677  
    279279                                $notice = array(
    280280                                        'class'   => 'updated',
    281                                         'message' => __( 'Avatar was deleted successfully!', 'buddypress' )
     281                                        'message' => __( 'Profile photo was deleted.', 'buddypress' )
    282282                                );
    283283                                break;

  • trunk/src/bp-members/bp-members-adminbar.php

    r8318 r8677  
    107107                                'parent' => $bp->user_admin_menu_id,
    108108                                'id'     => $bp->user_admin_menu_id . '-change-avatar',
    109                                 'title'  => __( "Edit Avatar", 'buddypress' ),
     109                                'title'  => __( "Edit Profile Photo", 'buddypress' ),
    110110                                'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
    111111                        ) );

  • trunk/src/bp-members/bp-members-template.php

    r8641 r8677  
    16911691                        'size' => bp_core_avatar_full_width(),
    16921692                        'class' => 'avatar',
    1693                         'alt' => __( 'Your Avatar', 'buddypress' )
     1693                        'alt' => __( 'Your Profile Photo', 'buddypress' )
    16941694                );
    16951695

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

    r7965 r8677  
    155155                                <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
    156156
    157                                         <h4><?php _e( 'Crop Group Avatar', 'buddypress' ); ?></h4>
    158 
    159                                         <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Avatar to crop', 'buddypress' ); ?>" />
     157                                        <h4><?php _e( 'Crop Group Profile Photo', 'buddypress' ); ?></h4>
     158
     159                                        <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
    160160
    161161                                        <div id="avatar-crop-pane">
    162                                                 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ); ?>" />
     162                                                <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile photo preview', 'buddypress' ); ?>" />
    163163                                        </div>
    164164

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

    r8150 r8677  
    137137                                <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>
    138138
    139                                 <?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 Avatar', 'buddypress' ), 'link_text' => __( 'Delete Avatar', 'buddypress' ) ) ); ?>
     139                                <?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' ) ) ); ?>
    140140
    141141                        <?php endif; ?>
    … …  
    147147        <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
    148148
    149                 <h4><?php _e( 'Crop Avatar', 'buddypress' ); ?></h4>
    150 
    151                 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Avatar to crop', 'buddypress' ); ?>" />
     149                <h4><?php _e( 'Crop Profile Photo', 'buddypress' ); ?></h4>
     150
     151                <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
    152152
    153153                <div id="avatar-crop-pane">
    154                         <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ); ?>" />
     154                        <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile photo preview', 'buddypress' ); ?>" />
    155155                </div>
    156156

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

    r7965 r8677  
    1 <h4><?php _e( 'Change Avatar', 'buddypress' ); ?></h4>
     1<h4><?php _e( 'Change Profile Photo', 'buddypress' ); ?></h4>
    22
    33<?php do_action( 'bp_before_profile_avatar_upload_content' ); ?>
    … …  
    2222                        <?php if ( bp_get_user_has_avatar() ) : ?>
    2323                                <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>
    24                                 <p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Avatar', 'buddypress' ); ?>"><?php _e( 'Delete My Avatar', 'buddypress' ); ?></a></p>
     24                                <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>
    2525                        <?php endif; ?>
    2626
    … …  
    2929                <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
    3030
    31                         <h5><?php _e( 'Crop Your New Avatar', 'buddypress' ); ?></h5>
     31                        <h5><?php _e( 'Crop Your New Profile Photo', 'buddypress' ); ?></h5>
    3232
    33                         <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Avatar to crop', 'buddypress' ); ?>" />
     33                        <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile Photo to crop', 'buddypress' ); ?>" />
    3434
    3535                        <div id="avatar-crop-pane">
    36                                 <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ); ?>" />
     36                                <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile Photo preview', 'buddypress' ); ?>" />
    3737                        </div>
    3838

  • trunk/src/bp-xprofile/bp-xprofile-activity.php

    r8428 r8677  
    2525                __( 'Member changed profile picture', 'buddypress' ),
    2626                'bp_xprofile_format_activity_action_new_avatar',
    27                 __( 'Updated Avatars', 'buddypress' )
     27                __( 'Updated Profile Photos', 'buddypress' )
    2828        );
    2929

  • trunk/src/bp-xprofile/bp-xprofile-admin.php

    r8637 r8677  
    584584                add_meta_box(
    585585                        'bp_xprofile_user_admin_avatar',
    586                         _x( 'Avatar', 'xprofile user-admin edit screen', 'buddypress' ),
     586                        _x( 'Profile Photo', 'xprofile user-admin edit screen', 'buddypress' ),
    587587                        array( $this, 'user_admin_avatar_metabox' ),
    588588                        $screen_id,
    … …  
    844844                                $delete_link   = wp_nonce_url( $community_url, 'delete_avatar' ); ?>
    845845
    846                                 <a href="<?php echo esc_url( $delete_link ); ?>" title="<?php esc_attr_e( 'Delete Avatar', 'buddypress' ); ?>" class="bp-xprofile-avatar-user-admin"><?php esc_html_e( 'Delete Avatar', 'buddypress' ); ?></a></li>
     846                                <a href="<?php echo esc_url( $delete_link ); ?>" title="<?php esc_attr_e( 'Delete Profile Photo', 'buddypress' ); ?>" class="bp-xprofile-avatar-user-admin"><?php esc_html_e( 'Delete Profile Photo', 'buddypress' ); ?></a></li>
    847847
    848848                        <?php endif; ?>

  • trunk/src/bp-xprofile/bp-xprofile-loader.php

    r8610 r8677  
    209209                if ( buddypress()->avatar->show_avatars ) {
    210210                        $sub_nav[] = array(
    211                                 'name'            => __( 'Change Avatar', 'buddypress' ),
     211                                'name'            => __( 'Change Profile Photo', 'buddypress' ),
    212212                                'slug'            => 'change-avatar',
    213213                                'parent_url'      => $profile_link,
    … …  
    306306                                        'parent' => 'my-account-' . $this->id,
    307307                                        'id'     => 'my-account-' . $this->id . '-change-avatar',
    308                                         'title'  => __( 'Change Avatar', 'buddypress' ),
     308                                        'title'  => __( 'Change Profile Photo', 'buddypress' ),
    309309                                        'href'   => trailingslashit( $profile_link . 'change-avatar' )
    310310                                );

  • trunk/src/bp-xprofile/bp-xprofile-template.php

    r8606 r8677  
    649649                bp_core_avatar_admin( null, bp_loggedin_user_domain() . $bp->profile->slug . '/change-avatar/', bp_loggedin_user_domain() . $bp->profile->slug . '/delete-avatar/' );
    650650        else
    651                 _e( 'Avatar uploads are currently disabled. Why not use a <a href="http://gravatar.com" target="_blank">gravatar</a> instead?', 'buddypress' );
     651                _e( 'Profile photo uploads are currently disabled. Why not use a <a href="http://gravatar.com" target="_blank">gravatar</a> instead?', 'buddypress' );
    652652}
    653653
Note: See TracChangeset for help on using the changeset viewer.