Refs #5758; Fix messed rebase5758-localized-stop-areas-names

2 files changed, 2 insertions, 8 deletions

diff --git a/app/views/stop_areas/_form.html.slim b/app/views/stop_areas/_form.html.slim
index 67af39dc6..9897a27ac 100644
--- a/app/views/stop_areas/_form.html.slim
+++ b/app/views/stop_areas/_form.html.slim
@@ -13,11 +13,6 @@
               - f.object.localized_names.each do |k, v|
                 .col-md-6= f.input "localized_names[#{k}]", input_html: {value: v}, label: label_for_country(k)
                 
-        .form-group
-          .col-sm-3.col-xs-5
-          .col-sm-9.col-xs-7
-            - f.object.localized_names.each do |k, v|
-              .col-md-6= f.input "localized_names[#{k}]", input_html: {value: v}, label: label_for_country(k)
         = f.input :kind, as: :radio_buttons, checked: @stop_area.kind, :input_html => {:disabled => !@stop_area.new_record?}, :include_blank => false, item_wrapper_class: 'radio-inline', wrapper: :horizontal_form, disabled: !@stop_area.new_record?
         .slave data-master="[name='stop_area[kind]']" data-value="commercial"
           = f.input :parent_id, as: :select, :collection => [f.object.parent_id], input_html: { data: { select2_ajax: 'true', url: autocomplete_stop_area_referential_stop_areas_path(@stop_area_referential), initvalue: {id: f.object.parent_id, text: f.object.parent.try(:full_name)}}}
diff --git a/app/views/stop_areas/show.html.slim b/app/views/stop_areas/show.html.slim
index 300d714e8..a4e14a272 100644
--- a/app/views/stop_areas/show.html.slim
+++ b/app/views/stop_areas/show.html.slim
@@ -13,9 +13,8 @@
             - attributes.merge!({label_for_country(k, @stop_area.human_attribute_name(:name)) => v }) if v.present?
         - attributes.merge!({ @stop_area.human_attribute_name(:parent) => @stop_area.parent ? link_to(@stop_area.parent.name, stop_area_referential_stop_area_path(@stop_area_referential, @stop_area.parent)) : "-" }) if @stop_area.commercial?
         - attributes.merge!({ @stop_area.human_attribute_name(:stop_area_type) => Chouette::AreaType.find(@stop_area.area_type).try(:label),
-            @stop_area.human_attribute_name(:registration_number) => @stop_area.registration_number
-          })
-
+            @stop_area.human_attribute_name(:registration_number) => @stop_area.registration_number,
+            })
         - attributes.merge!(@stop_area.human_attribute_name(:waiting_time) => @stop_area.waiting_time_text) if has_feature?(:stop_area_waiting_time)
         - attributes.merge!({ "Coordonnées" => geo_data(@stop_area, @stop_area_referential),
             @stop_area.human_attribute_name(:zip_code) => @stop_area.zip_code,