diff options
4 files changed, 20 insertions, 10 deletions
diff --git a/app/views/routing_constraint_zones/_filters.html.slim b/app/views/routing_constraint_zones/_filters.html.slim index 74e299a8b..561359943 100644 --- a/app/views/routing_constraint_zones/_filters.html.slim +++ b/app/views/routing_constraint_zones/_filters.html.slim @@ -1,16 +1,16 @@ = search_form_for @q, url: referential_line_routing_constraint_zones_path(@referential, @line), class: 'form form-filter' do |f| .ffg-row .input-group.search_bar class=filter_item_class(params[:q], :name_or_objectid_cont) - = f.search_field :name_or_objectid_cont, class: 'form-control', placeholder: "Indiquez un nom d'ITL ou un ID..." + = f.search_field :name_or_objectid_cont, class: 'form-control', placeholder: t('.name_or_objectid_cont') span.input-group-btn button.btn.btn-default#search-btn type='submit' span.fa.fa-search .ffg-row .form-group class=filter_item_class(params[:q], :route_id_eq) - = f.label 'Itinéraire associé', required: false, class: 'control-label' - = f.input :route_id_eq, as: :select, collection: @line.routing_constraint_zones.pluck(:route_id).uniq, label: false, label_method: lambda { |r| @line.routing_constraint_zones.find_by(route_id: r).route_name }, input_html: { 'data-select2ed': 'true', 'data-select2ed-placeholder': 'Indiquez un itinéraire...' }, wrapper_html: { class: 'select2ed'} + = f.label t('.associated_route.title'), required: false, class: 'control-label' + = f.input :route_id_eq, as: :select, collection: @line.routing_constraint_zones.pluck(:route_id).uniq, label: false, label_method: lambda { |r| @line.routing_constraint_zones.find_by(route_id: r).route_name }, input_html: { 'data-select2ed': 'true', 'data-select2ed-placeholder': t('.associated_route.placeholder') }, wrapper_html: { class: 'select2ed'} .actions - = link_to 'Effacer', referential_line_routing_constraint_zones_path(@referential, @line), class: 'btn btn-link' - = f.submit 'Filtrer', class: 'btn btn-default' + = link_to t('actions.erase'), referential_line_routing_constraint_zones_path(@referential, @line), class: 'btn btn-link' + = f.submit t('actions.filter'), class: 'btn btn-default' diff --git a/app/views/routing_constraint_zones/index.html.slim b/app/views/routing_constraint_zones/index.html.slim index 2f67b467e..7e9fb12a3 100644 --- a/app/views/routing_constraint_zones/index.html.slim +++ b/app/views/routing_constraint_zones/index.html.slim @@ -13,7 +13,7 @@ = table_builder_2 @routing_constraint_zones, [ \ TableBuilderHelper::Column.new( \ - name: 'ID', \ + name: t('objectid'), \ attribute: Proc.new { |n| n.get_objectid.local_id }, \ sortable: false \ ), \ @@ -43,4 +43,4 @@ - unless @routing_constraint_zones.any? .row.mt-xs .col-lg-12 - = replacement_msg t('routing_constraint_zones.search_no_results') + = replacement_msg t('.search_no_results') diff --git a/config/locales/routing_constraint_zones.en.yml b/config/locales/routing_constraint_zones.en.yml index 5675fd5db..2143ce1e1 100644 --- a/config/locales/routing_constraint_zones.en.yml +++ b/config/locales/routing_constraint_zones.en.yml @@ -26,7 +26,11 @@ en: stop_points_not_from_route: 'Stop point does not belong to the Route of this Routing constraint zone.' all_stop_points_selected: 'All stop points from route cannot be selected.' routing_constraint_zones: - search_no_results: "No ITL matches your query" + filters: + associated_route: + title: Associated route + placeholder: Put the name of a route... + name_or_objectid_cont: Search by name or ID... actions: destroy_confirm: Are you sure you want to delete this routing constraint zone? new: @@ -36,4 +40,5 @@ en: show: title: "Routing constraint zone %{name}" index: - title: "Interdictions of local trafficous" + title: "Routing constraint zones" + search_no_results: "No ITL matches your query" diff --git a/config/locales/routing_constraint_zones.fr.yml b/config/locales/routing_constraint_zones.fr.yml index d4b97fff2..b5e0fa7fb 100644 --- a/config/locales/routing_constraint_zones.fr.yml +++ b/config/locales/routing_constraint_zones.fr.yml @@ -26,7 +26,11 @@ fr: stop_points_not_from_route: "Arrêt sur séquence d'arrêts n'appartient pas à la Route de cette Zone de contrainte." all_stop_points_selected: "Une ITL ne peut pas couvrir tous les arrêts d'un itinéraire." routing_constraint_zones: - search_no_results: "Aucune ITL ne correspond à votre recherche" + filters: + associated_route: + title: Itinéraire associé + placeholder: Indiquez un itinéraire... + name_or_objectid_cont: Indiquez un nom d'ITL ou un ID... actions: destroy_confirm: Etes vous sûr de supprimer cette ITL ? new: @@ -37,3 +41,4 @@ fr: title: "Zone de contrainte %{name}" index: title: "Interdictions de trafic local" + search_no_results: "Aucune ITL ne correspond à votre recherche" |