Merge pull request #12 from plone/Remove-unused-REMOTE_ADDR-code

Add german translation. Remove unused remote address code

.github/workflows/tests.yaml

@@ -7,7 +7,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - "3.6"
         - "3.7"
         - "3.8"
         plone-version:

docs/LICENSE.txt

@@ -1,4 +1,4 @@
-plone.formwidget.recaptcha is copyright Plone Foundation
+plone.formwidget.hcaptcha is copyright Plone Foundation
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

news/11.bugfix

@@ -0,0 +1 @@
+German translation for public validator error message. [ksuess] 

setup.py

@@ -21,7 +21,6 @@
         "Framework :: Plone :: 5.2",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Topic :: Software Development :: Libraries :: Python Modules",

src/plone/formwidget/hcaptcha/locales/de/LC_MESSAGES/plone.formwidget.hcaptcha.po

@@ -0,0 +1,93 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI +ZONE\n"
+"PO-Revision-Date: 2024-03-28 07:53+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language-Code: nl\n"
+"Language-Name: Dutch\n"
+"Preferred-Encodings: utf-8 latin1\n"
+"Domain: DOMAIN\n"
+"Language: eu\n"
+"X-Generator: Poedit 2.3\n"
+
+#: ../profiles/default/controlpanel.xml
+msgid "HCaptcha"
+msgstr ""
+
+#: ../restapi/controlpanel.py:16
+msgid "HCaptcha Control Panel"
+msgstr ""
+
+#: ../controlpanel.py:10
+msgid "HCaptcha settings"
+msgstr ""
+
+#: ../controlpanel.py:11
+msgid "In order to use HCaptcha on your Plone site, go to https://www.hcaptcha.com/ to create an account and to receive your private/secret and public/site key. Then configure them at https://host/path/to/site/@@hcaptcha-settings. If you don't want to rely on an external service for captcha, you might want to consider using plone.formwidget.captcha instead."
+msgstr ""
+
+#: ../interfaces.py:57
+msgid "Private Key / Secret Key"
+msgstr ""
+
+#: ../interfaces.py:50
+msgid "Public Key / Site Key"
+msgstr ""
+
+#: ../interfaces.py:80
+msgid "Size"
+msgstr ""
+
+#: ../interfaces.py:65
+msgid "The color theme of the widget."
+msgstr ""
+
+#: ../interfaces.py:81
+msgid "The size of the widget."
+msgstr ""
+
+#: ../interfaces.py:73
+msgid "The type of CAPTCHA to serve."
+msgstr ""
+
+#: ../interfaces.py:64
+msgid "Theme"
+msgstr ""
+
+#: ../interfaces.py:72
+msgid "Type"
+msgstr ""
+
+#: ../validator.py:10
+msgid "We are not yet sure whether you are human. Please try again."
+msgstr "Wir sind nicht sicher ob Sie ein Mensch sind. Bitte versuchen Sie es nochmals."
+
+#: ../interfaces.py:17
+msgid "audio"
+msgstr ""
+
+#: ../interfaces.py:23
+msgid "compact"
+msgstr ""
+
+#: ../interfaces.py:11
+msgid "dark"
+msgstr ""
+
+#: ../interfaces.py:16
+msgid "image"
+msgstr ""
+
+#: ../interfaces.py:10
+msgid "light"
+msgstr ""
+
+#: ../interfaces.py:22
+msgid "normal"
+msgstr ""

src/plone/formwidget/hcaptcha/nohcaptcha.py

@@ -65,14 +65,13 @@ def displayhtml(
     }
 
 
-def submit(hcaptcha_response_field, secret_key, remoteip, verify_server=VERIFY_SERVER):
+def submit(hcaptcha_response_field, secret_key, verify_server=VERIFY_SERVER):
     """
     Submits a HCAPTCHA request for verification. Returns HcaptchaResponse
     for the request
 
     hcaptcha_response_field -- The value from the form
     secret_key -- your HCAPTCHA secret key
-    remoteip -- the user's ip address
     """
 
     if not (hcaptcha_response_field and len(hcaptcha_response_field)):
@@ -85,7 +84,6 @@ def encode_if_necessary(s):
 
     if six.PY2:
         secret_key = encode_if_necessary(secret_key)
-        remoteip = encode_if_necessary(remoteip)
         hcaptcha_response_field = encode_if_necessary(hcaptcha_response_field)
 
     params = parse.urlencode(

src/plone/formwidget/hcaptcha/view.py

@@ -67,10 +67,8 @@ def verify(self, input=None):
                 "path/to/site/@@hcaptcha-settings to configure."
             )
         response_field = self.request.get("h-captcha-response")
-        remote_addr = self.request.get("HTTP_X_FORWARDED_FOR", "").split(",")[0]
-        if not remote_addr:
-            remote_addr = self.request.get("REMOTE_ADDR")
-        res = submit(response_field, self.settings.private_key, remote_addr)
+
+        res = submit(response_field, self.settings.private_key)
         if res.error_code:
             info.error = res.error_code