Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run compilemessages command to keep .mo files in sync #1299

Merged
merged 1 commit into from
Nov 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/django-import-export-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ jobs:
run: >-
PYTHONPATH=".:tests:$PYTHONPATH" python
-W error::DeprecationWarning -W error::PendingDeprecationWarning
-m coverage run --omit='setup.py,./tests/*' --source=. tests/manage.py test core --settings=
-m coverage run --omit='setup.py,./tests/*,./import_export/locale/*'
--source=. tests/manage.py test core --settings=
- name: Upload coverage data to coveralls.io
run: coveralls --service=github
env:
Expand Down
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,4 @@ The following is a list of much appreciated contributors:
* Gabriel Warkentin
* striveforbest (Alex Zagoro)
* josx (José Luis Di Biase)
* Jan Rydzewski
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ test: ## run tests quickly with the default Python
$(RUN_TEST_COMMAND)

messages: ## generate locale file translations
cd import_export && django-admin.py makemessages && cd ..
cd import_export && django-admin makemessages -a && django-admin compilemessages && cd ..

coverage: ## generates codecov report
coverage run --omit='setup.py,tests/*' --source=. tests/manage.py test core --settings=
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
2.6.2-dev
---------

- Run compilemessages command to keep .mo files in sync (#1299)
- Fix missing migration on example app (#1346)

2.6.1 (2021-09-30)
Expand Down
Binary file modified import_export/locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
18 changes: 9 additions & 9 deletions import_export/locale/ar/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 09:27+0200\n"
"POT-Creation-Date: 2021-10-18 20:53+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -19,40 +19,40 @@ msgstr ""
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"

#: admin.py:194
#: admin.py:158
#, python-format
msgid "%s through import_export"
msgstr ""

#: admin.py:200
#: admin.py:164
msgid "Import finished, with {} new and {} updated {}."
msgstr ""

#: admin.py:298
#: admin.py:262
#, python-format
msgid "<h1>Imported file has a wrong encoding: %s</h1>"
msgstr "<h1>الملف المستورد لديه ترميز خاطئ: %s</h1>"

#: admin.py:300
#: admin.py:264
#, python-format
msgid "<h1>%s encountered while trying to read file: %s</h1>"
msgstr "<h1>%s ووجهت أثناء محاولة قراءة ملف: %s</h1>"

#: admin.py:331 templates/admin/import_export/change_list_import_item.html:5
#: admin.py:295 templates/admin/import_export/change_list_import_item.html:5
#: templates/admin/import_export/import.html:10
msgid "Import"
msgstr "إستبراد"

#: admin.py:496 templates/admin/import_export/change_list_export_item.html:5
#: admin.py:429 templates/admin/import_export/change_list_export_item.html:5
#: templates/admin/import_export/export.html:7
msgid "Export"
msgstr "تصدير"

#: admin.py:554
#: admin.py:490
msgid "You must select an export format."
msgstr "يجب تحديد تنسيق التصدير."

#: admin.py:567
#: admin.py:513
#, python-format
msgid "Export selected %(verbose_name_plural)s"
msgstr "تصدير %(verbose_name_plural)s المحددة"
Expand Down
Binary file modified import_export/locale/bg/LC_MESSAGES/django.mo
Binary file not shown.
18 changes: 9 additions & 9 deletions import_export/locale/bg/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 09:27+0200\n"
"POT-Creation-Date: 2021-10-18 20:53+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Hristo Gatsinski <gatsinski@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -18,40 +18,40 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: admin.py:194
#: admin.py:158
#, python-format
msgid "%s through import_export"
msgstr "%s чрез import_export"

#: admin.py:200
#: admin.py:164
msgid "Import finished, with {} new and {} updated {}."
msgstr "Импортирането е завършено, с {} нови и {} обновени {}."

#: admin.py:298
#: admin.py:262
#, python-format
msgid "<h1>Imported file has a wrong encoding: %s</h1>"
msgstr "<h1>Импортирания файл има грешна кодировка: %s</h1>"

#: admin.py:300
#: admin.py:264
#, python-format
msgid "<h1>%s encountered while trying to read file: %s</h1>"
msgstr "<h1>%s при опит за четене на файл: %s</h1>"

#: admin.py:331 templates/admin/import_export/change_list_import_item.html:5
#: admin.py:295 templates/admin/import_export/change_list_import_item.html:5
#: templates/admin/import_export/import.html:10
msgid "Import"
msgstr "Импортиране"

#: admin.py:496 templates/admin/import_export/change_list_export_item.html:5
#: admin.py:429 templates/admin/import_export/change_list_export_item.html:5
#: templates/admin/import_export/export.html:7
msgid "Export"
msgstr "Експортиране"

#: admin.py:554
#: admin.py:490
msgid "You must select an export format."
msgstr "Трябва да изберете формат за експортиране."

#: admin.py:567
#: admin.py:513
#, python-format
msgid "Export selected %(verbose_name_plural)s"
msgstr "Експортиране на избраните %(verbose_name_plural)s"
Expand Down
Binary file modified import_export/locale/ca/LC_MESSAGES/django.mo
Binary file not shown.
18 changes: 9 additions & 9 deletions import_export/locale/ca/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 09:27+0200\n"
"POT-Creation-Date: 2021-10-18 20:53+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -18,40 +18,40 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: admin.py:194
#: admin.py:158
#, python-format
msgid "%s through import_export"
msgstr ""

#: admin.py:200
#: admin.py:164
msgid "Import finished, with {} new and {} updated {}."
msgstr ""

#: admin.py:298
#: admin.py:262
#, python-format
msgid "<h1>Imported file has a wrong encoding: %s</h1>"
msgstr "<h1>L'arxiu importat té una codificació incorrecta: %s</h1>"

#: admin.py:300
#: admin.py:264
#, python-format
msgid "<h1>%s encountered while trying to read file: %s</h1>"
msgstr "<h1>S'ha trobat: %s mentre es llegia l'arxiu: %s</h1>"

#: admin.py:331 templates/admin/import_export/change_list_import_item.html:5
#: admin.py:295 templates/admin/import_export/change_list_import_item.html:5
#: templates/admin/import_export/import.html:10
msgid "Import"
msgstr "Importar"

#: admin.py:496 templates/admin/import_export/change_list_export_item.html:5
#: admin.py:429 templates/admin/import_export/change_list_export_item.html:5
#: templates/admin/import_export/export.html:7
msgid "Export"
msgstr "Exportar"

#: admin.py:554
#: admin.py:490
msgid "You must select an export format."
msgstr "Heu de seleccionar un format d'exportació"

#: admin.py:567
#: admin.py:513
#, python-format
msgid "Export selected %(verbose_name_plural)s"
msgstr "Exportar %(verbose_name_plural)s seleccionats"
Expand Down
Binary file modified import_export/locale/cs/LC_MESSAGES/django.mo
Binary file not shown.
18 changes: 9 additions & 9 deletions import_export/locale/cs/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 09:27+0200\n"
"POT-Creation-Date: 2021-10-18 20:53+0100\n"
"PO-Revision-Date: 2017-05-02 19:17+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand All @@ -18,40 +18,40 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Poedit 2.0.1\n"

#: admin.py:194
#: admin.py:158
#, python-format
msgid "%s through import_export"
msgstr "%s skrz import_export"

#: admin.py:200
#: admin.py:164
msgid "Import finished, with {} new and {} updated {}."
msgstr "Import dokončen, {} nové a {} aktualizované {}."

#: admin.py:298
#: admin.py:262
#, python-format
msgid "<h1>Imported file has a wrong encoding: %s</h1>"
msgstr "<h1>Importovaný soubor má nesprávné kódování: %s</h1>"

#: admin.py:300
#: admin.py:264
#, python-format
msgid "<h1>%s encountered while trying to read file: %s</h1>"
msgstr "<h1>Při zpracování souboru nastala chyba %s (soubor %s)</h1>"

#: admin.py:331 templates/admin/import_export/change_list_import_item.html:5
#: admin.py:295 templates/admin/import_export/change_list_import_item.html:5
#: templates/admin/import_export/import.html:10
msgid "Import"
msgstr "Import"

#: admin.py:496 templates/admin/import_export/change_list_export_item.html:5
#: admin.py:429 templates/admin/import_export/change_list_export_item.html:5
#: templates/admin/import_export/export.html:7
msgid "Export"
msgstr "Export"

#: admin.py:554
#: admin.py:490
msgid "You must select an export format."
msgstr "Musíte vybrat formát pro export."

#: admin.py:567
#: admin.py:513
#, python-format
msgid "Export selected %(verbose_name_plural)s"
msgstr "Vybrán export %(verbose_name_plural)s"
Expand Down
Binary file modified import_export/locale/de/LC_MESSAGES/django.mo
Binary file not shown.
18 changes: 9 additions & 9 deletions import_export/locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 09:27+0200\n"
"POT-Creation-Date: 2021-10-18 20:53+0100\n"
"PO-Revision-Date: 2016-02-01 17:33+0100\n"
"Last-Translator: Jannis <jvajen@gmail.com>\n"
"Language-Team: \n"
Expand All @@ -18,42 +18,42 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.4\n"

#: admin.py:194
#: admin.py:158
#, python-format
msgid "%s through import_export"
msgstr ""

#: admin.py:200
#: admin.py:164
msgid "Import finished, with {} new and {} updated {}."
msgstr ""

#: admin.py:298
#: admin.py:262
#, fuzzy, python-format
#| msgid "<h1>Imported file is not in unicode: %s</h1>"
msgid "<h1>Imported file has a wrong encoding: %s</h1>"
msgstr "<h1>Importierte Datei hat die falsche Zeichenkodierung: %s</h1>"

#: admin.py:300
#: admin.py:264
#, fuzzy, python-format
#| msgid "<h1>%s encountred while trying to read file: %s</h1>"
msgid "<h1>%s encountered while trying to read file: %s</h1>"
msgstr "<h1>%s trat auf beim Versuch die Datei zu lesen: %s</h1>"

#: admin.py:331 templates/admin/import_export/change_list_import_item.html:5
#: admin.py:295 templates/admin/import_export/change_list_import_item.html:5
#: templates/admin/import_export/import.html:10
msgid "Import"
msgstr "Importieren"

#: admin.py:496 templates/admin/import_export/change_list_export_item.html:5
#: admin.py:429 templates/admin/import_export/change_list_export_item.html:5
#: templates/admin/import_export/export.html:7
msgid "Export"
msgstr "Exportieren"

#: admin.py:554
#: admin.py:490
msgid "You must select an export format."
msgstr "Es muss ein Exportformat ausgewählt werden."

#: admin.py:567
#: admin.py:513
#, python-format
msgid "Export selected %(verbose_name_plural)s"
msgstr "Ausgewählte %(verbose_name_plural)s exportieren"
Expand Down
Binary file modified import_export/locale/es/LC_MESSAGES/django.mo
Binary file not shown.
18 changes: 9 additions & 9 deletions import_export/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 09:27+0200\n"
"POT-Creation-Date: 2021-10-18 20:53+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -18,40 +18,40 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: admin.py:194
#: admin.py:158
#, python-format
msgid "%s through import_export"
msgstr ""

#: admin.py:200
#: admin.py:164
msgid "Import finished, with {} new and {} updated {}."
msgstr ""

#: admin.py:298
#: admin.py:262
#, python-format
msgid "<h1>Imported file has a wrong encoding: %s</h1>"
msgstr ""

#: admin.py:300
#: admin.py:264
#, python-format
msgid "<h1>%s encountered while trying to read file: %s</h1>"
msgstr ""

#: admin.py:331 templates/admin/import_export/change_list_import_item.html:5
#: admin.py:295 templates/admin/import_export/change_list_import_item.html:5
#: templates/admin/import_export/import.html:10
msgid "Import"
msgstr "Importar"

#: admin.py:496 templates/admin/import_export/change_list_export_item.html:5
#: admin.py:429 templates/admin/import_export/change_list_export_item.html:5
#: templates/admin/import_export/export.html:7
msgid "Export"
msgstr "Exportar"

#: admin.py:554
#: admin.py:490
msgid "You must select an export format."
msgstr "Debes seleccionar un formato de exportación."

#: admin.py:567
#: admin.py:513
#, python-format
msgid "Export selected %(verbose_name_plural)s"
msgstr "Exportar %(verbose_name_plural)s seleccionados"
Expand Down
Binary file modified import_export/locale/es_AR/LC_MESSAGES/django.mo
Binary file not shown.