From 6cde313e47cd08216ff15d733c8de894f2657a8b Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 25 Oct 2019 09:33:09 +0200 Subject: Move translations whose message ids do not appear as literals in the sources into a separate file Test whether additional.{m,p}o files are loaded correctly --- resources/lang/en_US/additional.po | 34 ++++++++++++++++++++++++++++++++++ resources/lang/en_US/default.po | 24 ------------------------ 2 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 resources/lang/en_US/additional.po (limited to 'resources/lang/en_US') diff --git a/resources/lang/en_US/additional.po b/resources/lang/en_US/additional.po new file mode 100644 index 00000000..9943b0ab --- /dev/null +++ b/resources/lang/en_US/additional.po @@ -0,0 +1,34 @@ +msgid "" +msgstr "" +"Project-Id-Version: Engelsystem 2.0\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=2; plural=(n != 1);\n" +"Last-Translator: \n" +"Language: en_US\n" + +msgid "auth.not-found" +msgstr "No user was found or password is wrong. Please try again. If you are still having problems, ask Heaven." + +msgid "validation.password.required" +msgstr "The password is required." + +msgid "validation.login.required" +msgstr "The login name is required." + +msgid "validation.email.required" +msgstr "The email address is required." + +msgid "validation.email.email" +msgstr "This email address is not valid." + +msgid "validation.password.min" +msgstr "Your password is too short." + +msgid "validation.password.confirmed" +msgstr "Your passwords are not equal." + +msgid "validation.password_confirmation.required" +msgstr "You have to confirm your password." diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po index a2d56fd1..f7566f1d 100644 --- a/resources/lang/en_US/default.po +++ b/resources/lang/en_US/default.po @@ -22,29 +22,5 @@ msgstr "" #~ msgid "auth.no-password" #~ msgstr "Please enter a password." -msgid "auth.not-found" -msgstr "No user was found or password is wrong. Please try again. If you are still having problems, ask Heaven." - -msgid "validation.password.required" -msgstr "The password is required." - -msgid "validation.login.required" -msgstr "The login name is required." - msgid "form.submit" msgstr "Submit" - -msgid "validation.email.required" -msgstr "The email address is required." - -msgid "validation.email.email" -msgstr "This email address is not valid." - -msgid "validation.password.min" -msgstr "Your password is too short." - -msgid "validation.password.confirmed" -msgstr "Your passwords are not equal." - -msgid "validation.password_confirmation.required" -msgstr "You have to confirm your password." -- cgit v1.2.3-70-g09d2 From 8a298f0f5eedcf6520af58bdd3d5087b1fc39272 Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 24 Oct 2019 13:29:43 +0200 Subject: Replace full-text message ids with keys in credits template --- resources/lang/de_DE/default.po | 16 ++++++++++++++++ resources/lang/en_US/default.po | 16 ++++++++++++++++ resources/views/pages/credits.twig | 9 ++------- 3 files changed, 34 insertions(+), 7 deletions(-) (limited to 'resources/lang/en_US') diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index 9d2a00e3..1370fca2 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -2763,3 +2763,19 @@ msgstr "" msgid "form.submit" msgstr "Absenden" + +msgid "credits.credit" +msgstr "" +"Das ursprüngliche Engelsystem wurde entwickelt von " +"[cookie](https://github.com/cookieBerlin/engelsystem)" +". Danach wurde es von " +"[msquare](https://notrademark.de)" +" (Maintainer) und " +"[MyIgel](https://myigel.name)" +" völlig überarbeitet und verbessert." + +msgid "credits.contributors" +msgstr "" +"Eine vollständige Liste der Mitwirkenden findest Du " +"[auf GitHub](https://github.com/engelsystem/engelsystem/graphs/contributors)" +"." diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po index f7566f1d..0119865b 100644 --- a/resources/lang/en_US/default.po +++ b/resources/lang/en_US/default.po @@ -24,3 +24,19 @@ msgstr "" msgid "form.submit" msgstr "Submit" + +msgid "credits.credit" +msgstr "" +"The original engelsystem was written by " +"[cookie](https://github.com/cookieBerlin/engelsystem)" +". It was then completely rewritten and enhanced by " +"[msquare](https://notrademark.de)" +" (maintainer) and " +"[MyIgel](https://myigel.name)" +"." + +msgid "credits.contributors" +msgstr "" +"Please have a look at the " +"[contributors list on GitHub](https://github.com/engelsystem/engelsystem/graphs/contributors)" +" for a complete list." diff --git a/resources/views/pages/credits.twig b/resources/views/pages/credits.twig index 8bd1f694..7e0d3890 100644 --- a/resources/views/pages/credits.twig +++ b/resources/views/pages/credits.twig @@ -17,15 +17,10 @@

{{ __('Source code') }}

{{ __('Version: _%s_', [version])|markdown }}

- {{ __('The original engelsystem was written by -[cookie](https://github.com/cookieBerlin/engelsystem). -It was then completely rewritten and enhanced by [msquare](https://notrademark.de) (maintainer) and -[MyIgel](https://myigel.name).')|markdown }} + {{ __('credits.credit')|markdown }}

- {{ __('Please have a look at the -[contributors list on GitHub](https://github.com/engelsystem/engelsystem/graphs/contributors) -for a complete list.')|markdown }} + {{ __('credits.contributors')|markdown }}

-- cgit v1.2.3-70-g09d2