Added german translations for password reset dialogs and email

2025-06-20 17:15:51 +02:00 · 2019-12-01 13:50:43 +01:00 · 2019-12-01 13:50:43 +01:00 · 9cdf31492a
commit 9cdf31492a
parent 12b3107188
8 changed files with 259 additions and 24 deletions
--- a/composer.json
+++ b/composer.json
@ -53,6 +53,7 @@
        "twig/extra-bundle": "^3.0",
        "twig/inky-extra": "^3.0",
        "twig/intl-extra": "^3.0",
+        "twig/markdown-extra": "^3.0",
        "webmozart/assert": "^1.4"
    },
    "require-dev": {
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "733245d6c57c1dc9a4ebe51098d64efe",
+    "content-hash": "1cbea7e2967b60791fefef2c4642b9bd",
    "packages": [
        {
            "name": "clue/stream-filter",
@ -8029,6 +8029,63 @@
            ],
            "time": "2019-11-15T20:33:33+00:00"
        },
+        {
+            "name": "twig/markdown-extra",
+            "version": "v3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/markdown-extra.git",
+                "reference": "609989e5bdc8cdb282e37fdc54e3591c244b5501"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/markdown-extra/zipball/609989e5bdc8cdb282e37fdc54e3591c244b5501",
+                "reference": "609989e5bdc8cdb282e37fdc54e3591c244b5501",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "twig/twig": "^2.4|^3.0"
+            },
+            "require-dev": {
+                "erusev/parsedown": "^1.7",
+                "league/commonmark": "^1.0",
+                "league/html-to-markdown": "^4.8",
+                "michelf/php-markdown": "^1.8",
+                "symfony/phpunit-bridge": "^4.4@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Twig\\Extra\\Markdown\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "A Twig extension for Markdown",
+            "homepage": "https://twig.symfony.com",
+            "keywords": [
+                "html",
+                "markdown",
+                "twig"
+            ],
+            "time": "2019-10-17T07:30:08+00:00"
+        },
        {
            "name": "twig/twig",
            "version": "v2.12.2",
--- a/src/Controller/SecurityController.php
+++ b/src/Controller/SecurityController.php
@ -82,7 +82,7 @@ class SecurityController extends AbstractController

        $builder = $this->createFormBuilder();
        $builder->add('user', TextType::class, [
-            'label' => $this->translator->trans('pw_reset.user_or_password'),
+            'label' => $this->translator->trans('pw_reset.user_or_email'),
            'constraints' => [new NotBlank()]
        ]);
        $builder->add('captcha', CaptchaType::class, [
--- a/symfony.lock
+++ b/symfony.lock
@ -730,6 +730,9 @@
    "twig/intl-extra": {
        "version": "3.x-dev"
    },
+    "twig/markdown-extra": {
+        "version": "v3.0.0"
+    },
    "twig/twig": {
        "version": "v2.6.2"
    },
--- a/templates/mail/base.html.twig
+++ b/templates/mail/base.html.twig
@ -21,7 +21,7 @@

        <row>
            <columns>
-                <p><small>This email was send automatically by <a href="{{ url('homepage') }}">Part-DB</a>. Dont answer to this email.</small></p>
+                <p><small>{% trans %}mail.footer.email_sent_by{% endtrans %} <a href="{{ url('homepage') }}">Part-DB</a>. {% trans %}mail.footer.dont_reply{% endtrans %}</small></p>
            </columns>
        </row>

--- a/templates/mail/pw_reset.html.twig
+++ b/templates/mail/pw_reset.html.twig
@ -3,27 +3,25 @@
 {% block content %}
 <row>
    <columns>
-        <h4>Hi {{ user.fullName }},</h4>
-        somebody (hopefully you) requested an reset of your password.
-        If this request was not made by you, ignore this email.
+        <h4>{% trans with {'%name%': user.fullName} %}email.hi %name%{% endtrans %},</h4>
+        {% trans %}email.pw_reset.message{% endtrans %}
        <br>
-        <button class="large expand" href="{{ url('pw_reset_new_pw', {user: user.name, token: token}) }}">Click here to reset password</button>
+        <button class="large expand" href="{{ url('pw_reset_new_pw', {user: user.name, token: token}) }}">{% trans %}email.pw_reset.button{% endtrans %}</button>
        <br>
-        If this dont work for you. Go to <a href="{{ url('pw_reset_new_pw') }}">{{ url('pw_reset_new_pw') }}</a>
-        and enter the following info:
+        {% trans with {'%url%': url('pw_reset_new_pw') } %}email.pw_reset.fallback{% endtrans %}:
        <callout class="secondary">
            <row>
                <columns>
                    <p>
-                        <b>Username: </b> {{ user.name }}
+                        <b>{% trans %}email.pw_reset.username{% endtrans %}: </b> {{ user.name }}
                    </p>
                    <p>
-                        <b>Token:</b> {{ token }}
+                        <b>{% trans %}email.pw_reset.token{% endtrans %}:</b> {{ token }}
                    </p>
                </columns>
            </row>
        </callout>
-        The reset token will be valid until <i>{{ expiration_date|format_datetime }}</i>.
+        {% trans with {'%date%' : expiration_date|format_datetime} %}email.pw_reset.valid_unit %date%{% endtrans %}
    </columns>
 </row>

--- a/translations/messages.de.xlf
+++ b/translations/messages.de.xlf
@ -808,37 +808,37 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
      </trans-unit>
      <trans-unit id="6IyG_kn" resname="Success Flash Message!">
        <source>Success Flash Message!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:45</note>
        <note priority="1">new</note>
      </trans-unit>
      <trans-unit id="Efur0Zp" resname="Error Flash Message!">
        <source>Error Flash Message!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:46</note>
        <note priority="1">new</note>
      </trans-unit>
      <trans-unit id="BRCmXY4" resname="Warning Flash Message!">
        <source>Warning Flash Message!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:47</note>
        <note priority="1">new</note>
      </trans-unit>
      <trans-unit id="Upm6RvH" resname="Notice Flash Message!">
        <source>Notice Flash Message!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:48</note>
        <note priority="1">new</note>
      </trans-unit>
      <trans-unit id="p1634fX" resname="Info Flash Message! &lt;b&gt;Test&lt;/b&gt;">
        <source>Info Flash Message! &lt;b&gt;Test&lt;/b&gt;</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:49</note>
        <note priority="1">new</note>
      </trans-unit>
      <trans-unit id="UJki1El" resname="Blabla. This message type should be not know to template!">
        <source>Blabla. This message type should be not know to template!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:51</note>
        <note priority="1">new</note>
      </trans-unit>
@ -2450,6 +2450,94 @@ Element 3</target>
        <source>part.table.attachments</source>
        <target>Dateianhänge</target>
      </trans-unit>
+      <trans-unit id="B1T9Kt6" resname="pw_reset.user_or_email">
+        <source>pw_reset.user_or_email</source>
+        <target state="translated">Benutzername / Email</target>
+      </trans-unit>
+      <trans-unit id="C_43E5l" resname="pw_reset.request.success">
+        <source>pw_reset.request.success</source>
+        <target state="translated">Passwort Anfrage erfolgreich! Überprüfen Sie Ihre Emails für weitere Informationen.</target>
+      </trans-unit>
+      <trans-unit id="Ytlen4L" resname="pw_reset.username">
+        <source>pw_reset.username</source>
+        <target state="translated">Benutzername</target>
+      </trans-unit>
+      <trans-unit id="kCND5gR" resname="pw_reset.token">
+        <source>pw_reset.token</source>
+        <target state="translated">Token</target>
+      </trans-unit>
+      <trans-unit id="Kz.sA0j" resname="pw_reset.new_pw.error">
+        <source>pw_reset.new_pw.error</source>
+        <target state="translated">Benutzername oder Token ungültig! Überprüfen Sie ihre Eingaben.</target>
+      </trans-unit>
+      <trans-unit id="Uy8yPX1" resname="pw_reset.new_pw.success">
+        <source>pw_reset.new_pw.success</source>
+        <target state="translated">Passwort wurde erfolgreich zurückgesetzt. Sie können sich nun mit dem neuen Passwort einloggen.</target>
+      </trans-unit>
+      <trans-unit id="ya0_S7f" resname="attachment.table.type">
+        <source>attachment.table.type</source>
+        <target state="translated">Anhangstyp</target>
+      </trans-unit>
+      <trans-unit id="JVlktlG" resname="pw_reset.email.subject">
+        <source>pw_reset.email.subject</source>
+        <target state="translated">Passwort Reset für Ihren Part-DB Account</target>
+      </trans-unit>
+      <trans-unit id="Rc1M3PN" resname="mail.footer.email_sent_by">
+        <source>mail.footer.email_sent_by</source>
+        <target state="translated">Diese Email wurde automatisch erstellt von</target>
+      </trans-unit>
+      <trans-unit id="AchaWxK" resname="mail.footer.dont_reply">
+        <source>mail.footer.dont_reply</source>
+        <target state="translated">Antworten Sie nicht auf diese Email.</target>
+      </trans-unit>
+      <trans-unit id="S6Fot75" resname="email.hi %name%">
+        <source>email.hi %name%</source>
+        <target state="translated">Hallo %name%</target>
+      </trans-unit>
+      <trans-unit id="VKSPbrb" resname="email.pw_reset.message">
+        <source>email.pw_reset.message</source>
+        <target state="translated">jemand (hoffentlich Sie) hat ein Reset ihres Passwortes angefordert. Wenn diese Anfrage nicht von Ihnen stammt, ignorieren sie diese Email.</target>
+      </trans-unit>
+      <trans-unit id="lu8bcCN" resname="email.pw_reset.button">
+        <source>email.pw_reset.button</source>
+        <target state="translated">Passwort zurücksetzen</target>
+      </trans-unit>
+      <trans-unit id="tS_htiy" resname="email.pw_reset.fallback">
+        <source>email.pw_reset.fallback</source>
+        <target state="translated"><![CDATA[Wenn dies nicht funktioniert, rufen Sie <a href="%url%">%url%</a> auf und geben Sie die folgenden Daten ein]]></target>
+      </trans-unit>
+      <trans-unit id="QBTV5KP" resname="email.pw_reset.username">
+        <source>email.pw_reset.username</source>
+        <target state="translated">Benutzername</target>
+      </trans-unit>
+      <trans-unit id="6UyKd6G" resname="email.pw_reset.token">
+        <source>email.pw_reset.token</source>
+        <target state="translated">Token</target>
+      </trans-unit>
+      <trans-unit id="3Rl4ELy" resname="email.pw_reset.valid_unit %date%">
+        <source>email.pw_reset.valid_unit %date%</source>
+        <target state="translated"><![CDATA[Das Reset Token ist gültig bis <i>%date%</i>]]></target>
+      </trans-unit>
+      <trans-unit id="GO.ZhTX" resname="pw_reset.password_forget">
+        <source>pw_reset.password_forget</source>
+        <target state="translated">Nutzername/Passwort vergessen?</target>
+      </trans-unit>
+      <trans-unit id="hbW2JJr" resname="pw_reset.new_pw.header.title">
+        <source>pw_reset.new_pw.header.title</source>
+        <target state="translated">Neues Passwort setzen</target>
+      </trans-unit>
+      <trans-unit id="3Tgn6io" resname="pw_reset.request.header.title">
+        <source>pw_reset.request.header.title</source>
+        <target state="translated">Neues Passwort anfordern</target>
+      </trans-unit>
+      <trans-unit id="Eorzg9b" resname="ui.toggle_darkmode">
+        <source>ui.toggle_darkmode</source>
+        <target state="translated">Darkmode</target>
+      </trans-unit>
+      <trans-unit id="Ed3ydow" resname="pw_reset.submit">
+        <source>pw_reset.submit</source>
+        <target state="translated">Passwort zurücksetzen</target>
+      </trans-unit>
    </body>
  </file>
 </xliff>
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@ -777,32 +777,32 @@ Subelements will be moved upwards.]]></target>
      </trans-unit>
      <trans-unit id="6IyG_kn" resname="Success Flash Message!">
        <source>Success Flash Message!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:45</note>
      </trans-unit>
      <trans-unit id="Efur0Zp" resname="Error Flash Message!">
        <source>Error Flash Message!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:46</note>
      </trans-unit>
      <trans-unit id="BRCmXY4" resname="Warning Flash Message!">
        <source>Warning Flash Message!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:47</note>
      </trans-unit>
      <trans-unit id="Upm6RvH" resname="Notice Flash Message!">
        <source>Notice Flash Message!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:48</note>
      </trans-unit>
      <trans-unit id="p1634fX" resname="Info Flash Message! &lt;b&gt;Test&lt;/b&gt;">
        <source>Info Flash Message! &lt;b&gt;Test&lt;/b&gt;</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:49</note>
      </trans-unit>
      <trans-unit id="UJki1El" resname="Blabla. This message type should be not know to template!">
        <source>Blabla. This message type should be not know to template!</source>
-        <target></target>
+        <target/>
        <note priority="1">src\Controller\DebugController.php:51</note>
      </trans-unit>
      <trans-unit id="6xOvKkk" resname="part.edited_flash">
@ -2421,6 +2421,94 @@ Element 3</target>
        <source>part.table.attachments</source>
        <target>Attachments</target>
      </trans-unit>
+      <trans-unit id="B1T9Kt6" resname="pw_reset.user_or_email">
+        <source>pw_reset.user_or_email</source>
+        <target state="translated">Username / Email</target>
+      </trans-unit>
+      <trans-unit id="C_43E5l" resname="pw_reset.request.success">
+        <source>pw_reset.request.success</source>
+        <target state="translated">Reset request was successful! Please check your emails for further instructions.</target>
+      </trans-unit>
+      <trans-unit id="Ytlen4L" resname="pw_reset.username">
+        <source>pw_reset.username</source>
+        <target state="translated">Username</target>
+      </trans-unit>
+      <trans-unit id="kCND5gR" resname="pw_reset.token">
+        <source>pw_reset.token</source>
+        <target state="translated">Token</target>
+      </trans-unit>
+      <trans-unit id="Kz.sA0j" resname="pw_reset.new_pw.error">
+        <source>pw_reset.new_pw.error</source>
+        <target state="translated">Username or Token invalid! Please check your input.</target>
+      </trans-unit>
+      <trans-unit id="Uy8yPX1" resname="pw_reset.new_pw.success">
+        <source>pw_reset.new_pw.success</source>
+        <target state="translated">Password was reset successfully. You can now login with your new password.</target>
+      </trans-unit>
+      <trans-unit id="ya0_S7f" resname="attachment.table.type">
+        <source>attachment.table.type</source>
+        <target state="translated">Attachment type</target>
+      </trans-unit>
+      <trans-unit id="JVlktlG" resname="pw_reset.email.subject">
+        <source>pw_reset.email.subject</source>
+        <target state="translated">Password reset for your Part-DB account</target>
+      </trans-unit>
+      <trans-unit id="Rc1M3PN" resname="mail.footer.email_sent_by">
+        <source>mail.footer.email_sent_by</source>
+        <target state="translated">This email was sent automatically by</target>
+      </trans-unit>
+      <trans-unit id="AchaWxK" resname="mail.footer.dont_reply">
+        <source>mail.footer.dont_reply</source>
+        <target state="translated">Do not answer to this email.</target>
+      </trans-unit>
+      <trans-unit id="S6Fot75" resname="email.hi %name%">
+        <source>email.hi %name%</source>
+        <target state="translated">Hi %name%</target>
+      </trans-unit>
+      <trans-unit id="VKSPbrb" resname="email.pw_reset.message">
+        <source>email.pw_reset.message</source>
+        <target state="translated">somebody (hopefully you) requested a reset of your password. If this request was not made by you, ignore this mail.</target>
+      </trans-unit>
+      <trans-unit id="lu8bcCN" resname="email.pw_reset.button">
+        <source>email.pw_reset.button</source>
+        <target state="translated">Click here to reset password</target>
+      </trans-unit>
+      <trans-unit id="tS_htiy" resname="email.pw_reset.fallback">
+        <source>email.pw_reset.fallback</source>
+        <target state="translated"><![CDATA[If this does not work for you, go to <a href="%url%">%url%</a> and enter the following info]]></target>
+      </trans-unit>
+      <trans-unit id="QBTV5KP" resname="email.pw_reset.username">
+        <source>email.pw_reset.username</source>
+        <target state="translated">Username</target>
+      </trans-unit>
+      <trans-unit id="6UyKd6G" resname="email.pw_reset.token">
+        <source>email.pw_reset.token</source>
+        <target state="translated">Token</target>
+      </trans-unit>
+      <trans-unit id="3Rl4ELy" resname="email.pw_reset.valid_unit %date%">
+        <source>email.pw_reset.valid_unit %date%</source>
+        <target state="translated"><![CDATA[The reset token will be valid until <i>%date%</i>.]]></target>
+      </trans-unit>
+      <trans-unit id="GO.ZhTX" resname="pw_reset.password_forget">
+        <source>pw_reset.password_forget</source>
+        <target state="translated">Forgot username/password?</target>
+      </trans-unit>
+      <trans-unit id="hbW2JJr" resname="pw_reset.new_pw.header.title">
+        <source>pw_reset.new_pw.header.title</source>
+        <target state="translated">Set new password</target>
+      </trans-unit>
+      <trans-unit id="3Tgn6io" resname="pw_reset.request.header.title">
+        <source>pw_reset.request.header.title</source>
+        <target state="translated">Request a new password</target>
+      </trans-unit>
+      <trans-unit id="Eorzg9b" resname="ui.toggle_darkmode">
+        <source>ui.toggle_darkmode</source>
+        <target state="translated">Darkmode</target>
+      </trans-unit>
+      <trans-unit id="Ed3ydow" resname="pw_reset.submit">
+        <source>pw_reset.submit</source>
+        <target state="translated">Reset password</target>
+      </trans-unit>
    </body>
  </file>
 </xliff>