diff options
| author | jpl | 2017-02-06 14:35:20 +0100 |
|---|---|---|
| committer | jpl | 2017-02-06 14:35:32 +0100 |
| commit | 9064d64724689a8aa86d4279186e896ca40a5f92 (patch) | |
| tree | 136847d960b30bf20318e2dbd767515b3db4332a | |
| parent | 3c0523a3a498f43abaed89eaab1113cd361b117a (diff) | |
| download | chouette-core-9064d64724689a8aa86d4279186e896ca40a5f92.tar.bz2 | |
Global: fixing i18n issues
| -rw-r--r-- | config/i18n-tasks.yml | 1 | ||||
| -rw-r--r-- | config/locales/referentials.en.yml | 5 | ||||
| -rw-r--r-- | config/locales/referentials.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/routes.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/routing_constraint_zones.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/routing_constraint_zones.fr.yml | 3 | ||||
| -rw-r--r-- | config/locales/time_tables.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/time_tables.fr.yml | 2 |
8 files changed, 11 insertions, 5 deletions
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index c9477e19a..88c02341b 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -67,6 +67,7 @@ search: exclude: - app/assets/images - app/assets/fonts + - app/assets/javascripts ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`: ## If specified, this settings takes priority over `exclude`, but `exclude` still applies. diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml index 805ac648c..14c7e4d0a 100644 --- a/config/locales/referentials.en.yml +++ b/config/locales/referentials.en.yml @@ -34,6 +34,8 @@ en: pg_excluded: "can't begins with pg_" public_excluded: "public is a reserved value" user_excluded: "%{user} is a reserved value" + overlapped_referential: "%{referential} cover the same perimeter" + overlapped_period: "Another period is on the same period" activerecord: models: referential: @@ -77,7 +79,7 @@ en: data_format_restrictions: "Data format constraint" data_format: "Favorite format for export" timebands: "Time bands" - routing_constraint_zone: Zone de contrainte + routing_constraint_zone: Routing constraint zone validity_period: "Validity period" updated_at: "Updated" published_at: "Integrated" @@ -104,4 +106,5 @@ en: referential: archived: "The data space has been successfully archived" unarchived: "The data space has been successfully unarchived" + unarchived_failed: "The data space cannot be unarchived" deleted: "The data space has been successfully destroyed" diff --git a/config/locales/referentials.fr.yml b/config/locales/referentials.fr.yml index 4b26b28ab..f0b6f4924 100644 --- a/config/locales/referentials.fr.yml +++ b/config/locales/referentials.fr.yml @@ -79,6 +79,7 @@ fr: data_format_restrictions: "Format d'export privilégié" data_format: "Format d'export privilégié" timebands: "Créneaux horaires" + routing_constraint_zone: Zone de contrainte validity_period: "Période de validité englobante" updated_at: "Modifié" published_at: "Intégré" diff --git a/config/locales/routes.en.yml b/config/locales/routes.en.yml index 073294884..d2502ef6c 100644 --- a/config/locales/routes.en.yml +++ b/config/locales/routes.en.yml @@ -59,6 +59,7 @@ en: direction: "Direction" wayback: "Wayback" opposite_route: "Reversed route" + opposite_route_id: "Reversed route" objectid: "Neptune identifier" object_version: "Version" creation_time: "Created on" diff --git a/config/locales/routing_constraint_zones.en.yml b/config/locales/routing_constraint_zones.en.yml index 10bcd2f62..7afff4b16 100644 --- a/config/locales/routing_constraint_zones.en.yml +++ b/config/locales/routing_constraint_zones.en.yml @@ -19,5 +19,3 @@ en: title: "Update routing constraint zone %{routing_constraint_zone}" show: title: "Routing constraint zone %{routing_constraint_zone}" - index: - diff --git a/config/locales/routing_constraint_zones.fr.yml b/config/locales/routing_constraint_zones.fr.yml index a4e6ed256..aca828dcb 100644 --- a/config/locales/routing_constraint_zones.fr.yml +++ b/config/locales/routing_constraint_zones.fr.yml @@ -5,6 +5,8 @@ fr: attributes: routing_constraint_zone: name: Nom + stop_areas: Arrêts + line: Ligne routing_constraint_zones: actions: new: Ajouter une zone de contrainte @@ -17,4 +19,3 @@ fr: title: "Modifier la zone de contrainte %{routing_constraint_zone}" show: title: "Zone de contrainte %{routing_constraint_zone}" - index: diff --git a/config/locales/time_tables.en.yml b/config/locales/time_tables.en.yml index 72a934421..1c9d86b47 100644 --- a/config/locales/time_tables.en.yml +++ b/config/locales/time_tables.en.yml @@ -80,6 +80,7 @@ en: creator_id: "Created by " calendars: "Calendar view" calendar_details: "Calendar details" + calendar: "Calendar" dates: "Peculiar dates" date: "On" excluded_dates: "Excluded dates" diff --git a/config/locales/time_tables.fr.yml b/config/locales/time_tables.fr.yml index 60ecfdc35..408f08fd9 100644 --- a/config/locales/time_tables.fr.yml +++ b/config/locales/time_tables.fr.yml @@ -80,6 +80,7 @@ fr: creator_id: "Créé par" calendars: "Calendrier" calendar_details: "Données du calendrier" + calendar: Calendrier dates: "Dates particulières" date: "Le" excluded_dates: "Dates exclues" @@ -88,7 +89,6 @@ fr: period_end: "au" tag_search: "Etiquettes" tag_list: "Etiquettes" - calendar: Calendrier formtastic: titles: time_table: |
