From 0d08d6174ba8ccd7cd7acbc6c72374bfd701dccb Mon Sep 17 00:00:00 2001 From: "Christopher C. Wells" Date: Sat, 14 Oct 2023 06:19:32 -0700 Subject: [PATCH] Updtate french translation, correction, modification duration.py line 110 & 118 to ease the translation --- core/templatetags/duration.py | 4 ++- dashboard/templates/cards/sleep_recent.html | 2 +- locale/fr/LC_MESSAGES/django.mo | Bin 38058 -> 38043 bytes locale/fr/LC_MESSAGES/django.po | 34 ++++++++++---------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/core/templatetags/duration.py b/core/templatetags/duration.py index 905915bb..a1fada8a 100644 --- a/core/templatetags/duration.py +++ b/core/templatetags/duration.py @@ -102,10 +102,12 @@ def dayssince(value, today=None): :param today: date to compare to (defaults to today) :returns: the formatted string """ + if today is None: today = timezone.localtime().date() delta = today - value + days_ago = _(" ") + str(delta.days) + _(" days ago") if delta < datetime.timedelta(days=1): return _("today") @@ -113,7 +115,7 @@ def dayssince(value, today=None): return _("yesterday") # use standard timesince for anything beyond yesterday - return str(delta.days) + _(" days ago") + return days_ago @register.filter diff --git a/dashboard/templates/cards/sleep_recent.html b/dashboard/templates/cards/sleep_recent.html index 603dc50b..87cb2921 100644 --- a/dashboard/templates/cards/sleep_recent.html +++ b/dashboard/templates/cards/sleep_recent.html @@ -25,7 +25,7 @@ {% blocktrans trimmed count counter=sleep.count %} {{ counter }} sleep {% plural %} - {{ counter }} sleep + {{ counter }} sleeps {% endblocktrans %} {% endif %} diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 73adc5c45a97fe77194b9d507ae663458904270d..ef0c951531a0cbdc753f9309f5548eb60fdc7973 100644 GIT binary patch delta 8135 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 delta 8101 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 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 17c1365f..c7793c6f 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -1026,7 +1026,7 @@ msgstr "Chronomètres actifs" #: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/tummytime_day.html:14 msgid "None" -msgstr "Aucun" +msgstr "Aucun(e)" #: core/templates/core/tummytime_confirm_delete.html:4 msgid "Delete a Tummy Time Entry" @@ -1182,9 +1182,9 @@ msgstr "Dernier sommeil" msgid "Today's Naps" msgstr "Siestes aujourd'hui" -#: dashboard/templates/cards/sleep_naps_day.html:12 -msgid "%(count)s nap%(plural)s" -msgstr "%(count)s sieste%(plural)s" +#: dashboard/templates/cards/sleep_recent.html:4 +msgid "Recent Sleep" +msgstr "Compteur de sommeil" #: dashboard/templates/cards/statistics.html:7 msgid "Statistics" @@ -1700,6 +1700,15 @@ msgid "Today" msgstr "Aujourd'hui" #: core/templatetags/datetime.py:41 +#: core/templatetags/duration.py:110 +msgid " days ago" +msgstr " jours" + +#: core/templatetags/duration.py:110 +msgid " " +msgstr "il y a " + +#: core/templatetags/datetime.py:75 msgid "{}, {}" msgstr "{}, {}" @@ -1721,7 +1730,7 @@ msgstr "Contenu : %(contents)s" #: dashboard/templates/cards/sleep_last.html:12 #: dashboard/templates/cards/tummytime_last.html:13 msgid "
%(since)s ago
%(time)s" -msgstr "il y a %(since)s (%(time)s)" +msgstr "
il y a %(since)s
(%(time)s)" #: dashboard/templates/cards/feeding_day.html:6 msgid "Today's Feeding" @@ -2142,7 +2151,7 @@ msgstr[1] "%(count)s siestes" msgid "%(count)s active timer" msgid_plural "%(count)s active timers" msgstr[0] "%(count)s chronomètre actif" -msgstr[1] "%(count)s chronomètre%(plural)s actifs" +msgstr[1] "%(count)s chronomètres actifs" #: babybuddy/forms.py:15 babybuddy/templates/babybuddy/user_list.html:21 msgid "Read only" @@ -2246,19 +2255,11 @@ msgstr "Changer..." msgid "Quick Start Timer For…" msgstr "Démarrer un chronomètre rapide pour..." -#: core/templatetags/duration.py:116 -msgid " days ago" -msgstr "il y a %(key)s jours" - -#: dashboard/templates/cards/sleep_recent.html:6 -msgid "Recent Sleep" -msgstr "Sommeils récents" - #: dashboard/templates/cards/sleep_recent.html:25 msgid "%(counter)s sleep" msgid_plural "%(counter)s sleep" -msgstr[0] "%(counter)s sommeil" -msgstr[1] "%(counter)s sommeils" +msgstr[0] "%(counter)s phase de sommeil" +msgstr[1] "%(counter)s phases de sommeil" #: reports/graphs/temperature_change.py:26 msgid "Temperature" @@ -2399,4 +2400,3 @@ msgstr "Percentiles de poids de l'OMS pour les garçons en kg" #: reports/templates/reports/report_list.html:36 msgid "WHO Weight Percentiles for Girls in kg" msgstr "Percentiles de poids de l'OMS pour les filles en kg" -