diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a483947..bf4e3624 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/fleetpings/form.py b/fleetpings/form.py index f7eaf61a..1c2075f8 100644 --- a/fleetpings/form.py +++ b/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( diff --git a/fleetpings/locale/de/LC_MESSAGES/django.mo b/fleetpings/locale/de/LC_MESSAGES/django.mo index 0fb490d1..ac48a582 100644 Binary files a/fleetpings/locale/de/LC_MESSAGES/django.mo and b/fleetpings/locale/de/LC_MESSAGES/django.mo differ diff --git a/fleetpings/locale/de/LC_MESSAGES/django.po b/fleetpings/locale/de/LC_MESSAGES/django.po index 3a048250..51150ef0 100644 --- a/fleetpings/locale/de/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: German \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" diff --git a/fleetpings/locale/django.pot b/fleetpings/locale/django.pot index 0018ac77..00a3d0aa 100644 --- a/fleetpings/locale/django.pot +++ b/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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/fleetpings/locale/es/LC_MESSAGES/django.po b/fleetpings/locale/es/LC_MESSAGES/django.po index 40aba61c..7ada92af 100644 --- a/fleetpings/locale/es/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/fleetpings/locale/fr_FR/LC_MESSAGES/django.po b/fleetpings/locale/fr_FR/LC_MESSAGES/django.po index 0018ac77..00a3d0aa 100644 --- a/fleetpings/locale/fr_FR/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/fleetpings/locale/it_IT/LC_MESSAGES/django.po b/fleetpings/locale/it_IT/LC_MESSAGES/django.po index 0018ac77..00a3d0aa 100644 --- a/fleetpings/locale/it_IT/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/fleetpings/locale/ja/LC_MESSAGES/django.po b/fleetpings/locale/ja/LC_MESSAGES/django.po index c5d559c2..5999f4d0 100644 --- a/fleetpings/locale/ja/LC_MESSAGES/django.po +++ b/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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/fleetpings/locale/ko_KR/LC_MESSAGES/django.po b/fleetpings/locale/ko_KR/LC_MESSAGES/django.po index 0018ac77..00a3d0aa 100644 --- a/fleetpings/locale/ko_KR/LC_MESSAGES/django.po +++ b/fleetpings/locale/ko_KR/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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/fleetpings/locale/ru/LC_MESSAGES/django.mo b/fleetpings/locale/ru/LC_MESSAGES/django.mo index 6a8e591d..845de333 100644 Binary files a/fleetpings/locale/ru/LC_MESSAGES/django.mo and b/fleetpings/locale/ru/LC_MESSAGES/django.mo differ diff --git a/fleetpings/locale/ru/LC_MESSAGES/django.po b/fleetpings/locale/ru/LC_MESSAGES/django.po index 7c33e081..f716512f 100644 --- a/fleetpings/locale/ru/LC_MESSAGES/django.po +++ b/fleetpings/locale/ru/LC_MESSAGES/django.po @@ -7,8 +7,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-29 23:45+0000\n" "Last-Translator: Nikolay \n" "Language-Team: Russian \n" @@ -18,10 +18,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : (n%10==1 && n%100!=11 ? 0 : " "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 "Анонсы флота" @@ -33,7 +33,7 @@ msgstr "Голосовой канал" msgid "Doctrine" msgstr "Формат" -#: admin.py:126 models.py:174 +#: admin.py:126 form.py:154 models.py:174 msgid "Doctrine link" msgstr "Ссылка на формат" @@ -151,10 +151,6 @@ msgstr "" msgid "Fleet Comms" msgstr "Голосовые каналы" -#: form.py:154 -msgid "Doctrine URL" -msgstr "URL формата" - #: form.py:159 msgid "Webhook Embed Color" msgstr "Вебхук Embed Color" @@ -487,6 +483,23 @@ 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 "" +"\n" +" Вы хотите помочь перевести это приложение на ваш язык или " +"улучшить текущий перевод? - %(weblate_link)s\n" +" " + #: templates/fleetpings/partials/form/form.html:68 msgid "Create Ping" msgstr "Создать пинг" diff --git a/fleetpings/locale/uk/LC_MESSAGES/django.mo b/fleetpings/locale/uk/LC_MESSAGES/django.mo index cf91f6e1..894e0b57 100644 Binary files a/fleetpings/locale/uk/LC_MESSAGES/django.mo and b/fleetpings/locale/uk/LC_MESSAGES/django.mo differ diff --git a/fleetpings/locale/uk/LC_MESSAGES/django.po b/fleetpings/locale/uk/LC_MESSAGES/django.po index 140fa45b..fa45d7fb 100644 --- a/fleetpings/locale/uk/LC_MESSAGES/django.po +++ b/fleetpings/locale/uk/LC_MESSAGES/django.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # Kristof , 2023. # "H. Peter Pfeufer" , 2023. +# "Andrii M." , 2023. 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-14 17:18+0000\n" +"POT-Creation-Date: 2023-07-27 23:37+0200\n" +"PO-Revision-Date: 2023-07-27 15:39+0000\n" "Last-Translator: Peter Pfeufer \n" "Language-Team: Ukrainian \n" @@ -18,10 +19,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : (n%10==1 && n%100!=11 ? 0 : " "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Weblate 4.17\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 #, fuzzy #| msgid "Fleet Ping Tool" msgid "Fleet Pings" @@ -35,16 +36,14 @@ msgstr "Зв'язок флоту" msgid "Doctrine" msgstr "Доктрина" -#: admin.py:126 models.py:174 -#, fuzzy -#| msgid "Doctrine" +#: admin.py:126 form.py:154 models.py:174 msgid "Doctrine link" -msgstr "Доктрина" +msgstr "Посилання на доктрину" #: admin.py:132 admin.py:185 admin.py:239 admin.py:284 models.py:183 #: models.py:312 models.py:396 models.py:461 msgid "Group restrictions" -msgstr "" +msgstr "Групові обмеження" #: admin.py:179 form.py:74 msgid "Ping Target" @@ -62,13 +61,11 @@ msgstr "Колір вставки Webhook" #: admin.py:273 models.py:439 msgid "Discord channel" -msgstr "" +msgstr "Канал діскорду" #: admin.py:278 models.py:452 -#, fuzzy -#| msgid "Webhook" msgid "Webhook URL" -msgstr "Веб-хук" +msgstr "Веб-хук URL" #. Translators: This is the app name and version, which will appear in the Django Backend #: apps.py:21 @@ -159,10 +156,6 @@ msgstr "" msgid "Fleet Comms" msgstr "Канал зв'язку для флоту" -#: form.py:154 -msgid "Doctrine URL" -msgstr "Посилання на доктрину" - #: form.py:159 msgid "Webhook Embed Color" msgstr "Колір вставки Webhook" @@ -253,7 +246,7 @@ msgstr "Увімкнено цей канал зв'язку чи ні" #: models.py:137 models.py:199 models.py:261 models.py:328 models.py:412 #: models.py:477 msgid "Is enabled" -msgstr "" +msgstr "Дозволено" #: models.py:165 msgid "Short name to identify this doctrine" @@ -307,7 +300,7 @@ msgstr "" #: models.py:294 msgid "Group name" -msgstr "" +msgstr "Назва групи" #: models.py:302 msgid "ID of the Discord role to ping" @@ -501,6 +494,19 @@ 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 "Створити пінг" diff --git a/fleetpings/locale/zh_Hans/LC_MESSAGES/django.po b/fleetpings/locale/zh_Hans/LC_MESSAGES/django.po index c5d559c2..5999f4d0 100644 --- a/fleetpings/locale/zh_Hans/LC_MESSAGES/django.po +++ b/fleetpings/locale/zh_Hans/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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/fleetpings/static/fleetpings/css/aa-bootstrap-fix.css b/fleetpings/static/fleetpings/css/aa-bootstrap-fix.css new file mode 100644 index 00000000..177a205f --- /dev/null +++ b/fleetpings/static/fleetpings/css/aa-bootstrap-fix.css @@ -0,0 +1,13 @@ +/* attempting to fix AA's wrong usage of bootstrap classes +------------------------------------------------------------------------------------- */ +@media all { + .aa-fleetpings { + margin-left: 15px; + } +} + +@media all and (min-width: 768px) { + .aa-fleetpings { + margin-left: 0; + } +} diff --git a/fleetpings/static/fleetpings/css/aa-bootstrap-fix.min.css b/fleetpings/static/fleetpings/css/aa-bootstrap-fix.min.css new file mode 100644 index 00000000..3202c29e --- /dev/null +++ b/fleetpings/static/fleetpings/css/aa-bootstrap-fix.min.css @@ -0,0 +1 @@ +@media all{.aa-fleetpings{margin-left:15px}}@media all and (min-width:768px){.aa-fleetpings{margin-left:0}} \ No newline at end of file diff --git a/fleetpings/static/fleetpings/css/fleetpings.css b/fleetpings/static/fleetpings/css/fleetpings.css index 9176844b..a114dce3 100644 --- a/fleetpings/static/fleetpings/css/fleetpings.css +++ b/fleetpings/static/fleetpings/css/fleetpings.css @@ -7,4 +7,15 @@ position: sticky; top: 1rem; } + + .aa-fleetpings-footer { + border-top: 1px solid rgb(236 240 241); + font-size: 85%; + margin-top: 1rem; + padding-top: 1rem; + } + + .template-dark-mode .aa-fleetpings-footer { + border-color: rgb(70 69 69); + } } diff --git a/fleetpings/static/fleetpings/css/fleetpings.min.css b/fleetpings/static/fleetpings/css/fleetpings.min.css index 9ba91c30..35bf6c36 100644 --- a/fleetpings/static/fleetpings/css/fleetpings.min.css +++ b/fleetpings/static/fleetpings/css/fleetpings.min.css @@ -1 +1 @@ -@media all{.aa-fleetpings-header-addition{display:block}.aa-fleetpings-pingtext{position:sticky;top:1rem}} \ No newline at end of file +@media all{.aa-fleetpings-header-addition{display:block}.aa-fleetpings-pingtext{position:sticky;top:1rem}.aa-fleetpings-footer{border-top:1px solid rgb(236 240 241);font-size:85%;margin-top:1rem;padding-top:1rem}.template-dark-mode .aa-fleetpings-footer{border-color:rgb(70 69 69)}} \ No newline at end of file diff --git a/fleetpings/templates/fleetpings/base.html b/fleetpings/templates/fleetpings/base.html index 3fadc598..c9d1cd14 100644 --- a/fleetpings/templates/fleetpings/base.html +++ b/fleetpings/templates/fleetpings/base.html @@ -5,8 +5,18 @@ {% block page_title %}{% translate "Fleet Pings" %}{% endblock %} {% block content %} - {% translate "Fleet Pings" as translated_header %} - {% include "fleetpings/partials/header/page-header.html" with header_text=translated_header %} +
+
+ {% translate "Fleet Pings" as translated_header %} + {% include "fleetpings/partials/header/page-header.html" with header_text=translated_header %} +
- {% block details %}{% endblock %} +
+ {% block aa_fleetpings_body %}{% endblock %} +
+ + +
{% endblock %} diff --git a/fleetpings/templates/fleetpings/bundles/fleetpings-css.html b/fleetpings/templates/fleetpings/bundles/fleetpings-css.html index 74e52903..fa349181 100644 --- a/fleetpings/templates/fleetpings/bundles/fleetpings-css.html +++ b/fleetpings/templates/fleetpings/bundles/fleetpings-css.html @@ -1,3 +1,4 @@ {% load fleetpings_versioned_static %} + diff --git a/fleetpings/templates/fleetpings/index.html b/fleetpings/templates/fleetpings/index.html index 2faca24f..e795fb23 100644 --- a/fleetpings/templates/fleetpings/index.html +++ b/fleetpings/templates/fleetpings/index.html @@ -3,8 +3,8 @@ {% load i18n %} {% load fleetpings_versioned_static %} -{% block details %} -
+{% block aa_fleetpings_body %} +
diff --git a/fleetpings/templates/fleetpings/partials/footer/app-translation-footer.html b/fleetpings/templates/fleetpings/partials/footer/app-translation-footer.html new file mode 100644 index 00000000..c259c3bd --- /dev/null +++ b/fleetpings/templates/fleetpings/partials/footer/app-translation-footer.html @@ -0,0 +1,11 @@ +{% load i18n %} + + diff --git a/fleetpings/utils.py b/fleetpings/utils.py index c2f10f96..08964a4b 100644 --- a/fleetpings/utils.py +++ b/fleetpings/utils.py @@ -57,7 +57,7 @@ def clean_setting( cleaned_value = getattr(settings, name) else: logger.warning( - f"You setting for {name} is not valid. Please correct it. " + f"Your setting for {name} is not valid. Please correct it. " f"Using default for now: {default_value}" ) cleaned_value = default_value diff --git a/pyproject.toml b/pyproject.toml index d6681009..17fddc20 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "aa-fleetpings" -version = "2.24.2" +version = "2.24.3" description = "Fleet Ping Tool for Alliance Auth supporting pings via webhooks to Discord." readme = "README.md" license = "GPL-3.0"