From eac880f83bdbb4f0d04be56c24cfc67f81c01264 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Mon, 26 Oct 2020 14:46:30 +0100 Subject: [PATCH] change workalendar translations setup (#48028) --- MANIFEST.in | 1 - chrono/settings.py | 5 +-- .../fr/LC_MESSAGES/django.po | 40 ------------------- chrono/workalendar_locales.py | 15 +++++++ 4 files changed, 16 insertions(+), 45 deletions(-) delete mode 100644 chrono/workalendar_locale/fr/LC_MESSAGES/django.po create mode 100644 chrono/workalendar_locales.py diff --git a/MANIFEST.in b/MANIFEST.in index 8f6a027..7148835 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,5 @@ # locales recursive-include chrono/locale *.po *.mo -recursive-include chrono/workalendar_locale *.po *.mo # static recursive-include chrono/manager/static *.css *.scss *.js diff --git a/chrono/settings.py b/chrono/settings.py index d679691..9e70b77 100644 --- a/chrono/settings.py +++ b/chrono/settings.py @@ -95,10 +95,7 @@ USE_L10N = True USE_TZ = True -LOCALE_PATHS = ( - os.path.join(BASE_DIR, 'chrono', 'locale'), - os.path.join(BASE_DIR, 'chrono', 'workalendar_locale'), -) +LOCALE_PATHS = (os.path.join(BASE_DIR, 'chrono', 'locale'),) FORMAT_MODULE_PATH = 'chrono.formats' diff --git a/chrono/workalendar_locale/fr/LC_MESSAGES/django.po b/chrono/workalendar_locale/fr/LC_MESSAGES/django.po deleted file mode 100644 index 91700e6..0000000 --- a/chrono/workalendar_locale/fr/LC_MESSAGES/django.po +++ /dev/null @@ -1,40 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: workalendar\n" -"Language: French\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -msgid "New year" -msgstr "Jour de l'An" - -msgid "Easter Monday" -msgstr "Lundi de Pâques" - -msgid "Labour Day" -msgstr "Fête du travail" - -msgid "Victory in Europe Day" -msgstr "Armistice 1945" - -msgid "Ascension Thursday" -msgstr "Ascension" - -msgid "Whit Monday" -msgstr "Lundi de Pentecôte" - -msgid "Bastille Day" -msgstr "Fête Nationale" - -msgid "Assumption of Mary to Heaven" -msgstr "Assomption" - -msgid "All Saints Day" -msgstr "Toussaint" - -msgid "Armistice Day" -msgstr "Armistice 1918" - -msgid "Christmas Day" -msgstr "Noël" diff --git a/chrono/workalendar_locales.py b/chrono/workalendar_locales.py new file mode 100644 index 0000000..f5b091e --- /dev/null +++ b/chrono/workalendar_locales.py @@ -0,0 +1,15 @@ +from django.utils.translation import ugettext_lazy as _ + + +def translations(): + _('All Saints Day') + _('Armistice Day') + _('Ascension Thursday') + _('Assumption of Mary to Heaven') + _('Bastille Day') + _('Christmas Day') + _('Easter Monday') + _('Labour Day') + _('New year') + _('Victory in Europe Day') + _('Whit Monday') -- 2.20.1