Merge branch '17' of github.com:nenes25/eicaptcha into 17

Author: nenes25

changelog.txt

@@ -7,20 +7,21 @@
  */
 
  - V 2.4.0 - 2022-       #202 V2.3.1: les modes sombre et clair sont inversés
-                         #205 Captcha box is not visible (Clarify behavior of V3 keys )
+                         #205 Captcha box is not visible (Clarify behavior of V3 keys)
                          #184 Don't require recaptcha for logged in clients
                          #217 Allow to validate custom forms
                          #169 Problème lors de la validation de mon formulaire
                          #165 Rename Hook hookActionContactFormSubmitCaptcha
- - V 2.3.1 - 2021-09-29  : #201 Added displayNewsletterRegistration hook to installation method ( thanks to gdebrion )
+                         #162 V2.0.4 not detect PS language switching (thanks to metacreo)
+ - V 2.3.1 - 2021-09-29  : #201 Added displayNewsletterRegistration hook to installation method (thanks to gdebrion)
  - V 2.3.0 - 2021-09-06  : #94 Recaptcha v3
                           #188 Compatible with reCaptcha V3 (V2 is not available anymore on Google reCaptcha Entreprise)
                           #113 not compatible with recaptcha V3
                           #195 Improve debug information
                           #196 Improve Code quality : introduce phpcsfixer and phpstan
  - V 2.2.0 - 2021-08-10 : Code refactoring
  - V 2.1.1 - 2021-04-16 : #186 Wrong ps_emailsubscription version comparison
- - V 2.1.0 - 2021-03-15 : Add support for newsletter registration ( in certain conditions )
+ - V 2.1.0 - 2021-03-15 : Add support for newsletter registration (in certain conditions)
                           #164 eicaptcha newsletter filtering
                           #179 Better display debug mode in back office
                           #180 Display link to github issues in debug module

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,7 +272,7 @@ 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'),
+                'captchalang' => $this->captchaLang,
                 'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')],
             ]);
 
@@ -357,7 +369,7 @@ 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'),
+                'captchalang' => $this->captchaLang,
                 'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')],
             ]);
 
@@ -457,7 +469,7 @@ public function hookDisplayEicaptchaVerification($params)
             'displayCaptcha' => $this->shouldDisplayToCustomer(),
             'captchaVersion' => Configuration::get('CAPTCHA_VERSION'),
             'publicKey' => Configuration::get('CAPTCHA_PUBLIC_KEY'),
-            'captchaforcelang' => Configuration::get('CAPTCHA_FORCE_LANG'),
+            'captchalang' => $this->captchaLang,
             'captchatheme' => $this->themes[Configuration::get('CAPTCHA_THEME')],
         ]);
 

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>