Refs #4112: updating and fixing I18n

22 files changed, 107 insertions, 46 deletions

diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb
index 3dbf6be0d..8fe79dc0c 100644
--- a/app/models/chouette/stop_point.rb
+++ b/app/models/chouette/stop_point.rb
@@ -36,12 +36,12 @@ module Chouette
 
     def stop_area_id_validation
       if stop_area_id.nil?
-        errors.add(:stop_area_id, I18n.t("errors.messages.empty"))
+        errors.add(:stop_area_id, I18n.t("stop_areas.errors.empty"))
       end
     end
 
     def self.area_candidates
-      Chouette::StopArea.where( :area_type => ['Quay', 'BoardingPosition'])
+      Chouette::StopArea.where(:area_type => ['Quay', 'BoardingPosition'])
     end
 
   end
diff --git a/app/views/compliance_checks/detailed_errors_index.csv.slim b/app/views/compliance_checks/detailed_errors_index.csv.slim
index 0b2c3f24f..7fe20e282 100644
--- a/app/views/compliance_checks/detailed_errors_index.csv.slim
+++ b/app/views/compliance_checks/detailed_errors_index.csv.slim
@@ -29,7 +29,7 @@
           = error["source"]["file"]["line_number"]
 
       - else
-        = I18n.t("activemodel.attributes.compliance_check_result."+r.test_id);
+        = I18n.t("activemodel.attributes.compliance_check_result.#{r.test_id}");
         = I18n.t("compliance_check_result.details.detail_#{error['error_id']}", object_labels_hash(error) )
         = "\n"
 
diff --git a/app/views/compliance_checks/summary_errors_index.csv.slim b/app/views/compliance_checks/summary_errors_index.csv.slim
index bbb2c8c88..8c88d5cf6 100644
--- a/app/views/compliance_checks/summary_errors_index.csv.slim
+++ b/app/views/compliance_checks/summary_errors_index.csv.slim
@@ -16,7 +16,7 @@
   = r.result;
   = r.test_id;
 
-  = I18n.t("activemodel.attributes.compliance_check_result." + r.test_id);
+  = I18n.t("activemodel.attributes.compliance_check_result.#{r.test_id}");
   = Rails.application.config.validation_spec + I18n.locale.to_s + "/" + r.test_id + ".html";
 
   = r.error_count
diff --git a/app/views/referential_stop_areas/index.html.slim b/app/views/referential_stop_areas/index.html.slim
index 1cbe1945f..7bf39eabd 100644
--- a/app/views/referential_stop_areas/index.html.slim
+++ b/app/views/referential_stop_areas/index.html.slim
@@ -4,7 +4,7 @@
   .panel.panel-default
     .panel-heading
       .input-group.col-md-9.col-sm-9
-        = f.text_field :name_or_objectid_cont, placeholder: t('.name_or_objectid'), class: 'form-control'
+        = f.text_field :name_or_objectid_cont, placeholder: t('stop_areas.filters.name_or_objectid'), class: 'form-control'
         .input-group-btn
           button.btn.btn-primary#search-btn type="submit"
             span.fa.fa-search
diff --git a/app/views/stop_area_copies/new.html.slim b/app/views/stop_area_copies/new.html.slim
index 1a8764cbc..b506d35f4 100644
--- a/app/views/stop_area_copies/new.html.slim
+++ b/app/views/stop_area_copies/new.html.slim
@@ -1,4 +1,4 @@
-= title_tag t("stop_area_copies.new.title."+@stop_area_copy.hierarchy)
+= title_tag t("stop_area_copies.new.title.#{@stop_area_copy.hierarchy}")
 
 = semantic_form_for [@referential, @stop_area, @stop_area_copy] do |form|
   br
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index bd3937938..19a919cc2 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -65,6 +65,7 @@ search:
   exclude:
     - app/assets/images
     - app/assets/fonts
+    - app/assets/javascripts
     - app/assets/videos
 
   ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
diff --git a/config/locales/actions.en.yml b/config/locales/actions.en.yml
index cffd04fcf..f6979136a 100644
--- a/config/locales/actions.en.yml
+++ b/config/locales/actions.en.yml
@@ -4,6 +4,7 @@ en:
     destroy: "Destroy"
     delete: "Delete"
     search: "Search"
+    submit: "Submit"
     add: "Add new"
     new: "Add new"
     show: "See"
diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml
index f6c5ba852..cb1ede4c7 100644
--- a/config/locales/calendars.en.yml
+++ b/config/locales/calendars.en.yml
@@ -9,6 +9,19 @@ en:
       friday: F
       saturday: Sa
       sunday: Su
+    months:
+      1: January
+      2: February
+      3: March
+      4: April
+      5: May
+      6: June
+      7: July
+      8: August
+      9: September
+      10: October
+      11: November
+      12: December
     standard_calendars: Standard calendars
     standard_calendar: Standard calendar
     actions:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a6002175..b25f5fd7f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -14,6 +14,38 @@ en:
     formats:
       short: "%Y/%m/%d"
       short_with_time: "%Y/%m/%d at %Hh%M"
+    abbr_day_names:
+    - Sun
+    - Mon
+    - Tue
+    - Wed
+    - Thu
+    - Fri
+    - Sat
+    day_names:
+    - Sunday
+    - Monday
+    - Tuesday
+    - Wednesday
+    - Thursday
+    - Friday
+    - Saturday
+    month_names:
+    -
+    - January
+    - February
+    - March
+    - April
+    - May
+    - June
+    - July
+    - August
+    - September
+    - October
+    - November
+    - December
+  errors:
+    format: "%{message}"
 
   last_update: 'Last update on<br>%{time}'
   last_sync: 'Last sync on %{time}'
diff --git a/config/locales/enumerize.en.yml b/config/locales/enumerize.en.yml
index f76237288..0bc3e5edc 100644
--- a/config/locales/enumerize.en.yml
+++ b/config/locales/enumerize.en.yml
@@ -114,6 +114,7 @@ en:
       transport_mode:
         interchange: Interchange
         unknown: "unknown"
+        undefined: "undefined"
         air: "Air"
         train: "Train"
         long_distance_train: "Long distance train"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3d5dc4c2c..8ef183d91 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -14,6 +14,36 @@ fr:
     formats:
       short: "%d/%m/%Y"
       short_with_time: "%d/%m/%Y à %Hh%M"
+    abbr_day_names:
+    - dim
+    - lun
+    - mar
+    - mer
+    - jeu
+    - ven
+    - sam
+    day_names:
+    - dimanche
+    - lundi
+    - mardi
+    - mercredi
+    - jeudi
+    - vendredi
+    - samedi
+    month_names:
+    -
+    - janvier
+    - février
+    - mars
+    - avril
+    - mai
+    - juin
+    - juillet
+    - août
+    - septembre
+    - octobre
+    - novembre
+    - décembre
   errors:
     format: "%{message}"
 
@@ -25,3 +55,4 @@ fr:
 
   id_codif: 'ID Codifligne'
   id_reflex: 'ID Reflex'
+  objectid: 'ID'
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index a5eb0f969..b20f0f1da 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -7,6 +7,8 @@ en:
     index:
       title: "Imports"
       warning: ""
+    new:
+      title: "Imports"
     show:
       report: "Report"
       imported_file: "Original file"
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 8fe8817f5..933025c82 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -7,6 +7,8 @@ fr:
     index:
       title: "Imports"
       warning: ""
+    new:
+      title: "Imports"
     show:
       report: "Rapport"
       imported_file: "Fichier source"
diff --git a/config/locales/mailers.en.yml b/config/locales/mailers.en.yml
index d4bd45129..9f89c9d46 100644
--- a/config/locales/mailers.en.yml
+++ b/config/locales/mailers.en.yml
@@ -4,6 +4,6 @@ en:
       created:
         subject: A new shared calendar has been created
         body: A new shared calendar% {cal_name} has been added by STIF. You can now view it in the list of shared calendars %{cal_index_url}
-      created:
+      updated:
         subject: A shared calendar has been updated
         body: A new shared calendar% {cal_name} has been updated by STIF. You can now view it in the list of shared calendars %{cal_index_url}
diff --git a/config/locales/referentials.en.yml b/config/locales/referentials.en.yml
index 7a4c60869..5f39f03f4 100644
--- a/config/locales/referentials.en.yml
+++ b/config/locales/referentials.en.yml
@@ -1,6 +1,6 @@
 en:
   referentials:
-    filter:
+    filters:
       name_or_number_or_objectid: 'Search by name, number or objectid'
     search_no_results: 'No data space matching your query'
     index:
@@ -41,6 +41,7 @@ en:
       user_excluded: "%{user} is a reserved value"
       overlapped_referential: "%{referential} cover the same perimeter"
       overlapped_period: "Another period is on the same period"
+      short_period: Min period length is two days
   activerecord:
     models:
       referential:
diff --git a/config/locales/routes.en.yml b/config/locales/routes.en.yml
index d8160772f..3099d4ab1 100644
--- a/config/locales/routes.en.yml
+++ b/config/locales/routes.en.yml
@@ -84,9 +84,3 @@ en:
       hub:
         route:
           objectid: "[prefix]:Route:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 8."
-
-  # simpleform
-  helpers:
-    submit:
-      route:
-        create: 'Create route'
diff --git a/config/locales/routing_constraint_zones.en.yml b/config/locales/routing_constraint_zones.en.yml
index 59d4484a8..836705a6a 100644
--- a/config/locales/routing_constraint_zones.en.yml
+++ b/config/locales/routing_constraint_zones.en.yml
@@ -24,9 +24,6 @@ en:
   routing_constraint_zones:
     search_no_results: "No ITL matches your query"
     actions:
-      new: New routing constraint zone
-      edit: Edit this routing constraint zone
-      destroy: Delete this routing constraint zone
       destroy_confirm: Are you sure you want to delete this routing constraint zone?
     new:
       title: Add a new routings constraint zone
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index f6c0079ee..ad722312e 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -7,21 +7,11 @@ en:
     required:
       text: 'Required field'
       mark: '*'
-      # You can uncomment the line below if you need to overwrite the whole required html.
-      # When using html, text and mark won't be used.
-      # html: '<abbr title="required">*</abbr>'
     error_notification:
       default_message: "Please review the problems below:"
-    # Labels and hints examples
-    # labels:
-    #   defaults:
-    #     password: 'Password'
-    #   user:
-    #     new:
-    #       email: 'E-mail to sign in.'
-    #     edit:
-    #       email: 'E-mail.'
-    # hints:
-    #   defaults:
-    #     username: 'User name to sign in.'
-    #     password: 'No special characters, please.'
+
+  helpers:
+    submit:
+      create: Submit
+      edit: Edit
+      update: Edit
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 2a6893595..cd5dd1fbe 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -15,16 +15,3 @@ fr:
       create: Valider
       edit: Editer
       update: Editer
-    # Labels and hints examples
-    # labels:
-    #   defaults:
-    #     password: 'Password'
-    #   user:
-    #     new:
-    #       email: 'E-mail to sign in.'
-    #     edit:
-    #       email: 'E-mail.'
-    # hints:
-    #   defaults:
-    #     username: 'User name to sign in.'
-    #     password: 'No special characters, please.'
diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml
index 3d6b65350..324294892 100644
--- a/config/locales/stop_areas.en.yml
+++ b/config/locales/stop_areas.en.yml
@@ -1,6 +1,8 @@
 en:
   stop_areas: &en_stop_areas
     search_no_results: "No stop area matching your query"
+    errors:
+      empty: Aucun stop_area_id
     default_geometry_success: "%{count} modified stop areas"
     stop_area:
       no_position: "No Position"
@@ -90,6 +92,7 @@ en:
         registration_number: "Registration number"
         published_name: "Published name"
         deleted: "Deleted"
+        deleted_at: "Deleted at"
         comment: "Description"
         stop_area_type: "Area type"
         area_type: "Area type"
@@ -179,5 +182,6 @@ en:
           comment: "Maximum length = 255."
           coordinates: "Coordinates are mandatory."
           projection_xy: "x,y in secondary referential, dot for decimal separator"
+
   referential_stop_areas:
     <<: *en_stop_areas
diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml
index 3e49cdf7c..216516e5b 100644
--- a/config/locales/stop_areas.fr.yml
+++ b/config/locales/stop_areas.fr.yml
@@ -1,6 +1,8 @@
 fr:
   stop_areas: &fr_stop_areas
     search_no_results: "Aucun arrêt ne correspond à votre recherche"
+    errors:
+      empty: Aucun stop_area_id
     default_geometry_success: "%{count} arrêts édités"
     stop_area:
       no_position: "Pas de position"
@@ -14,6 +16,7 @@ fr:
       new: "Ajouter un arrêt"
       edit: "Editer cet arrêt"
       destroy: "Supprimer cet arrêt"
+      deleted_at: "Activé"
       destroy_confirm: "Etes vous sûr de supprimer cet arrêt ainsi que tous ses fils?"
       select_parent: "Créer ou éditer la relation enfant -> parent"
       add_children: "Créer ou éditer la relation parent -> enfants"
diff --git a/config/locales/time_tables.en.yml b/config/locales/time_tables.en.yml
index dc6c6d9f4..24750f0af 100644
--- a/config/locales/time_tables.en.yml
+++ b/config/locales/time_tables.en.yml
@@ -24,6 +24,8 @@ en:
       success: "Actualize succeded"
     new:
       title: "Add a new timetable"
+    duplicate:
+      title: "Duplicate timetable"
     edit:
       title: "Update timetable %{time_table}"
     show: