Skip to:
Content

BuddyPress.org

Changeset 10609


Ignore:
Timestamp:
02/17/2016 10:16:45 PM (8 years ago)
Author:
imath
Message:

BP Email Template: fix the email salutation i18n issue

See #6896

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-core/bp-core-template.php

    r10497 r10609  
    36833683    }
    36843684}
     3685
     3686/**
     3687 * Prints the Recipient Salutation.
     3688 *
     3689 * @since  2.5.0
     3690 *
     3691 * @param  array $settings Email Settings.
     3692 */
     3693function bp_email_the_salutation( $settings = array() ) {
     3694    echo bp_email_get_salutation( $settings );
     3695}
     3696
     3697    /**
     3698     * Gets the Recipient Salutation.
     3699     *
     3700     * @since  2.5.0
     3701     *
     3702     * @param  array  $settings Email Settings.
     3703     * @return string The Recipient Salutation.
     3704     */
     3705    function bp_email_get_salutation( $settings = array() ) {
     3706        $token = '{{recipient.name}}';
     3707
     3708        /**
     3709         * Filters The Recipient Salutation inside the Email Template.
     3710         *
     3711         * @since  2.5.0
     3712         *
     3713         * @param string $value    The Recipient Salutation.
     3714         * @param array  $settings Email Settings.
     3715         * @param string $token    The Recipient token.
     3716         */
     3717        return apply_filters( 'bp_email_get_salutation', sprintf( _x( 'Hi %s,', 'recipient salutation', 'buddypress' ), $token ), $settings, $token );
     3718    }
  • trunk/src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php

    r10607 r10609  
    171171                          <tr>
    172172                                <td style="padding: 20px; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.618 ) . 'px' ) ?>; color: <?php echo esc_attr( $settings['body_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['body_text_size'] . 'px' ); ?>" class="body_text_color body_text_size">
    173                                     <span style="font-weight: bold; font-size: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.35 ) . 'px' ); ?>" class="welcome">Hi {{recipient.name}},</span>
     173                                    <span style="font-weight: bold; font-size: <?php echo esc_attr( floor( $settings['body_text_size'] * 1.35 ) . 'px' ); ?>" class="welcome"><?php bp_email_the_salutation( $settings ); ?></span>
    174174                                    <hr color="<?php echo esc_attr( $settings['email_bg'] ); ?>"><br>
    175175                                    {{{content}}}
Note: See TracChangeset for help on using the changeset viewer.