10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-13 11:46:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed creating a file in a theme for another language.

Browse Source 
- fixed sending emails template in the standard language for administrator.
- fixed sending a standard template email, if not for the current language
This commit is contained in:
Denis Baranov
2017-12-18 18:01:42 +02:00
parent d96b612fa7
commit d460139473
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-mail.php
+33 -15
View File
@@ -75,7 +75,6 @@ if ( ! class_exists( 'Mail' ) ) {
* @return bool|string
*/
function get_email_template( $slug, $args = array() ) {
$located = $this->locate_template( $slug );
$located = apply_filters( 'um_email_template_path', $located, $slug, $args );
@@ -142,18 +141,24 @@ if ( ! class_exists( 'Mail' ) ) {
*/
function locate_template( $template_name ) {
//WPML compatibility and multilingual email templates
$lang = get_locale();
$arr_english_lang = array( 'en', 'en_US', 'en_NZ', 'en_ZA', 'en_AU', 'en_GB' );
if ( in_array( $lang, $arr_english_lang ) || strpos( $lang , 'en_' ) > -1 || empty( $lang ) || $lang == 0 ) {
$lang = '';
} else {
$lang .= '/';
global $sitepress;
$default_language_code = $sitepress->get_locale_from_language_code($sitepress->get_default_language());
$current_language_code = $sitepress->get_locale_from_language_code($sitepress->get_current_language());
$lang = '';
if ( $default_language_code != $current_language_code &&
UM()->config()->email_notifications[$template_name]['recipient'] != 'admin' ) {
$lang = $current_language_code.'/';
}
// check if there is template at theme folder
$template = locate_template( array(
trailingslashit( 'ultimate-member/email' ) . $lang . $template_name . '.php'
trailingslashit( 'ultimate-member/email' ) . $lang . $template_name . '.php',
trailingslashit( 'ultimate-member/email' ) . $template_name . '.php'
) );
//if there isn't template at theme folder get template file from plugin dir
@@ -177,15 +182,18 @@ if ( ! class_exists( 'Mail' ) ) {
*/
function template_in_theme( $template_name, $html = false ) {
//WPML compatibility and multilingual email templates
$lang = get_locale();
$arr_english_lang = array( 'en', 'en_US', 'en_NZ', 'en_ZA', 'en_AU', 'en_GB' );
global $sitepress;
if ( in_array( $lang, $arr_english_lang ) || strpos( $lang , 'en_' ) > -1 || empty( $lang ) || $lang == 0 ) {
$lang = '';
} else {
$lang .= '/';
$default_language_code = $sitepress->get_locale_from_language_code($sitepress->get_default_language());
$current_language_code = $sitepress->get_locale_from_language_code($sitepress->get_current_language());
$lang = '';
if ( $default_language_code != $current_language_code ) {
$lang = $current_language_code.'/';
}
$ext = ! $html ? '.php' : '.html';
// check if there is template at theme folder
@@ -208,13 +216,23 @@ if ( ! class_exists( 'Mail' ) ) {
* @return string
*/
function get_template_file( $location, $template_name, $html = false ) {
global $sitepress;
$template_path = '';
$default_language_code = $sitepress->get_locale_from_language_code($sitepress->get_default_language());
$current_language_code = $sitepress->get_locale_from_language_code($sitepress->get_current_language());
$lang = '';
if ( $default_language_code != $current_language_code ) {
$lang = $current_language_code.'/';
}
$ext = ! $html ? '.php' : '.html';
switch( $location ) {
case 'theme':
$template_path = trailingslashit( get_stylesheet_directory() . '/ultimate-member/email' ) . $template_name . $ext;
$template_path = trailingslashit( get_stylesheet_directory() . '/ultimate-member/email' ). $lang . $template_name . $ext;
break;
case 'plugin':
$path = ! empty( $this->path_by_slug[ $template_name ] ) ? $this->path_by_slug[ $template_name ] : um_path . 'templates/email';