diff options
| author | cedricnjanga | 2018-03-27 22:31:50 -0700 | 
|---|---|---|
| committer | Johan Van Ryseghem | 2018-03-29 10:13:08 +0200 | 
| commit | 69949a6aafad03362824d4214cddd01a2de4193e (patch) | |
| tree | 4ca7737f10d79d352b53d02ac301fa526f10d225 /app | |
| parent | 5da1b946dce489b785e74d2f711b2dd3ce3900ea (diff) | |
| download | chouette-core-69949a6aafad03362824d4214cddd01a2de4193e.tar.bz2 | |
Refs #6156 Update Referential english translation
Diffstat (limited to 'app')
| -rw-r--r-- | app/decorators/referential_decorator.rb | 2 | ||||
| -rw-r--r-- | app/views/referential_lines/show.html.slim | 26 | ||||
| -rw-r--r-- | app/views/referentials/_overview.html.slim | 4 | 
3 files changed, 16 insertions, 16 deletions
| diff --git a/app/decorators/referential_decorator.rb b/app/decorators/referential_decorator.rb index 41cad237d..cce14d160 100644 --- a/app/decorators/referential_decorator.rb +++ b/app/decorators/referential_decorator.rb @@ -43,7 +43,7 @@ class ReferentialDecorator < AF83::Decorator      end      instance_decorator.action_link policy: :edit, secondary: :show, on: :show do |l| -      l.content 'Purger' +      l.content t('actions.clean_up')        l.href '#'        l.type 'button'        l.data {{ diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim index ef32ef6b0..91868a002 100644 --- a/app/views/referential_lines/show.html.slim +++ b/app/views/referential_lines/show.html.slim @@ -7,16 +7,16 @@        .col-lg-6.col-md-6.col-sm-12.col-xs-12          = definition_list t('metadatas'),            {  t('id_codif') => @line.get_objectid.short_id, -             'Activé' => (@line.deactivated? ? t('false') : t('true')), -             @line.human_attribute_name(:network) => (@line.network.nil? ? t('lines.index.unset') : link_to(@line.network.name, [@referential, @line.network]) ), -             @line.human_attribute_name(:company) => (@line.company.nil? ? t('lines.index.unset') : link_to(@line.company.name, [@referential, @line.company]) ), -             'Transporteur(s) secondaire(s)' => (@line.secondary_companies.nil? ? t('lines.index.unset') : @line.secondary_companies.collect(&:name).join(', ')), -             'Nom court' => @line.number, -             'Code public' => (@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('activated') => (@line.deactivated? ? t('false') : t('true')), +             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('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}") : '-'), +             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')),}        .col-lg-6.col-md-6.col-sm-12.col-xs-12          #routes_map.map.mb-lg      .row @@ -53,12 +53,12 @@                      attribute: 'wayback_text' \                    ), \                    TableBuilderHelper::Column.new( \ -                    name: 'Arrêt de départ', \ +                    name: Chouette::Route.tmf('stop_area_departure'), \                      attribute: Proc.new { |r| r.try(:stop_points).first.try(:stop_area).try(:name) }, \                      sortable: false \                    ), \                    TableBuilderHelper::Column.new( \ -                    name: "Arrêt d'arrivée", \ +                    name: Chouette::Route.tmf('stop_area_arrival'), \                      attribute: Proc.new{ |r| r.try(:stop_points).last.try(:stop_area).try(:name) }, \                      sortable: false \                    ), \ @@ -79,7 +79,7 @@          - unless @routes.any?            .row.mt-xs              .col-lg-12 -              = replacement_msg t('routes.search_no_results') +              = replacement_msg t('routes.filters.no_results')  = javascript_tag do    | window.routes = "#{URI.escape(@routes.select{|r| r.wayback == :outbound}.map{|r| {name: r.name, id: r.id, stops: route_json_for_edit(r, serialize: false)}}.to_json)}" diff --git a/app/views/referentials/_overview.html.slim b/app/views/referentials/_overview.html.slim index 6bed5f282..b3258ffd1 100644 --- a/app/views/referentials/_overview.html.slim +++ b/app/views/referentials/_overview.html.slim @@ -16,8 +16,8 @@            = f.input :transport_mode_eq_any, collection: overview.referential_lines.map(&:transport_mode).compact.uniq.sort, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.transport_mode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}        .actions -        = link_to 'Effacer', url_for() + "##{overview.pagination_param_name}", class: 'btn btn-link' -        = f.submit 'Filtrer', class: 'btn btn-default' +        = link_to t('actions.erase'), url_for() + "##{overview.pagination_param_name}", class: 'btn btn-link' +        = f.submit t('actions.filter'), class: 'btn btn-default'    .time-travel      .btn-group | 
