merge fix 25468 from V2_4

2 files changed, 15 insertions, 14 deletions

diff --git a/app/views/lines/index.html.erb b/app/views/lines/index.html.erb
index 3014827af..5f8f756d8 100644
--- a/app/views/lines/index.html.erb
+++ b/app/views/lines/index.html.erb
@@ -1,4 +1,4 @@
-<%= title_tag t('lines.index.title') %> 
+<%= title_tag t('lines.index.title') %>
 
 <%= search_form_for @q, :url => referential_lines_path(@referential), :html => {:method => :get} do |f| %>
   <%= f.label :name_or_number_cont, "#{t('.name_or_number')} :" %>
@@ -42,7 +42,7 @@
 
 <% content_for :sidebar do %>
 <ul class="actions">
-  <li><%= link_to t('lines.actions.new'), new_referential_line_path(@referential), :class => "add" %></li> 
+  <li><%= link_to t('lines.actions.new'), new_referential_line_path(@referential), :class => "add" %></li>
 </ul>
 
 <h4><%= t(".selection") %></h4>
@@ -67,7 +67,6 @@
 
 <% if  @referential.group_of_lines.count > 0 %>
 	<h5><%= Chouette::GroupOfLine.model_name.human.pluralize %></h5>
-	
 	<ul class="selection">
 	<% @referential.group_of_lines.each do |group_of_line| %>
 	<li><%= link_with_search group_of_line.name, "group_of_lines_id_eq" => group_of_line.id %></li>
@@ -84,13 +83,13 @@
 
   <div class="enabled" style="display: none;">
     <a class="disable" href="#"><%= t(".multi_selection_disable") %></a>
-    
+
     <ul class="actions">
-       <li><%= link_to t(".delete_selected"), referential_lines_path(@referential), "data-multiple-method" => "delete", :class => "remove" %></li>
+      <%= link_to t(".delete_selected"), referential_lines_path(@referential), "data-multiple-method" => "delete", :class => "remove", :confirm => t("lines.actions.destroy_selection_confirm") %>
     </ul>
 
     <a class="select_all" href="#"><%= t(".select_all") %></a> | <a class="deselect_all" href="#"><%= t(".deselect_all") %></a>
-  </div> 
+  </div>
 </div>
 
 <% end %>
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index 2fd55d4bc..ade5bb2cf 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -5,6 +5,7 @@ en:
       edit: "Edit this line"
       destroy: "Remove this line"
       destroy_confirm: "Are you sure you want destroy this line?"
+      destroy_selection_confirm: "Are you sure you want destroy those lines?"
       import: "Import lines"
       export_kml: "Export KML line"
       export__kml_all: "Export KML lines"
@@ -33,9 +34,9 @@ en:
       group_of_lines: "Associated groups of lines"
       no_group_of_line: "No group of line"
       several_group_of_lines: "%{count} groups of lines"
-  activerecord:        
-    models:        
-      line: 
+  activerecord:
+    models:
+      line:
         zero:  "line"
         one:   "line"
         other: "lines"
@@ -53,11 +54,11 @@ en:
         objectid: "Neptune identifier"
         object_version: "Version"
         creation_time: "Created on"
-        creator_id: "Created by" 
+        creator_id: "Created by"
   formtastic:
     hints:
       line:
-        registration_number: "only alphanumerical or underscore characters" 
+        registration_number: "only alphanumerical or underscore characters"
         objectid: "[prefix]:Line:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
 
 fr:
@@ -67,6 +68,7 @@ fr:
       edit: "Modifier cette ligne"
       destroy: "Supprimer cette ligne"
       destroy_confirm: "Etes vous sûr de supprimer cette ligne ?"
+      destroy_selection_confirm: "Etes vous sûr de supprimer cette sélection de lignes ?"
       import: "Importer des lignes"
       export_kml: "Export KML de la ligne"
       export_kml_all: "Export KML des lignes"
@@ -95,8 +97,8 @@ fr:
       group_of_lines: "Groupes de lignes associés"
       no_group_of_line: "Aucun groupe de lignes"
       several_group_of_lines: "%{count} groupes of lignes"
-  activerecord:        
-    models:        
+  activerecord:
+    models:
       line:
         zero:  "ligne"
         one:   "ligne"
@@ -119,5 +121,5 @@ fr:
   formtastic:
     hints:
       line:
-        registration_number: "caractères autorisés : alphanumériques et 'souligné'" 
+        registration_number: "caractères autorisés : alphanumériques et 'souligné'"
         objectid: "[prefixe]:Line:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"