Skip to content
This repository has been archived by the owner on Mar 17, 2022. It is now read-only.

Fix order email title & subject translations #414

Merged
merged 3 commits into from
May 6, 2019
Merged

Fix order email title & subject translations #414

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7cf2fb
Fix #415 order email title & subject translations
Annih May 1, 2019
c3e543f
Fix #416 Setup default value for new_order_recipient email setting
Annih May 1, 2019
ff178db
Reindent method translateEmailStringToOrderLanguage
Annih May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions src/Hyyan/WPI/Emails.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public function registerEmailStringsForTranslation()
$emails = $wc_emails->get_emails();

$this->default_settings = apply_filters(HooksInterface::EMAILS_DEFAULT_SETTINGS_FILTER, array(
'new_order_recipient' => __( $emails[ 'WC_Email_New_Order' ]->get_recipient(), 'woocommerce' ),
'new_order_subject' => __( $emails[ 'WC_Email_New_Order' ]->get_default_subject(), 'woocommerce' ),
'new_order_heading' => __( $emails[ 'WC_Email_New_Order' ]->get_default_heading(), 'woocommerce' ),
'customer_processing_order_subject' => __( $emails[ 'WC_Email_Customer_Processing_Order' ]->get_default_subject(), 'woocommerce' ),
Expand Down Expand Up @@ -678,12 +679,11 @@ public function translateEmailStringToOrderLanguage($string, $order, $string_typ
return $string;
}
}
$locale = get_locale();
$baseLocale = get_option( 'WPLANG' );
$locale = get_locale();

// Get setting used to register string in the Polylang strings translation table
$_string = $string; // Store original string to return in case of error
// Switch language
// Switch language if current locale is not the same as the order
if ( $order_language != $locale ) {
$test = $this->getEmailSetting( $string_type, $email_type );
if ( ! $test ) {
Expand All @@ -694,31 +694,32 @@ public function translateEmailStringToOrderLanguage($string, $order, $string_typ
}
$string = $test;
$this->switchLanguage( $order_language );
}

$test = pll_translate_string( $string, $order_language );
if ( $test != $string ) {
$string = $test;
} else {
// If no user translation found in Polylang Strings Translations table, use WooCommerce default translation
$string = __( $this->default_settings[ $email_type . '_' . $string_type ], 'woocommerce' );
}
// Perform the translation
$test = pll_translate_string( $string, $order_language );
if ( $test != $string ) {
$string = $test;
} else {
// If no user translation found in Polylang Strings Translations table, use WooCommerce default translation
$string = __( $this->default_settings[ $email_type . '_' . $string_type ], 'woocommerce' );
}

if ($order) {
$find = array();
$replace = array();
if ($order) {
$find = array();
$replace = array();

$find['order-date'] = '{order_date}';
$find['order-number'] = '{order_number}';
$find['site_title'] = '{site_title}';
$find['order-date'] = '{order_date}';
$find['order-number'] = '{order_number}';
$find['site_title'] = '{site_title}';

$replace['order-date'] = date_i18n(wc_date_format(), strtotime($order->get_date_created()));
$replace['order-number'] = $order->get_order_number();
$replace['site_title'] = get_bloginfo('name');
$replace['order-date'] = date_i18n(wc_date_format(), strtotime($order->get_date_created()));
$replace['order-number'] = $order->get_order_number();
$replace['site_title'] = get_bloginfo('name');

$string = str_replace(apply_filters(HooksInterface::EMAILS_ORDER_FIND_REPLACE_FIND_FILTER, $find, $order), apply_filters(HooksInterface::EMAILS_ORDER_FIND_REPLACE_REPLACE_FILTER, $replace, $order), $string);
}
return $string;
$string = str_replace(apply_filters(HooksInterface::EMAILS_ORDER_FIND_REPLACE_FIND_FILTER, $find, $order), apply_filters(HooksInterface::EMAILS_ORDER_FIND_REPLACE_REPLACE_FILTER, $replace, $order), $string);
}
return $string;
}

/**
Expand Down