From cccf59ad996447596ac2e821815b2d677c993d4b Mon Sep 17 00:00:00 2001
From: Zog
Date: Tue, 17 Apr 2018 14:22:28 +0200
Subject: Refs #6505; Fix translations in Line#show

---
 app/views/lines/show.html.slim             | 20 ++++++++++----------
 app/views/referential_lines/show.html.slim |  2 +-
 config/locales/lines.en.yml                |  2 +-
 config/locales/lines.fr.yml                |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/views/lines/show.html.slim b/app/views/lines/show.html.slim
index d0a0d5442..b683b9be6 100644
--- a/app/views/lines/show.html.slim
+++ b/app/views/lines/show.html.slim
@@ -7,13 +7,13 @@
       .col-lg-6.col-md-6.col-sm-12.col-xs-12
         = definition_list t('metadatas'),
           {  t('objectid') => @line.get_objectid.short_id,
-             @line.human_attribute_name(:state) => line_status(@line.deactivated),
-             @line.human_attribute_name(:network_id) => (@line.network.nil? ? t('lines.index.unset') : @line.network.name),
-             @line.human_attribute_name(:company_id) => (@line.company.nil? ? t('lines.index.unset') : @line.company.name),
-             @line.human_attribute_name(:secondary_companies) => (@line.secondary_companies.nil? ? t('lines.index.unset') : array_to_html_list(@line.secondary_companies.collect(&:name))),
-             @line.human_attribute_name(:number) => @line.number,
-             @line.human_attribute_name(:registration_number) => (@line.registration_number ? @line.registration_number : '-'),
-             @line.human_attribute_name(:transport_mode) => (@line.transport_mode.present? ? t("enumerize.transport_mode.#{@line.transport_mode}") : '-'),
-             @line.human_attribute_name(:transport_submode) => (@line.transport_submode.present? ? t("enumerize.transport_submode.#{@line.transport_submode}") : '-'),
-             @line.human_attribute_name(:url) => (@line.url ? @line.url : '-'),
-             @line.human_attribute_name(:seasonal) => (@line.seasonal? ? t('true') : t('false')),}
+             Chouette::Line.tmf(:state) => line_status(@line.deactivated),
+             Chouette::Line.tmf(:network_id) => (@line.network.nil? ? t('lines.index.unset') : @line.network.name),
+             Chouette::Line.tmf(:company_id) => (@line.company.nil? ? t('lines.index.unset') : @line.company.name),
+             Chouette::Line.tmf(:secondary_companies) => (@line.secondary_companies.nil? ? t('lines.index.unset') : array_to_html_list(@line.secondary_companies.collect(&:name))),
+             Chouette::Line.tmf(:number) => @line.number,
+             Chouette::Line.tmf(:registration_number) => (@line.registration_number ? @line.registration_number : '-'),
+             Chouette::Line.tmf(:transport_mode) => (@line.transport_mode.present? ? t("enumerize.transport_mode.#{@line.transport_mode}") : '-'),
+             Chouette::Line.tmf(:transport_submode) => (@line.transport_submode.present? ? t("enumerize.transport_submode.#{@line.transport_submode}") : '-'),
+             Chouette::Line.tmf(:url) => (@line.url ? @line.url : '-'),
+             Chouette::Line.tmf(:seasonal) => (@line.seasonal? ? t('true') : t('false')),}
diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index 8d763777e..4804da527 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -10,7 +10,7 @@
              Chouette::Line.tmf('state') => line_status(@line.deactivated),
              Chouette::Line.tmf('network_id') => (@line.network.nil? ? t('lines.index.unset') : link_to(@line.network.name, [@referential, @line.network]) ),
              Chouette::Line.tmf('company') => (@line.company.nil? ? t('lines.index.unset') : link_to(@line.company.name, [@referential, @line.company]) ),
-             Chouette::Line.tmf('secondary_company') => (@line.secondary_companies.nil? ? t('lines.index.unset') : @line.secondary_companies.collect(&:name).join(', ')),
+             Chouette::Line.tmf('secondary_companies') => (@line.secondary_companies.nil? ? t('lines.index.unset') : @line.secondary_companies.collect(&:name).join(', ')),
              Chouette::Line.tmf('registration_number') => @line.number,
              Chouette::Line.tmf('published_name') => (@line.registration_number ? @line.registration_number : '-'),
              Chouette::Line.tmf('transport_mode') => (@line.transport_mode.present? ? t("enumerize.transport_mode.#{@line.transport_mode}") : '-'),
diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml
index 1cd5150db..3d1ddc149 100644
--- a/config/locales/lines.en.yml
+++ b/config/locales/lines.en.yml
@@ -78,7 +78,7 @@ en:
           name: "Network"
         company_id: "Company"
         company: "Company"
-        secondary_company: "Secondary company"
+        secondary_companies: "Secondary companies"
         companies:
           name: "Company"
         registration_number: "Registration number"
diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml
index 6f4a2e9bf..47baf96f8 100644
--- a/config/locales/lines.fr.yml
+++ b/config/locales/lines.fr.yml
@@ -79,7 +79,7 @@ fr:
           name: "Réseau"
         company_id: "Transporteur principal"
         company: "Transporteur principal"
-        secondary_company: "Transporteurs secondaires"
+        secondary_companies: "Transporteurs secondaires"
         companies:
           name: "Transporteur principal"
         registration_number: "Nom court"
-- 
cgit v1.2.3