diff options
| author | jpl | 2017-07-18 15:01:17 +0200 |
|---|---|---|
| committer | jpl | 2017-07-18 15:01:24 +0200 |
| commit | 1039a32677434bac1816e48939db5f1040a6862d (patch) | |
| tree | 78bafe126aec4725b1dadee3fc3f1d4168e29739 /app | |
| parent | 6d2ff080cc989e8f74f7f90ed7d0b1828e4271c2 (diff) | |
| download | chouette-core-1039a32677434bac1816e48939db5f1040a6862d.tar.bz2 | |
Refs #4112: updating and fixing I18n
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/chouette/stop_point.rb | 4 | ||||
| -rw-r--r-- | app/views/compliance_checks/detailed_errors_index.csv.slim | 2 | ||||
| -rw-r--r-- | app/views/compliance_checks/summary_errors_index.csv.slim | 2 | ||||
| -rw-r--r-- | app/views/referential_stop_areas/index.html.slim | 2 | ||||
| -rw-r--r-- | app/views/stop_area_copies/new.html.slim | 2 |
5 files changed, 6 insertions, 6 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 |
