localize friendly captcha (#1006)

ltb-project · Jan 9, 2025 · 6873eda · 6873eda
1 parent 25bb1bf
commit 6873eda
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/docs/developpers.rst b/docs/developpers.rst
@@ -53,7 +53,7 @@ Here is a template example of such a captcha module:
        }
    
        # Function that generate the html part containing the captcha
-       function generate_html_captcha($messages){
+       function generate_html_captcha($messages, $lang){
    
            $captcha_html ='
            <div class="row mb-3">

diff --git a/htdocs/index.php b/htdocs/index.php
@@ -244,7 +244,7 @@
 $captcha_css  = '';
 if(isset($use_captcha) && $use_captcha == true)
 {
-    $captcha_html = $captchaInstance->generate_html_captcha($messages);
+    $captcha_html = $captchaInstance->generate_html_captcha($messages, $lang);
     $captcha_js = $captchaInstance->generate_js_captcha();
     $captcha_css = $captchaInstance->generate_css_captcha();
 }

diff --git a/lib/captcha/FriendlyCaptcha.php b/lib/captcha/FriendlyCaptcha.php
@@ -43,14 +43,14 @@ function generate_js_captcha(){
     }
 
     # Function that generate the html part containing the captcha
-    function generate_html_captcha($messages){
+    function generate_html_captcha($messages, $lang){
 
         $captcha_html ='
         <div class="row mb-3">
             <div class="col-sm-4 col-form-label text-end captcha">
             </div>
             <div class="col-sm-8">
-                <div class="frc-captcha" data-sitekey="'.$this->friendlycaptcha_sitekey.'"></div>
+                <div class="frc-captcha" data-sitekey="'.$this->friendlycaptcha_sitekey.'" data-lang="'.$lang.'"></div>
             </div>
         </div>';
 

diff --git a/lib/captcha/InternalCaptcha.php b/lib/captcha/InternalCaptcha.php
@@ -62,7 +62,7 @@ function generate_js_captcha(){
     }
 
     # Function that generate the html part containing the captcha
-    function generate_html_captcha($messages){
+    function generate_html_captcha($messages, $lang){
 
         $captcha_html ='
         <div class="row mb-3">

diff --git a/lib/captcha/ReCaptcha.php b/lib/captcha/ReCaptcha.php
@@ -53,7 +53,7 @@ function generate_js_captcha(){
     }
 
     # Function that generate the html part containing the captcha
-    function generate_html_captcha($messages){
+    function generate_html_captcha($messages, $lang){
 
         $captcha_html ='
         <div class="row mb-3">

diff --git a/tests/FriendlyCaptchaTest.php b/tests/FriendlyCaptchaTest.php
@@ -48,9 +48,9 @@ public function test_generate_html_captcha(): void
                                                        $friendlycaptcha_sitekey,
                                                        $friendlycaptcha_secret);
 
-        $html = $captchaInstance->generate_html_captcha($messages);
+        $html = $captchaInstance->generate_html_captcha($messages, "en");
 
-        $this->assertMatchesRegularExpression('/<div class="frc-captcha" data-sitekey="'.$friendlycaptcha_sitekey.'">/',$html, "dummy challenge in html code");
+        $this->assertMatchesRegularExpression('/<div class="frc-captcha" data-sitekey="'.$friendlycaptcha_sitekey.'" data-lang="en">/',$html, "dummy challenge in html code");
     }
 
     public function test_verify_captcha_challenge_ok(): void

diff --git a/tests/InternalCaptchaTest.php b/tests/InternalCaptchaTest.php
@@ -44,7 +44,7 @@ public function test_generate_html_captcha(): void
                     ->method('generate_captcha_challenge')
                     ->will($this->returnValue("my-challenge"));
 
-        $html = $captchaMock->generate_html_captcha($messages);
+        $html = $captchaMock->generate_html_captcha($messages, "en");
 
         $this->assertMatchesRegularExpression('/<img src="my-challenge"/',$html, "dummy challenge in html code");
         $this->assertMatchesRegularExpression('/<input type="text" autocomplete="new-password" name="captchaphrase" id="captchaphrase" class="form-control" placeholder="Captcha"/',$html, "dummy captcha input box in html code");

diff --git a/tests/ReCaptchaTest.php b/tests/ReCaptchaTest.php
@@ -54,7 +54,7 @@ public function test_generate_html_captcha(): void
                                                  $recaptcha_secretkey,
                                                  $recaptcha_minscore);
 
-        $html = $captchaInstance->generate_html_captcha($messages);
+        $html = $captchaInstance->generate_html_captcha($messages, "en");
 
         $this->assertMatchesRegularExpression('/<input type="hidden" autocomplete="new-password" name="captchaphrase" id="captchaphrase" class="form-control"/',$html, "dummy challenge in html code");
     }