Skip to content

Commit

Permalink
Merge pull request #3930 from GeotrekCE/fix_po
Browse files Browse the repository at this point in the history
🛠️ [TOOLS] Update all message files
  • Loading branch information
submarcos committed Feb 16, 2024
2 parents abe150f + 0fbf15b commit 884b5ee
Show file tree
Hide file tree
Showing 77 changed files with 734 additions and 527 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ flake8:
$(docker_compose) run --rm web flake8 geotrek

messages:
$(docker_compose) run --rm web ./manage.py makemessages -a --no-location
$(docker_compose) run --rm web ./manage.py makemessages -a --no-location --no-obsolete

###########################
# coverage #
Expand Down
4 changes: 4 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ CHANGELOG
2.101.5+dev (XXXX-XX-XX)
------------------------

**Minor changes**

- Update all translation files

**Bug fixes**

- Signage & Blade conditions translations + admin BladeCondition entry (#3847)
Expand Down
20 changes: 6 additions & 14 deletions geotrek/api/locale/de/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: 2023-06-23 10:12+0000\n"
"POT-Creation-Date: 2024-02-09 15:51+0000\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 Down Expand Up @@ -235,9 +235,8 @@ msgstr ""
msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
#, python-format
msgid "(deprecated) replaced by '%(field)s'."
msgstr ""

msgid "Types"
Expand All @@ -246,9 +245,6 @@ msgstr ""
msgid "Filter by one or more type id, comma-separated."
msgstr ""

msgid "Filter by a trek id. It will show only the POIs related to this trek."
msgstr ""

msgid "Sites"
msgstr ""

Expand Down Expand Up @@ -347,7 +343,7 @@ msgstr ""
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on organizers"
msgid "Filter by one or more organizer, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
Expand Down Expand Up @@ -564,12 +560,8 @@ msgstr ""
msgid "Altimetry data not available"
msgstr ""

#, python-format
msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'start_time'"
msgstr ""

msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'capacity'"
"using '%(field)s'"
msgstr ""
20 changes: 6 additions & 14 deletions geotrek/api/locale/en/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: 2023-06-23 10:12+0000\n"
"POT-Creation-Date: 2024-02-09 15:51+0000\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 Down Expand Up @@ -235,9 +235,8 @@ msgstr ""
msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
#, python-format
msgid "(deprecated) replaced by '%(field)s'."
msgstr ""

msgid "Types"
Expand All @@ -246,9 +245,6 @@ msgstr ""
msgid "Filter by one or more type id, comma-separated."
msgstr ""

msgid "Filter by a trek id. It will show only the POIs related to this trek."
msgstr ""

msgid "Sites"
msgstr ""

Expand Down Expand Up @@ -347,7 +343,7 @@ msgstr ""
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on organizers"
msgid "Filter by one or more organizer, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
Expand Down Expand Up @@ -564,12 +560,8 @@ msgstr ""
msgid "Altimetry data not available"
msgstr ""

#, python-format
msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'start_time'"
msgstr ""

msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'capacity'"
"using '%(field)s'"
msgstr ""
20 changes: 6 additions & 14 deletions geotrek/api/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: 2023-06-23 10:12+0000\n"
"POT-Creation-Date: 2024-02-09 15:51+0000\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 Down Expand Up @@ -235,9 +235,8 @@ msgstr ""
msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
#, python-format
msgid "(deprecated) replaced by '%(field)s'."
msgstr ""

msgid "Types"
Expand All @@ -246,9 +245,6 @@ msgstr ""
msgid "Filter by one or more type id, comma-separated."
msgstr ""

msgid "Filter by a trek id. It will show only the POIs related to this trek."
msgstr ""

msgid "Sites"
msgstr ""

Expand Down Expand Up @@ -347,7 +343,7 @@ msgstr ""
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on organizers"
msgid "Filter by one or more organizer, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
Expand Down Expand Up @@ -564,12 +560,8 @@ msgstr ""
msgid "Altimetry data not available"
msgstr ""

#, python-format
msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'start_time'"
msgstr ""

msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'capacity'"
"using '%(field)s'"
msgstr ""
34 changes: 10 additions & 24 deletions geotrek/api/locale/fr/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: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-06-23 10:12+0000\n"
"POT-Creation-Date: 2024-02-09 15:51+0000\n"
"PO-Revision-Date: 2020-10-20 16:33+0000\n"
"Last-Translator: Bastien Potiron <bastien.potiron@makina-corpus.com>\n"
"Language-Team: French <https://weblate.makina-corpus.net/projects/geotrek-"
Expand Down Expand Up @@ -248,24 +248,16 @@ msgstr "Filtrer par un ou plusieurs id de structure, séparés par des virgules.
msgid "Trek"
msgstr "Itinéraire"

msgid ""
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
msgstr ""
"Filtrer par l'id d'un itinéraire. Le filtre n'affichera que les zones "
"sensibles liées à cet itinéraire."
#, python-format
msgid "(deprecated) replaced by '%(field)s'."
msgstr "(déprécié) remplacé par '%(field)s'."

msgid "Types"
msgstr "Types"

msgid "Filter by one or more type id, comma-separated."
msgstr "Filtrer par un ou plusieurs id de type, séparés par des virgules."

msgid "Filter by a trek id. It will show only the POIs related to this trek."
msgstr ""
"Filtrer par l'id d'un itinéraire. Le filtre n'affichera que les POIs liés à "
"cet itinéraire."

msgid "Sites"
msgstr ""

Expand Down Expand Up @@ -386,8 +378,8 @@ msgstr ""

msgid "Filter by one or more organizer, comma-separated."
msgstr ""
"Filtrer par un ou plusieurs id d'organisateur d'évènements, "
"séparés par des virgules."
"Filtrer par un ou plusieurs id d'organisateur d'évènements, séparés par des "
"virgules."

msgid "Filter events on bookable boolean : true/false expected"
msgstr "Filtre les évènements réservables : true/false attendu"
Expand Down Expand Up @@ -625,16 +617,10 @@ msgstr ""
msgid "Altimetry data not available"
msgstr "Données altimétriques non disponibles"

#, python-format
msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'start_time'"
msgstr ""
"Ce champ est déprécié et sera retiré dans de prochaines releases, merci "
"d'utiliser 'start_time' à la place."

msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'capacity'"
"using '%(field)s'"
msgstr ""
"Ce champ est déprécié et sera retiré dans de prochaines releases, merci "
"d'utiliser 'capacity' à la place."
"Ce champ est déprécié et sera retiré dans une future version, merci "
"d'utiliser '%(field)s' à la place."
20 changes: 6 additions & 14 deletions geotrek/api/locale/it/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: 2023-06-23 10:12+0000\n"
"POT-Creation-Date: 2024-02-09 15:51+0000\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 Down Expand Up @@ -235,9 +235,8 @@ msgstr ""
msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
#, python-format
msgid "(deprecated) replaced by '%(field)s'."
msgstr ""

msgid "Types"
Expand All @@ -246,9 +245,6 @@ msgstr ""
msgid "Filter by one or more type id, comma-separated."
msgstr ""

msgid "Filter by a trek id. It will show only the POIs related to this trek."
msgstr ""

msgid "Sites"
msgstr ""

Expand Down Expand Up @@ -347,7 +343,7 @@ msgstr ""
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on organizers"
msgid "Filter by one or more organizer, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
Expand Down Expand Up @@ -564,12 +560,8 @@ msgstr ""
msgid "Altimetry data not available"
msgstr ""

#, python-format
msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'start_time'"
msgstr ""

msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'capacity'"
"using '%(field)s'"
msgstr ""
20 changes: 6 additions & 14 deletions geotrek/api/locale/nl/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: 2023-06-23 10:12+0000\n"
"POT-Creation-Date: 2024-02-09 15:51+0000\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 Down Expand Up @@ -235,9 +235,8 @@ msgstr ""
msgid "Trek"
msgstr ""

msgid ""
"Filter by a trek id. It will show only the sensitive areas intersecting this "
"trek."
#, python-format
msgid "(deprecated) replaced by '%(field)s'."
msgstr ""

msgid "Types"
Expand All @@ -246,9 +245,6 @@ msgstr ""
msgid "Filter by one or more type id, comma-separated."
msgstr ""

msgid "Filter by a trek id. It will show only the POIs related to this trek."
msgstr ""

msgid "Sites"
msgstr ""

Expand Down Expand Up @@ -347,7 +343,7 @@ msgstr ""
msgid "Filter by one or more Place id, comma-separated."
msgstr ""

msgid "Filter events on organizers"
msgid "Filter by one or more organizer, comma-separated."
msgstr ""

msgid "Filter events on bookable boolean : true/false expected"
Expand Down Expand Up @@ -564,12 +560,8 @@ msgstr ""
msgid "Altimetry data not available"
msgstr ""

#, python-format
msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'start_time'"
msgstr ""

msgid ""
"This field is deprecated and will be removed in next releases. Please start "
"using 'capacity'"
"using '%(field)s'"
msgstr ""
4 changes: 2 additions & 2 deletions geotrek/api/v2/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def get_schema_fields(self, view):
), Field(
name='trek', required=False, location='query', schema=coreschema.Integer(
title=_("Trek"),
description=_('(deprecated) Same as near_trek.')
description=_("(deprecated) replaced by '%(field)s'.") % {"field": "near_trek"}
)
),
)
Expand Down Expand Up @@ -247,7 +247,7 @@ def get_schema_fields(self, view):
), Field(
name='trek', required=False, location='query', schema=coreschema.Integer(
title=_("Trek"),
description=_("(deprecated) Same as near_trek.")
description=_("(deprecated) replaced by '%(field)s'.") % {"field": "near_trek"}
)
), Field(
name='sites', required=False, location='query', schema=coreschema.Integer(
Expand Down

0 comments on commit 884b5ee

Please sign in to comment.