From c9b35156d9cf3654d86f9ca3648ec3834cbfafe1 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 18 Oct 2018 19:45:07 +0200 Subject: [PATCH] add a predefined date range from 1st january of previous year (fixes #27407) --- bijoe/locale/fr/LC_MESSAGES/django.po | 32 ++++++++++++++++----------- bijoe/visualization/forms.py | 6 +++++ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/bijoe/locale/fr/LC_MESSAGES/django.po b/bijoe/locale/fr/LC_MESSAGES/django.po index a8dc6cc..d0f026b 100644 --- a/bijoe/locale/fr/LC_MESSAGES/django.po +++ b/bijoe/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bijoe 0.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-03 11:04+0000\n" +"POT-Creation-Date: 2018-10-18 17:44+0000\n" "PO-Revision-Date: 2018-01-03 12:08+0100\n" "Last-Translator: Benjamin Dauvergne \n" "Language-Team: fr \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: templates/bijoe/base.html:11 templates/bijoe/base.html.py:15 +#: templates/bijoe/base.html:11 templates/bijoe/base.html:15 #: templates/bijoe/warehouse.html:5 views.py:79 msgid "Statistics" msgstr "Statistiques" @@ -120,45 +120,51 @@ msgstr "ce trimestre" msgid "last quarter" msgstr "le trimestre précédent" -#: visualization/forms.py:93 +#: visualization/forms.py:82 +msgid "since 1st january last year" +msgstr "depuis le 1er janvier de l'année précédente" + +#: visualization/forms.py:99 msgid "start" msgstr "début" -#: visualization/forms.py:95 +#: visualization/forms.py:101 msgid "end" msgstr "fin" -#: visualization/forms.py:150 +#: visualization/forms.py:156 msgid "Presentation" msgstr "Représentation" -#: visualization/forms.py:151 +#: visualization/forms.py:157 msgid "table" msgstr "tableau" -#: visualization/forms.py:152 +#: visualization/forms.py:158 msgid "chart" msgstr "graphique" -#: visualization/forms.py:164 +#: visualization/forms.py:170 msgid "Loop by" msgstr "Regroupement(s)" -#: visualization/forms.py:185 +#: visualization/forms.py:191 msgid "Group by horizontaly" msgstr "Regroupement horizontal" -#: visualization/forms.py:190 +#: visualization/forms.py:196 msgid "Group by vertically" msgstr "Regroupement vertical" -#: visualization/forms.py:198 +#: visualization/forms.py:204 msgid "Measure" msgstr "Mesure" -#: visualization/forms.py:210 +#: visualization/forms.py:216 msgid "You cannot use the same dimension for looping and grouping" -msgstr "Vous ne pouvez pas utiliser la même dimension pour la répétition et le regroupement." +msgstr "" +"Vous ne pouvez pas utiliser la même dimension pour la répétition et le " +"regroupement." #: visualization/models.py:36 msgid "name" diff --git a/bijoe/visualization/forms.py b/bijoe/visualization/forms.py index dd420cb..1ecb716 100644 --- a/bijoe/visualization/forms.py +++ b/bijoe/visualization/forms.py @@ -77,6 +77,12 @@ DATE_RANGES = [ 'start': u'le dernier trimestre', 'end': u'ce trimestre', }, + { + 'value': 'since_1jan_last_year', + 'label': _('since 1st january last year'), + 'start': u'l\'année dernière', + 'end': u'maintenant', + }, ] -- 2.18.0