Merge pull request #137 from ppfeufer/development

[RELEASE] v2.24.3

CHANGELOG.md

@@ -9,6 +9,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [In Development] - Unreleased
 
 
+## [2.24.3] - 2023-07-30
+
+### Added
+
+- Bootstrap CSS fix
+- Footer to promote help with the app translation
+
+### Changed
+
+- Ukrainian translation improved
+- Translation string unified (No need for 2 different strings for the same thing)
+
+
 ## [2.24.2] - 2023-06-27
 
 ### Fixed

fleetpings/form.py

@@ -151,7 +151,7 @@ class FleetPingForm(forms.Form):
     )
     fleet_doctrine_url = forms.CharField(
         required=False,
-        label=_("Doctrine URL"),
+        label=_("Doctrine link"),
         widget=forms.TextInput(attrs={"hidden": "hidden"}),
     )
     webhook_embed_color = forms.CharField(

fleetpings/locale/de/LC_MESSAGES/django.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-23 13:29+0200\n"
-"PO-Revision-Date: 2023-06-24 13:57+0000\n"
+"POT-Creation-Date: 2023-07-27 23:37+0200\n"
+"PO-Revision-Date: 2023-07-28 22:39+0000\n"
 "Last-Translator: Peter Pfeufer <[email protected]>\n"
 "Language-Team: German <https://weblate.ppfeufer.de/projects/"
 "alliance-auth-apps/aa-fleetpings/de/>\n"
@@ -16,10 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.18.1\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #: __init__.py:12 templates/fleetpings/base.html:5
-#: templates/fleetpings/base.html:8
+#: templates/fleetpings/base.html:10
 msgid "Fleet Pings"
 msgstr "Flotten-Ankündigungen"
 
@@ -31,7 +31,7 @@ msgstr "Flottenkommunikation"
 msgid "Doctrine"
 msgstr "Doktrin"
 
-#: admin.py:126 models.py:174
+#: admin.py:126 form.py:154 models.py:174
 msgid "Doctrine link"
 msgstr "Doktrin Link"
 
@@ -150,10 +150,6 @@ msgstr ""
 msgid "Fleet Comms"
 msgstr "Flottenkommunikation"
 
-#: form.py:154
-msgid "Doctrine URL"
-msgstr "Doktrin URL"
-
 #: form.py:159
 msgid "Webhook Embed Color"
 msgstr "Webhook Embed Farbe"
@@ -495,6 +491,23 @@ msgstr ""
 "guter FC und wirf Sie es in einen Discord Chat, damit auch einige Leute in "
 "die Flotte kommen."
 
+#: templates/fleetpings/partials/footer/app-translation-footer.html:4
+msgid "Join our team of translators!"
+msgstr "Tritt unserm Team von Übersetzern bei!"
+
+#: templates/fleetpings/partials/footer/app-translation-footer.html:7
+#, python-format
+msgid ""
+"\n"
+"            Do you want to help translate this app into your language or "
+"improve the existing translation? - %(weblate_link)s\n"
+"        "
+msgstr ""
+"\n"
+"            Du möchtest helfen diese App in Deine Sprache zu übersetzen oder "
+"die bestehende Übersetzung verbessern? - %(weblate_link)s\n"
+"        "
+
 #: templates/fleetpings/partials/form/form.html:68
 msgid "Create Ping"
 msgstr "Ping erstellen"

fleetpings/locale/django.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-23 13:29+0200\n"
+"POT-Creation-Date: 2023-07-27 23:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: __init__.py:12 templates/fleetpings/base.html:5
-#: templates/fleetpings/base.html:8
+#: templates/fleetpings/base.html:10
 msgid "Fleet Pings"
 msgstr ""
 
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Doctrine"
 msgstr ""
 
-#: admin.py:126 models.py:174
+#: admin.py:126 form.py:154 models.py:174
 msgid "Doctrine link"
 msgstr ""
 
@@ -142,10 +142,6 @@ msgstr ""
 msgid "Fleet Comms"
 msgstr ""
 
-#: form.py:154
-msgid "Doctrine URL"
-msgstr ""
-
 #: form.py:159
 msgid "Webhook Embed Color"
 msgstr ""
@@ -450,6 +446,19 @@ msgid ""
 "and throw it in your chat so you actually get some people in fleet."
 msgstr ""
 
+#: templates/fleetpings/partials/footer/app-translation-footer.html:4
+msgid "Join our team of translators!"
+msgstr ""
+
+#: templates/fleetpings/partials/footer/app-translation-footer.html:7
+#, python-format
+msgid ""
+"\n"
+"            Do you want to help translate this app into your language or "
+"improve the existing translation? - %(weblate_link)s\n"
+"        "
+msgstr ""
+
 #: templates/fleetpings/partials/form/form.html:68
 msgid "Create Ping"
 msgstr ""

fleetpings/locale/es/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-23 13:29+0200\n"
+"POT-Creation-Date: 2023-07-27 23:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: __init__.py:12 templates/fleetpings/base.html:5
-#: templates/fleetpings/base.html:8
+#: templates/fleetpings/base.html:10
 msgid "Fleet Pings"
 msgstr ""
 
@@ -31,7 +31,7 @@ msgstr ""
 msgid "Doctrine"
 msgstr ""
 
-#: admin.py:126 models.py:174
+#: admin.py:126 form.py:154 models.py:174
 msgid "Doctrine link"
 msgstr ""
 
@@ -143,10 +143,6 @@ msgstr ""
 msgid "Fleet Comms"
 msgstr ""
 
-#: form.py:154
-msgid "Doctrine URL"
-msgstr ""
-
 #: form.py:159
 msgid "Webhook Embed Color"
 msgstr ""
@@ -451,6 +447,19 @@ msgid ""
 "and throw it in your chat so you actually get some people in fleet."
 msgstr ""
 
+#: templates/fleetpings/partials/footer/app-translation-footer.html:4
+msgid "Join our team of translators!"
+msgstr ""
+
+#: templates/fleetpings/partials/footer/app-translation-footer.html:7
+#, python-format
+msgid ""
+"\n"
+"            Do you want to help translate this app into your language or "
+"improve the existing translation? - %(weblate_link)s\n"
+"        "
+msgstr ""
+
 #: templates/fleetpings/partials/form/form.html:68
 msgid "Create Ping"
 msgstr ""

fleetpings/locale/fr_FR/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-23 13:29+0200\n"
+"POT-Creation-Date: 2023-07-27 23:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: __init__.py:12 templates/fleetpings/base.html:5
-#: templates/fleetpings/base.html:8
+#: templates/fleetpings/base.html:10
 msgid "Fleet Pings"
 msgstr ""
 
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Doctrine"
 msgstr ""
 
-#: admin.py:126 models.py:174
+#: admin.py:126 form.py:154 models.py:174
 msgid "Doctrine link"
 msgstr ""
 
@@ -142,10 +142,6 @@ msgstr ""
 msgid "Fleet Comms"
 msgstr ""
 
-#: form.py:154
-msgid "Doctrine URL"
-msgstr ""
-
 #: form.py:159
 msgid "Webhook Embed Color"
 msgstr ""
@@ -450,6 +446,19 @@ msgid ""
 "and throw it in your chat so you actually get some people in fleet."
 msgstr ""
 
+#: templates/fleetpings/partials/footer/app-translation-footer.html:4
+msgid "Join our team of translators!"
+msgstr ""
+
+#: templates/fleetpings/partials/footer/app-translation-footer.html:7
+#, python-format
+msgid ""
+"\n"
+"            Do you want to help translate this app into your language or "
+"improve the existing translation? - %(weblate_link)s\n"
+"        "
+msgstr ""
+
 #: templates/fleetpings/partials/form/form.html:68
 msgid "Create Ping"
 msgstr ""

fleetpings/locale/it_IT/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-23 13:29+0200\n"
+"POT-Creation-Date: 2023-07-27 23:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: __init__.py:12 templates/fleetpings/base.html:5
-#: templates/fleetpings/base.html:8
+#: templates/fleetpings/base.html:10
 msgid "Fleet Pings"
 msgstr ""
 
@@ -30,7 +30,7 @@ msgstr ""
 msgid "Doctrine"
 msgstr ""
 
-#: admin.py:126 models.py:174
+#: admin.py:126 form.py:154 models.py:174
 msgid "Doctrine link"
 msgstr ""
 
@@ -142,10 +142,6 @@ msgstr ""
 msgid "Fleet Comms"
 msgstr ""
 
-#: form.py:154
-msgid "Doctrine URL"
-msgstr ""
-
 #: form.py:159
 msgid "Webhook Embed Color"
 msgstr ""
@@ -450,6 +446,19 @@ msgid ""
 "and throw it in your chat so you actually get some people in fleet."
 msgstr ""
 
+#: templates/fleetpings/partials/footer/app-translation-footer.html:4
+msgid "Join our team of translators!"
+msgstr ""
+
+#: templates/fleetpings/partials/footer/app-translation-footer.html:7
+#, python-format
+msgid ""
+"\n"
+"            Do you want to help translate this app into your language or "
+"improve the existing translation? - %(weblate_link)s\n"
+"        "
+msgstr ""
+
 #: templates/fleetpings/partials/form/form.html:68
 msgid "Create Ping"
 msgstr ""

fleetpings/locale/ja/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-23 13:29+0200\n"
+"POT-Creation-Date: 2023-07-27 23:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: __init__.py:12 templates/fleetpings/base.html:5
-#: templates/fleetpings/base.html:8
+#: templates/fleetpings/base.html:10
 msgid "Fleet Pings"
 msgstr ""
 
@@ -31,7 +31,7 @@ msgstr ""
 msgid "Doctrine"
 msgstr ""
 
-#: admin.py:126 models.py:174
+#: admin.py:126 form.py:154 models.py:174
 msgid "Doctrine link"
 msgstr ""
 
@@ -143,10 +143,6 @@ msgstr ""
 msgid "Fleet Comms"
 msgstr ""
 
-#: form.py:154
-msgid "Doctrine URL"
-msgstr ""
-
 #: form.py:159
 msgid "Webhook Embed Color"
 msgstr ""
@@ -451,6 +447,19 @@ msgid ""
 "and throw it in your chat so you actually get some people in fleet."
 msgstr ""
 
+#: templates/fleetpings/partials/footer/app-translation-footer.html:4
+msgid "Join our team of translators!"
+msgstr ""
+
+#: templates/fleetpings/partials/footer/app-translation-footer.html:7
+#, python-format
+msgid ""
+"\n"
+"            Do you want to help translate this app into your language or "
+"improve the existing translation? - %(weblate_link)s\n"
+"        "
+msgstr ""
+
 #: templates/fleetpings/partials/form/form.html:68
 msgid "Create Ping"
 msgstr ""