Updtate french translation, correction, modification duration.py line 110 & 118 to ease the translation

This commit is contained in:
Christopher C. Wells 2023-10-14 06:19:32 -07:00 committed by Christopher Charbonneau Wells
parent 0c15868d8d
commit 0d08d6174b
4 changed files with 21 additions and 19 deletions

View File

@ -102,10 +102,12 @@ def dayssince(value, today=None):
:param today: date to compare to (defaults to today) :param today: date to compare to (defaults to today)
:returns: the formatted string :returns: the formatted string
""" """
if today is None: if today is None:
today = timezone.localtime().date() today = timezone.localtime().date()
delta = today - value delta = today - value
days_ago = _(" ") + str(delta.days) + _(" days ago")
if delta < datetime.timedelta(days=1): if delta < datetime.timedelta(days=1):
return _("today") return _("today")
@ -113,7 +115,7 @@ def dayssince(value, today=None):
return _("yesterday") return _("yesterday")
# use standard timesince for anything beyond yesterday # use standard timesince for anything beyond yesterday
return str(delta.days) + _(" days ago") return days_ago
@register.filter @register.filter

View File

@ -25,7 +25,7 @@
{% blocktrans trimmed count counter=sleep.count %} {% blocktrans trimmed count counter=sleep.count %}
{{ counter }} sleep {{ counter }} sleep
{% plural %} {% plural %}
{{ counter }} sleep {{ counter }} sleeps
{% endblocktrans %} {% endblocktrans %}
{% endif %} {% endif %}
</div> </div>

Binary file not shown.

View File

@ -1026,7 +1026,7 @@ msgstr "Chronomètres actifs"
#: dashboard/templates/cards/sleep_recent.html:52 #: dashboard/templates/cards/sleep_recent.html:52
#: dashboard/templates/cards/tummytime_day.html:14 #: dashboard/templates/cards/tummytime_day.html:14
msgid "None" msgid "None"
msgstr "Aucun" msgstr "Aucun(e)"
#: core/templates/core/tummytime_confirm_delete.html:4 #: core/templates/core/tummytime_confirm_delete.html:4
msgid "Delete a Tummy Time Entry" msgid "Delete a Tummy Time Entry"
@ -1182,9 +1182,9 @@ msgstr "Dernier sommeil"
msgid "Today's Naps" msgid "Today's Naps"
msgstr "Siestes aujourd'hui" msgstr "Siestes aujourd'hui"
#: dashboard/templates/cards/sleep_naps_day.html:12 #: dashboard/templates/cards/sleep_recent.html:4
msgid "%(count)s nap%(plural)s" msgid "Recent Sleep"
msgstr "%(count)s sieste%(plural)s" msgstr "Compteur de sommeil"
#: dashboard/templates/cards/statistics.html:7 #: dashboard/templates/cards/statistics.html:7
msgid "Statistics" msgid "Statistics"
@ -1700,6 +1700,15 @@ msgid "Today"
msgstr "Aujourd'hui" msgstr "Aujourd'hui"
#: core/templatetags/datetime.py:41 #: 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 "{}, {}" msgid "{}, {}"
msgstr "{}, {}" msgstr "{}, {}"
@ -1721,7 +1730,7 @@ msgstr "Contenu: %(contents)s"
#: dashboard/templates/cards/sleep_last.html:12 #: dashboard/templates/cards/sleep_last.html:12
#: dashboard/templates/cards/tummytime_last.html:13 #: dashboard/templates/cards/tummytime_last.html:13
msgid "<div>%(since)s ago</div> <small>%(time)s</small>" msgid "<div>%(since)s ago</div> <small>%(time)s</small>"
msgstr "il y a %(since)s (%(time)s)" msgstr "<div>il y a %(since)s</div> <small>(%(time)s)</small>"
#: dashboard/templates/cards/feeding_day.html:6 #: dashboard/templates/cards/feeding_day.html:6
msgid "Today's Feeding" msgid "Today's Feeding"
@ -2142,7 +2151,7 @@ msgstr[1] "%(count)s siestes"
msgid "%(count)s active timer" msgid "%(count)s active timer"
msgid_plural "%(count)s active timers" msgid_plural "%(count)s active timers"
msgstr[0] "%(count)s chronomètre actif" 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 #: babybuddy/forms.py:15 babybuddy/templates/babybuddy/user_list.html:21
msgid "Read only" msgid "Read only"
@ -2246,19 +2255,11 @@ msgstr "Changer..."
msgid "Quick Start Timer For…" msgid "Quick Start Timer For…"
msgstr "Démarrer un chronomètre rapide pour..." 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 #: dashboard/templates/cards/sleep_recent.html:25
msgid "%(counter)s sleep" msgid "%(counter)s sleep"
msgid_plural "%(counter)s sleep" msgid_plural "%(counter)s sleep"
msgstr[0] "%(counter)s sommeil" msgstr[0] "%(counter)s phase de sommeil"
msgstr[1] "%(counter)s sommeils" msgstr[1] "%(counter)s phases de sommeil"
#: reports/graphs/temperature_change.py:26 #: reports/graphs/temperature_change.py:26
msgid "<b>Temperature</b>" msgid "<b>Temperature</b>"
@ -2399,4 +2400,3 @@ msgstr "Percentiles de poids de l'OMS pour les garçons en kg"
#: reports/templates/reports/report_list.html:36 #: reports/templates/reports/report_list.html:36
msgid "WHO Weight Percentiles for Girls in kg" msgid "WHO Weight Percentiles for Girls in kg"
msgstr "Percentiles de poids de l'OMS pour les filles en kg" msgstr "Percentiles de poids de l'OMS pour les filles en kg"