Merge branch 'dev' into flask-upgrade

fedora-infra · Jan 22, 2024 · 3b09f39 · 3b09f39
2 parents 938e423 + c96ecb9
commit 3b09f39
Show file tree

Hide file tree

Showing 22 changed files with 34 additions and 103 deletions.
diff --git a/noggin/templates/404.html b/noggin/templates/404.html
@@ -1,13 +1,13 @@
 {% extends "main.html" %}
 
-{% block title %}404: {{ _("You've ruined everything.")}}{% endblock %}
+{% block title %}404: {{ _("That page wasn't found.")}}{% endblock %}
 
 {% block content %}
   {{ super() }}
   <div class="container section py-4">
     <div class="row">
       <div class="col">
-        <div class="alert alert-danger"><b>404</b> {{ _("That page wasn't found. You've gone and ruined everything.")}}</div>
+        <div class="alert alert-danger"><b>404</b> {{ _("That page wasn't found.")}}</div>
       </div>
     </div>
   </div>

diff --git a/noggin/translations/be/LC_MESSAGES/messages.po b/noggin/translations/be/LC_MESSAGES/messages.po
@@ -613,12 +613,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-#: noggin/templates/404.html:3
-msgid "You've ruined everything."
-msgstr ""
-
 #: noggin/templates/404.html:10
-msgid "That page wasn't found. You've gone and ruined everything."
+msgid "That page wasn't found."
 msgstr ""
 
 #: noggin/templates/_login_form.html:16

diff --git a/noggin/translations/bs/LC_MESSAGES/messages.po b/noggin/translations/bs/LC_MESSAGES/messages.po
@@ -537,11 +537,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr "Sve ste upropastili."
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "Ta stranica nije pronađena. Otišli ste i sve upropastili."
+msgid "That page wasn't found."
+msgstr "Ta stranica nije pronađena."
 
 #, fuzzy
 #| msgid "Forgot password?"

diff --git a/noggin/translations/ca/LC_MESSAGES/messages.po b/noggin/translations/ca/LC_MESSAGES/messages.po
@@ -475,10 +475,7 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr ""
-
-msgid "That page wasn't found. You've gone and ruined everything."
+msgid "That page wasn't found."
 msgstr ""
 
 msgid "Forgot Password?"

diff --git a/noggin/translations/de/LC_MESSAGES/messages.po b/noggin/translations/de/LC_MESSAGES/messages.po
@@ -535,13 +535,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr "Sie haben alles ruiniert."
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr ""
-"Die Seite wurde nicht gefunden. Sie sind vom Weg abgekommen und haben alles "
-"ruiniert."
+msgid "That page wasn't found."
+msgstr "Die Seite wurde nicht gefunden."
 
 #, fuzzy
 #| msgid "Forgot password?"

diff --git a/noggin/translations/fi/LC_MESSAGES/messages.po b/noggin/translations/fi/LC_MESSAGES/messages.po
@@ -497,11 +497,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr "Olet pilannut kaiken."
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "Sivua ei löytynyt. Olet mennyt ja pilannut kaiken."
+msgid "That page wasn't found."
+msgstr "Sitä sivua ei löytynyt."
 
 msgid "Forgot Password?"
 msgstr "Unohtuiko salasana?"

diff --git a/noggin/translations/fr_FR/LC_MESSAGES/messages.po b/noggin/translations/fr_FR/LC_MESSAGES/messages.po
@@ -539,11 +539,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr "Vous avez tout gâché."
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "Cette page n'a pas été trouvée. Et voilà, tu as tout gâché."
+msgid "That page wasn't found."
+msgstr "Cette page n'a pas été trouvée."
 
 #, fuzzy
 #| msgid "Forgot password?"

diff --git a/noggin/translations/he/LC_MESSAGES/messages.po b/noggin/translations/he/LC_MESSAGES/messages.po
@@ -490,10 +490,7 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr ""
-
-msgid "That page wasn't found. You've gone and ruined everything."
+msgid "That page wasn't found."
 msgstr ""
 
 msgid "Forgot Password?"

diff --git a/noggin/translations/hu/LC_MESSAGES/messages.po b/noggin/translations/hu/LC_MESSAGES/messages.po
@@ -474,10 +474,7 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr ""
-
-msgid "That page wasn't found. You've gone and ruined everything."
+msgid "That page wasn't found."
 msgstr ""
 
 msgid "Forgot Password?"

diff --git a/noggin/translations/id/LC_MESSAGES/messages.po b/noggin/translations/id/LC_MESSAGES/messages.po
@@ -613,12 +613,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-#: noggin/templates/404.html:3
-msgid "You've ruined everything."
-msgstr ""
-
 #: noggin/templates/404.html:10
-msgid "That page wasn't found. You've gone and ruined everything."
+msgid "That page wasn't found."
 msgstr ""
 
 #: noggin/templates/_login_form.html:16

diff --git a/noggin/translations/it/LC_MESSAGES/messages.po b/noggin/translations/it/LC_MESSAGES/messages.po
@@ -508,10 +508,7 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr ""
-
-msgid "That page wasn't found. You've gone and ruined everything."
+msgid "That page wasn't found."
 msgstr ""
 
 msgid "Forgot Password?"

diff --git a/noggin/translations/ko/LC_MESSAGES/messages.po b/noggin/translations/ko/LC_MESSAGES/messages.po
@@ -490,11 +490,8 @@ msgstr "대소문자 혼합은 허용되지 않으며, 소문자로 시도하세
 msgid "Field must not match \"%(pattern)s\"."
 msgstr "입력란은 \"%(pattern)s\"과 일치하지 않아야 합니다."
 
-msgid "You've ruined everything."
-msgstr "모든 걸 망쳤습니다."
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "해당 분야를 찾을 수 없습니다. 모든게 날라갔고 망쳐졌습니다 - 힘내요."
+msgid "That page wasn't found."
+msgstr "해당 페이지를 찾을 수 없습니다."
 
 msgid "Forgot Password?"
 msgstr "비밀번호를 잃어버렸나요?"

diff --git a/noggin/translations/messages.pot b/noggin/translations/messages.pot
@@ -613,12 +613,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-#: noggin/templates/404.html:3
-msgid "You've ruined everything."
-msgstr ""
-
 #: noggin/templates/404.html:10
-msgid "That page wasn't found. You've gone and ruined everything."
+msgid "That page wasn't found."
 msgstr ""
 
 #: noggin/templates/_login_form.html:16

diff --git a/noggin/translations/my/LC_MESSAGES/messages.po b/noggin/translations/my/LC_MESSAGES/messages.po
@@ -469,10 +469,7 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr ""
-
-msgid "That page wasn't found. You've gone and ruined everything."
+msgid "That page wasn't found."
 msgstr ""
 
 msgid "Forgot Password?"

diff --git a/noggin/translations/pt_BR/LC_MESSAGES/messages.po b/noggin/translations/pt_BR/LC_MESSAGES/messages.po
@@ -530,11 +530,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr "Você arruinou tudo."
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "A página não foi encontrada. Você foi e arruinou tudo."
+msgid "That page wasn't found."
+msgstr "Essa página não foi encontrada."
 
 #, fuzzy
 #| msgid "Forgot password?"

diff --git a/noggin/translations/pt_PT/LC_MESSAGES/messages.po b/noggin/translations/pt_PT/LC_MESSAGES/messages.po
@@ -532,11 +532,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr "Arruinou tudo."
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "Essa página não foi encontrada. Você foi e arruinou tudo."
+msgid "That page wasn't found."
+msgstr "Essa página não foi encontrada."
 
 #, fuzzy
 #| msgid "Forgot password?"

diff --git a/noggin/translations/si/LC_MESSAGES/messages.po b/noggin/translations/si/LC_MESSAGES/messages.po
@@ -472,10 +472,7 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr ""
-
-msgid "That page wasn't found. You've gone and ruined everything."
+msgid "That page wasn't found."
 msgstr ""
 
 msgid "Forgot Password?"

diff --git a/noggin/translations/sv/LC_MESSAGES/messages.po b/noggin/translations/sv/LC_MESSAGES/messages.po
@@ -389,13 +389,9 @@ msgstr "Du måste ange en andra kod"
 msgid "Token ID"
 msgstr "Token ID"
 
-#: noggin/templates/404.html:3
-msgid "You've ruined everything."
-msgstr "Du har förstört allt."
-
 #: noggin/templates/404.html:10
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "Den sidan hittades inte. Du har gått och förstört allt."
+msgid "That page wasn't found."
+msgstr "Den sidan hittades inte."
 
 #: noggin/templates/_login_form.html:11
 msgid "Forgot password?"

diff --git a/noggin/translations/tr/LC_MESSAGES/messages.po b/noggin/translations/tr/LC_MESSAGES/messages.po
@@ -528,11 +528,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr "Her şeyi mahvettiniz."
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "Bu sayfa bulunamadı. Gittiniz ve her şeyi mahvettiniz."
+msgid "That page wasn't found."
+msgstr "Bu sayfa bulunamadı."
 
 #, fuzzy
 #| msgid "Forgot password?"

diff --git a/noggin/translations/uk/LC_MESSAGES/messages.po b/noggin/translations/uk/LC_MESSAGES/messages.po
@@ -515,11 +515,8 @@ msgstr "Змішаний регістр не допускається, спро
 msgid "Field must not match \"%(pattern)s\"."
 msgstr "Поле не має відповідати \"%(pattern)s\"."
 
-msgid "You've ruined everything."
-msgstr "Ви усе зруйнували."
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "Цієї сторінки не знайдено. Ви пішли і усе зруйнували."
+msgid "That page wasn't found."
+msgstr "Ця сторінка не знайдена."
 
 msgid "Forgot Password?"
 msgstr "Забули пароль?"

diff --git a/noggin/translations/zh_Hans/LC_MESSAGES/messages.po b/noggin/translations/zh_Hans/LC_MESSAGES/messages.po
@@ -521,11 +521,8 @@ msgstr ""
 msgid "Field must not match \"%(pattern)s\"."
 msgstr ""
 
-msgid "You've ruined everything."
-msgstr "您毁灭了一切。"
-
-msgid "That page wasn't found. You've gone and ruined everything."
-msgstr "此页面无法找到。您已经离开并毁灭了一切。"
+msgid "That page wasn't found."
+msgstr "此页面无法找到。"
 
 #, fuzzy
 #| msgid "Forgot password?"

diff --git a/tests/unit/translations/test_translations.py b/tests/unit/translations/test_translations.py
@@ -43,7 +43,4 @@ def test_translation_in_template_french(client, compile_catalogs):
     assert result.status_code == 404
     page = BeautifulSoup(result.data, 'html.parser')
     message = page.select_one(".alert.alert-danger")
-    assert (
-        message.get_text(strip=True)
-        == "404Cette page n'a pas été trouvée. Et voilà, tu as tout gâché."
-    )
+    assert message.get_text(strip=True) == "404Cette page n'a pas été trouvée."