locales fix

5 files changed, 11 insertions, 9 deletions

diff --git a/app/views/group_of_lines/_form.erb b/app/views/group_of_lines/_form.erb
index 5698f53de..cb460c67e 100644
--- a/app/views/group_of_lines/_form.erb
+++ b/app/views/group_of_lines/_form.erb
@@ -3,11 +3,11 @@
     <%= form.input :name, :input_html => {  :title => I18n.t("formtastic.titles#{format_restriction_for_locales(@referential)}.group_of_line.name") } %>
     <%= form.input :registration_number, :input_html => {  :title => I18n.t("formtastic.titles#{format_restriction_for_locales(@referential)}.group_of_line.registration_number") } %>
     <%= form.input :comment %>
-    <%= form.input :objectid, :required => !@group_of_line.new_record?, :input_html => {  :title => I18n.t("formtastic.titles#{format_restriction_for_locales(@referential)}.group_of_line.objectid") } %>
+    <%= form.input :objectid, :required => !@group_of_line.new_record?, :input_html => {  :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.group_of_line.objectid") } %>
   <% end %>
 
   <%= form.inputs do %>
-    <%= form.input :line_tokens, :label => I18n.t('.lines'), :as => :text,  :input_html => { :"data-pre" => ( @group_of_line.lines.map { |line| { :id => line.id, :name => line.name } } ).to_json }  %>
+    <%= form.input :line_tokens, :label => t('.lines'), :as => :text,  :input_html => { :"data-pre" => ( @group_of_line.lines.map { |line| { :id => line.id, :name => line.name } } ).to_json }  %>
   <% end %>
 
    <%= form.actions do %>
diff --git a/config/locales/export_tasks.en.yml b/config/locales/export_tasks.en.yml
index 89e1960f3..fe0e32828 100644
--- a/config/locales/export_tasks.en.yml
+++ b/config/locales/export_tasks.en.yml
@@ -7,7 +7,7 @@ en:
       all: "All"
       flash: "Export task on queue, refresh page to see progression"
       fields_gtfs_export:
-        warning: "Filter on stop areas export only GTFS stops and transfers files, these may contain extra attributes"    
+        warning: "Filter on stop areas export only GTFS stops and transfers files, these may contain extra attributes"
   activemodel:
     models:
       export_task:
@@ -35,10 +35,10 @@ en:
         end_date_less_than: "End date must be less than or equal to %{tt_ed_date}."
         end_date_greater_than_start_date: "End date must be greater than start date"
         extensions: "Extensions"
-        created_at: "Created on"        
+        created_at: "Created on"
         status: "Status"
-        references_type: "Subset"
-        reference_ids: "Subset ids"
+        references_type: "Associated Data Type"
+        reference_ids: "Associated Data"
         object_id_prefix: "Neptune Id prefix"
         max_distance_for_commercial: "Max distance for commercial stop"
         max_distance_for_connection_link: "Max distance for connection link"
@@ -56,4 +56,4 @@ en:
         max_distance_for_commercial: "Maximal distance to merge homonymous stops in commercial stop in meter"
         max_distance_for_connection_link: "Maximal distance to link stops by connection link stop in meter"
         ignore_last_word: "ignore last word on stop name in homonymous detection (inappliable when just one word occurs)"
-        ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection"
\ No newline at end of file
+        ignore_end_chars: "ignore some chars at the end of stop names in homonymous detection"
diff --git a/config/locales/export_tasks.fr.yml b/config/locales/export_tasks.fr.yml
index 106901e5f..770384a21 100644
--- a/config/locales/export_tasks.fr.yml
+++ b/config/locales/export_tasks.fr.yml
@@ -37,8 +37,8 @@ fr:
         extensions: "Extensions"
         created_at: "Créé le"
         status: "Status"
-        references_type: "Sous ensemble"
-        reference_ids: "Identifiants du sous ensemble"
+        references_type: "Type de données incluses"
+        reference_ids: "Données incluses"
         object_id_prefix: "Préfixe d'identifiants"
         max_distance_for_commercial: "Distance max pour créer les zones"
         max_distance_for_connection_link: "Distance max pour créer les correspondances"
diff --git a/config/locales/hub.en.yml b/config/locales/hub.en.yml
index 74f6ad9ec..e7ce63dfe 100644
--- a/config/locales/hub.en.yml
+++ b/config/locales/hub.en.yml
@@ -1,5 +1,6 @@
 en:
   hub:
+    invalid: "is invalid"
     routes:
       wayback_code_exclusive: "Waybak already used for another route"
       max_by_line: "HUB format allows a maximum of 2 routes for a line"
diff --git a/config/locales/hub.fr.yml b/config/locales/hub.fr.yml
index 2ff5b7365..b14b5ed4f 100644
--- a/config/locales/hub.fr.yml
+++ b/config/locales/hub.fr.yml
@@ -1,5 +1,6 @@
 fr:
   hub:
+    invalid: "est invalide"
     routes:
       wayback_code_exclusive: "Une autre séquence existe déjà dans le même sens (Aller ou Retour)"
       max_by_line: "Le format HUB n'autorise que 2 séquences d'arrêts au plus pour une ligne"