diff --git a/app.py b/app.py index 85366cf..742e2fb 100644 --- a/app.py +++ b/app.py @@ -134,14 +134,16 @@ def feedback(name=None): "sv": _("Swedish"), } - form.device_model.data = request.args.get('device_model') - form.software_version.data = request.args.get('software_version') + form.device_model.data = request.args.get("device_model") + form.software_version.data = request.args.get("software_version") + info_text = _("You can leave feedback about the E-library or suggest materials for acquisition. Suggestions for materials will not be responded to.") return render_template( "feedback.html", form=form, languages=languages, selected_language=get_locale(), + info_text=info_text, ) diff --git a/messages.pot b/messages.pot index e1ce9a8..a2af4c0 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-04-29 11:56+0300\n" +"POT-Creation-Date: 2024-05-22 14:16+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,63 +17,81 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.14.0\n" -#: app.py:64 +#: app.py:57 msgid "Subject" msgstr "" -#: app.py:66 +#: app.py:59 msgid "General feedback" msgstr "" -#: app.py:67 +#: app.py:60 msgid "Material procurement" msgstr "" -#: app.py:68 +#: app.py:61 msgid "Material error" msgstr "" -#: app.py:69 +#: app.py:62 msgid "Technical problem" msgstr "" -#: app.py:70 +#: app.py:63 msgid "Other" msgstr "" -#: app.py:74 +#: app.py:66 +msgid "Device model" +msgstr "" + +#: app.py:67 +msgid "Software version" +msgstr "" + +#: app.py:69 +msgid "Book name" +msgstr "" + +#: app.py:72 msgid "Message" msgstr "" -#: app.py:77 +#: app.py:76 msgid "My home municipality that receives this feedback" msgstr "" -#: app.py:86 +#: app.py:85 msgid "Email address, if you want an answer to your feedback (Optional)" msgstr "" -#: app.py:90 +#: app.py:89 msgid "Send" msgstr "" -#: app.py:128 +#: app.py:132 msgid "English" msgstr "" -#: app.py:129 +#: app.py:133 msgid "Finnish" msgstr "" -#: app.py:130 +#: app.py:134 msgid "Swedish" msgstr "" -#: app.py:193 +#: app.py:139 +msgid "" +"You can leave feedback about the E-library or suggest materials for " +"acquisition. Suggestions for materials will not be responded to." +msgstr "" + +#: app.py:192 msgid "Thank you for your feedback!" msgstr "" -#: app.py:199 +#: app.py:198 msgid "There was a problem sending your message." msgstr "" diff --git a/templates/feedback.html b/templates/feedback.html index 06c5329..90ed9fa 100644 --- a/templates/feedback.html +++ b/templates/feedback.html @@ -2,7 +2,7 @@ {% block content %}

{{ message|safe }}

{{ render_form(form) }} diff --git a/translations/en/LC_MESSAGES/messages.mo b/translations/en/LC_MESSAGES/messages.mo index 226d1de..db475fc 100644 Binary files a/translations/en/LC_MESSAGES/messages.mo and b/translations/en/LC_MESSAGES/messages.mo differ diff --git a/translations/en/LC_MESSAGES/messages.po b/translations/en/LC_MESSAGES/messages.po index 25ec211..e3a2536 100644 --- a/translations/en/LC_MESSAGES/messages.po +++ b/translations/en/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-04-29 11:56+0300\n" +"POT-Creation-Date: 2024-05-22 14:16+0300\n" "PO-Revision-Date: 2024-04-16 17:50+0300\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -18,63 +18,81 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.14.0\n" -#: app.py:64 +#: app.py:57 msgid "Subject" msgstr "" -#: app.py:66 +#: app.py:59 msgid "General feedback" msgstr "" -#: app.py:67 +#: app.py:60 msgid "Material procurement" msgstr "" -#: app.py:68 +#: app.py:61 msgid "Material error" msgstr "" -#: app.py:69 +#: app.py:62 msgid "Technical problem" msgstr "" -#: app.py:70 +#: app.py:63 msgid "Other" msgstr "" -#: app.py:74 +#: app.py:66 +msgid "Device model" +msgstr "" + +#: app.py:67 +msgid "Software version" +msgstr "" + +#: app.py:69 +msgid "Book name" +msgstr "" + +#: app.py:72 msgid "Message" msgstr "" -#: app.py:77 +#: app.py:76 msgid "My home municipality that receives this feedback" msgstr "" -#: app.py:86 +#: app.py:85 msgid "Email address, if you want an answer to your feedback (Optional)" msgstr "" -#: app.py:90 +#: app.py:89 msgid "Send" msgstr "" -#: app.py:128 +#: app.py:132 msgid "English" msgstr "" -#: app.py:129 +#: app.py:133 msgid "Finnish" msgstr "Suomi" -#: app.py:130 +#: app.py:134 msgid "Swedish" msgstr "Svenska" -#: app.py:193 +#: app.py:139 +msgid "" +"You can leave feedback about the E-library or suggest materials for " +"acquisition. Suggestions for materials will not be responded to." +msgstr "" + +#: app.py:192 msgid "Thank you for your feedback!" msgstr "" -#: app.py:199 +#: app.py:198 msgid "There was a problem sending your message." msgstr "" @@ -86,6 +104,3 @@ msgstr "" msgid "I don't want to say" msgstr "" -#~ msgid "My home municipality is missing" -#~ msgstr "" - diff --git a/translations/fi/LC_MESSAGES/messages.mo b/translations/fi/LC_MESSAGES/messages.mo index 9d62244..7367a84 100644 Binary files a/translations/fi/LC_MESSAGES/messages.mo and b/translations/fi/LC_MESSAGES/messages.mo differ diff --git a/translations/fi/LC_MESSAGES/messages.po b/translations/fi/LC_MESSAGES/messages.po index 9846b90..336ce27 100644 --- a/translations/fi/LC_MESSAGES/messages.po +++ b/translations/fi/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-04-29 11:56+0300\n" +"POT-Creation-Date: 2024-05-22 14:16+0300\n" "PO-Revision-Date: 2024-04-16 16:30+0300\n" "Last-Translator: FULL NAME \n" "Language: fi\n" @@ -18,63 +18,83 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.14.0\n" -#: app.py:64 +#: app.py:57 msgid "Subject" msgstr "Aihe" -#: app.py:66 +#: app.py:59 msgid "General feedback" msgstr "Yleinen palaute" -#: app.py:67 +#: app.py:60 msgid "Material procurement" msgstr "Aineiston hankintaehdotus" -#: app.py:68 +#: app.py:61 msgid "Material error" msgstr "Aineiston vikailmoitus" -#: app.py:69 +#: app.py:62 msgid "Technical problem" msgstr "Tekninen ongelma" -#: app.py:70 +#: app.py:63 msgid "Other" msgstr "Muu" -#: app.py:74 +#: app.py:66 +msgid "Device model" +msgstr "" + +#: app.py:67 +msgid "Software version" +msgstr "" + +#: app.py:69 +msgid "Book name" +msgstr "Kirjan nimi" + +#: app.py:72 msgid "Message" msgstr "Viesti" -#: app.py:77 +#: app.py:76 msgid "My home municipality that receives this feedback" msgstr "Kotikuntani, jolle palaute osoitetaan" -#: app.py:86 +#: app.py:85 msgid "Email address, if you want an answer to your feedback (Optional)" msgstr "Sähköpostiosoite, johon haluat vastauksen palautteellesi (Valinnainen)" -#: app.py:90 +#: app.py:89 msgid "Send" msgstr "Lähetä" -#: app.py:128 +#: app.py:132 msgid "English" msgstr "English " -#: app.py:129 +#: app.py:133 msgid "Finnish" msgstr "Suomi " -#: app.py:130 +#: app.py:134 msgid "Swedish" msgstr "Svenska " -#: app.py:193 +#: app.py:139 +msgid "" +"You can leave feedback about the E-library or suggest materials for " +"acquisition. Suggestions for materials will not be responded to." +msgstr "" +"Voit jättää palautetta E-kirjastosta tai ehdottaa hankittavia aineistoja." +" Aineistoehdotuksiin ei vastata." + +#: app.py:192 msgid "Thank you for your feedback!" msgstr "Kiitos palautteesta!" -#: app.py:199 +#: app.py:198 msgid "There was a problem sending your message." msgstr "Viestin lähetyksessä tapahtui virhe." diff --git a/translations/sv/LC_MESSAGES/messages.mo b/translations/sv/LC_MESSAGES/messages.mo index a725548..7476472 100644 Binary files a/translations/sv/LC_MESSAGES/messages.mo and b/translations/sv/LC_MESSAGES/messages.mo differ diff --git a/translations/sv/LC_MESSAGES/messages.po b/translations/sv/LC_MESSAGES/messages.po index 477c058..db14cdc 100644 --- a/translations/sv/LC_MESSAGES/messages.po +++ b/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-04-29 11:56+0300\n" +"POT-Creation-Date: 2024-05-22 14:16+0300\n" "PO-Revision-Date: 2024-04-16 16:43+0300\n" "Last-Translator: FULL NAME \n" "Language: sv\n" @@ -18,63 +18,83 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.14.0\n" -#: app.py:64 +#: app.py:57 msgid "Subject" msgstr "Ämne" -#: app.py:66 +#: app.py:59 msgid "General feedback" msgstr "Allmän respons" -#: app.py:67 +#: app.py:60 msgid "Material procurement" msgstr "Anskaffning av nytt material" -#: app.py:68 +#: app.py:61 msgid "Material error" msgstr "Fel i materialet" -#: app.py:69 +#: app.py:62 msgid "Technical problem" msgstr "Tekniskt problem" -#: app.py:70 +#: app.py:63 msgid "Other" msgstr "Annat" -#: app.py:74 +#: app.py:66 +msgid "Device model" +msgstr "" + +#: app.py:67 +msgid "Software version" +msgstr "" + +#: app.py:69 +msgid "Book name" +msgstr "Bokens namn" + +#: app.py:72 msgid "Message" msgstr "Meddelande" -#: app.py:77 +#: app.py:76 msgid "My home municipality that receives this feedback" msgstr "Min hemkommun som hanterar denna respons" -#: app.py:86 +#: app.py:85 msgid "Email address, if you want an answer to your feedback (Optional)" msgstr "Epostaddress, om du vill ha svar på din respons (Valfritt)" -#: app.py:90 +#: app.py:89 msgid "Send" msgstr "Skicka" -#: app.py:128 +#: app.py:132 msgid "English" msgstr "English " -#: app.py:129 +#: app.py:133 msgid "Finnish" msgstr "Suomi " -#: app.py:130 +#: app.py:134 msgid "Swedish" msgstr "Svenska " -#: app.py:193 +#: app.py:139 +msgid "" +"You can leave feedback about the E-library or suggest materials for " +"acquisition. Suggestions for materials will not be responded to." +msgstr "" +"Du kan lämna feedback om E-biblioteket eller föreslå material för inköp. " +"Förslag på material kommer inte att besvaras" + +#: app.py:192 msgid "Thank you for your feedback!" msgstr "Tack för din respons!" -#: app.py:199 +#: app.py:198 msgid "There was a problem sending your message." msgstr "Det uppstod ett problem med att skicka ditt meddelande."