Display enumeration name in confirmation message.

git-svn-id: http://svn.redmine.org/redmine/trunk@14750 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/enumerations/destroy.html.erb b/app/views/enumerations/destroy.html.erb
index 503cf4ccaa47263580393671c479b78ac728ada1..2757eed4ee134c80a1df2b406f6a0f8b33f028b5 100644 (file)
--- a/app/views/enumerations/destroy.html.erb
+++ b/app/views/enumerations/destroy.html.erb
@@ -2,7 +2,7 @@
 
 <%= form_tag({}, :method => :delete) do %>
 <div class="box">
-<p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
+<p><strong><%= l(:text_enumeration_destroy_question, :name => @enumeration.name, :count => @enumeration.objects_count) %></strong></p>
 <p><label for='reassign_to_id'><%= l(:text_enumeration_category_reassign_to) %></label>
 <%= select_tag 'reassign_to_id', (content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---", :value => '') + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
 </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index dada67a9f65ad0252546870defafcccddfe020cf..a84c971abc6f00d164fd7446d54131f11b6e5197 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1089,7 +1089,7 @@ en:
   text_assign_time_entries_to_project: Assign reported hours to the project
   text_reassign_time_entries: 'Reassign reported hours to this issue:'
   text_user_wrote: "%{value} wrote:"
-  text_enumeration_destroy_question: "%{count} objects are assigned to this value."
+  text_enumeration_destroy_question: "%{count} objects are assigned to the value “%{name}”."
   text_enumeration_category_reassign_to: 'Reassign them to this value:'
   text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/configuration.yml and restart the application to enable them."
   text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2cedaa2cdcead630b98f07e42b21dc91576843c2..f6e6821efc06f7571ab21cfe505c2f4b9e6ce762 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1107,7 +1107,7 @@ fr:
   text_assign_time_entries_to_project: Reporter les heures sur le projet
   text_reassign_time_entries: 'Reporter les heures sur cette demande:'
   text_user_wrote: "%{value} a écrit :"
-  text_enumeration_destroy_question: "Cette valeur est affectée à %{count} objets."
+  text_enumeration_destroy_question: "La valeur « %{name} » est affectée à %{count} objet(s)."
   text_enumeration_category_reassign_to: 'Réaffecter les objets à cette valeur:'
   text_email_delivery_not_configured: "L'envoi de mail n'est pas configuré, les notifications sont désactivées.\nConfigurez votre serveur SMTP dans config/configuration.yml et redémarrez l'application pour les activer."
   text_repository_usernames_mapping: "Vous pouvez sélectionner ou modifier l'utilisateur Redmine associé à chaque nom d'utilisateur figurant dans l'historique du dépôt.\nLes utilisateurs avec le même identifiant ou la même adresse mail seront automatiquement associés."