Merge pull request #220 from metacreo/17

Make captcha multilingual

Author: nenes25

eicaptcha.php

@@ -35,6 +35,7 @@ class EiCaptcha extends Module
 
     /** @var array */
     protected $themes = [];
+
     /**
      * @var Debugger
      */
@@ -45,6 +46,11 @@ class EiCaptcha extends Module
      */
     protected $installer;
 
+    /**
+     * @var string (2 or 3 digits Language ISO code) Captcha language (default: en)
+     */
+    protected $captchaLang = 'en';
+
     public function __construct()
     {
         $this->author = 'hhennes';
@@ -70,6 +76,12 @@ public function __construct()
         $this->ps_versions_compliancy = ['min' => '1.7.0.0', 'max' => _PS_VERSION_];
 
         $this->debugger = new Debugger($this);
+
+        $this->captchaLang = $this->context->language->iso_code;
+        $forceLang = Configuration::get('CAPTCHA_FORCE_LANG');
+        if (!empty($forceLang) && Validate::isLanguageIsoCode($forceLang)) {
+            $this->captchaLang = $forceLang;
+        }
     }
 
     /**
@@ -213,7 +225,7 @@ protected function renderHeaderV2()
             </script>';
 
             if (($this->context->controller instanceof ContactController && Configuration::get('CAPTCHA_ENABLE_CONTACT') == 1)) {
-                $js .= '<script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit&hl=' . Configuration::get('CAPTCHA_FORCE_LANG') . '" async defer></script>';
+                $js .= '<script src="https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit&hl=' . $this->captchaLang . '" async defer></script>';
             }
 
             return $js;
@@ -260,8 +272,8 @@ public function hookDisplayCustomerAccountForm($params)
             $this->context->smarty->assign([
                 'captchaVersion' => Configuration::get('CAPTCHA_VERSION'),
                 'publicKey' => Configuration::get('CAPTCHA_PUBLIC_KEY'),
-                'captchaforcelang' => Configuration::get('CAPTCHA_FORCE_LANG'),
-                'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')],
+                'captchalang' => $this->captchaLang,
+                'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')]
             ]);
 
             return $this->display(__FILE__, 'views/templates/hook/hookDisplayCustomerAccountForm.tpl');
@@ -357,8 +369,8 @@ public function hookDisplayNewsletterRegistration($params)
             $this->context->smarty->assign([
                 'captchaVersion' => Configuration::get('CAPTCHA_VERSION'),
                 'publicKey' => Configuration::get('CAPTCHA_PUBLIC_KEY'),
-                'captchaforcelang' => Configuration::get('CAPTCHA_FORCE_LANG'),
-                'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')],
+                'captchalang' => $this->captchaLang,
+                'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')]
             ]);
 
             return $this->display(__FILE__, 'views/templates/hook/hookDisplayNewsletterRegistration.tpl');
@@ -437,7 +449,7 @@ public function hookActionGetEicaptchaParams($params)
             'captchaVersion' => Configuration::get('CAPTCHA_VERSION'),
             'publicKey' => Configuration::get('CAPTCHA_PUBLIC_KEY'),
             'captchaforcelang' => Configuration::get('CAPTCHA_FORCE_LANG'),
-            'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')],
+            'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')]
         ];
     }
 
@@ -454,8 +466,8 @@ public function hookDisplayEicaptchaVerification($params)
             'displayCaptcha' => $this->shouldDisplayToCustomer(),
             'captchaVersion' => Configuration::get('CAPTCHA_VERSION'),
             'publicKey' => Configuration::get('CAPTCHA_PUBLIC_KEY'),
-            'captchaforcelang' => Configuration::get('CAPTCHA_FORCE_LANG'),
-            'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')],
+            'captchalang' => $this->captchaLang,
+            'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')]
         ]);
 
         return $this->display(__FILE__, 'views/templates/hook/hookDisplayEicaptchaVerification.tpl');

views/templates/hook/hookDisplayCustomerAccountForm.tpl

@@ -33,7 +33,7 @@
              *}
             <div class="g-recaptcha" data-sitekey="{$publicKey|escape:'html'}" id="captcha-box"
                  data-theme="{$captchatheme}"></div>
-            <script src="https://www.google.com/recaptcha/api.js{if isset($captchaforcelang)}?hl={$captchaforcelang}{/if}"
+            <script src="https://www.google.com/recaptcha/api.js?hl={$captchalang}"
                     async defer></script>
         </div>
     {else}

views/templates/hook/hookDisplayEicaptchaVerification.tpl

@@ -28,7 +28,7 @@
         {if $captchaVersion == 2}
             <div class="g-recaptcha" data-sitekey="{$publicKey|escape:'html'}" id="captcha-box-custom"
                  data-theme="{$captchatheme}"></div>
-            <script src="https://www.google.com/recaptcha/api.js{if isset($captchaforcelang)}?hl={$captchaforcelang}{/if}"
+            <script src="https://www.google.com/recaptcha/api.js?hl={$captchalang}"
                     async defer></script>
         {else}
             <input type="hidden" id="captcha-box-custom" name="g-recaptcha-response"/>

views/templates/hook/hookDisplayNewsletterRegistration.tpl

@@ -26,7 +26,7 @@
 <div class="col-xs-12 pull-right">
     {if $captchaVersion == 2}
     <div class="g-recaptcha" data-sitekey="{$publicKey|escape:'html'}" id="captcha-box-newsletter" data-theme="{$captchatheme}"></div>
-    <script src="https://www.google.com/recaptcha/api.js{if isset($captchaforcelang)}?hl={$captchaforcelang}{/if}" async defer></script>
+    <script src="https://www.google.com/recaptcha/api.js?hl={$captchalang}" async defer></script>
     {else}
         <input type="hidden" id="captcha-box-newsletter" name="g-recaptcha-response"/>
         <script src="https://www.google.com/recaptcha/api.js?render={$publicKey|escape:'html'}"></script>