Fix Express checkout locale

thirtybees · Oct 10, 2017 · 5e3ad0b · 5e3ad0b
1 parent 7445155
commit 5e3ad0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/paypal.php b/paypal.php
@@ -819,6 +819,7 @@ public function hookHeader()
             [
                 static::LIVE    => Configuration::get(static::LIVE),
                 'incontextType' => (Tools::getValue('controller') == 'product') ? 'product' : 'cart',
+                'paypal_locale' => $this->getLocale(),
             ]
         );
 
@@ -834,7 +835,6 @@ public function hookHeader()
         ) {
             $this->context->smarty->assign(
                 [
-                    'paypal_locale' => $this->getLocale(),
                     'client_id'     => Configuration::get(static::CLIENT_ID),
                     'login_theme'   => Configuration::get(static::LOGIN_THEME),
                     'live'          => Configuration::get(static::LIVE),
@@ -869,7 +869,7 @@ public function getLocale()
      */
     public static function getLocaleByIso($iso)
     {
-        switch ($iso) {
+        switch (strtolower($iso)) {
             case 'fr':
                 return 'fr_FR';
             case 'hk':

diff --git a/views/templates/front/paypaljs.tpl b/views/templates/front/paypaljs.tpl
@@ -43,6 +43,7 @@
       $('#container_express_checkout').empty();
       paypal.Button.render({
         env: {if $PAYPAL_LIVE}'production'{else}'sandbox'{/if}, // Optional: specify 'sandbox' environment
+        locale: '{$paypal_locale|escape:'javascript':'UTF-8'}',
         payment: function (resolve, reject) {
             {if $incontextType == 'product'}
           // Prepare the cart first