Ask more specific confirmation questions when closing/reopening/archiving projects...

Patch by Holger Just.

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

diff --git a/app/views/context_menus/projects.html.erb b/app/views/context_menus/projects.html.erb
index d6a1177c77129f0b22be8ae93737c69f31528877..c5db9084a40641cf9d9b781bc92ff23940efd750 100644 (file)
--- a/app/views/context_menus/projects.html.erb
+++ b/app/views/context_menus/projects.html.erb
@@ -3,14 +3,13 @@
     <% if @project.archived? %>
       <li><%= context_menu_link l(:button_unarchive), unarchive_project_path(@project), method: :post, class: 'icon icon-unlock' %></li>
     <% else %>
-      <li><%= context_menu_link l(:button_archive), archive_project_path(@project), data: {confirm: l(:text_are_you_sure)}, method: :post, class: 'icon icon-lock' %></li>
+      <li><%= context_menu_link l(:button_archive), archive_project_path(@project), data: {confirm: l(:text_project_archive_confirmation, @project.to_s)}, method: :post, class: 'icon icon-lock' %></li>
     <% end %>
     <li>
       <%= context_menu_link l(:button_copy), copy_project_path(@projects), class: 'icon icon-copy' %>
     </li>
     <li>
-      <%= context_menu_link l(:button_delete), project_path(@project, back_url: @back),
-        method: :delete, data: {confirm: l(:text_project_destroy_confirmation)}, class: 'icon icon-del' %>
+      <%= context_menu_link l(:button_delete), project_path(@project, back_url: @back), method: :delete, class: 'icon icon-del' %>
     </li>
   <% end %>
 </ul>

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 5c7ef440c2f0c3b493c885676ebc49ed494b722f..a1035927fa8fa7549fca461439e7cc73df31e60f 100644 (file)
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -7,9 +7,9 @@
   <% end %>
   <% if User.current.allowed_to?(:close_project, @project) %>
     <% if @project.active? %>
-      <%= link_to l(:button_close), close_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock' %>
+      <%= link_to l(:button_close), close_project_path(@project), :data => {:confirm => l(:text_project_close_confirmation, @project.to_s)}, :method => :post, :class => 'icon icon-lock' %>
     <% else %>
-      <%= link_to l(:button_reopen), reopen_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-unlock' %>
+      <%= link_to l(:button_reopen), reopen_project_path(@project), :data => {:confirm => l(:text_project_reopen_confirmation, @project.to_s)}, :method => :post, :class => 'icon icon-unlock' %>
     <% end %>
   <% end %>
   <% if @project.deletable? %>

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3a8ab0b7ef7e2e975818c3c6b43f64b07b9cbb2c..fb6f9dccf3f142efef12ecfc5f1f66fc4f8a9dd5 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1108,6 +1108,9 @@ de:
   text_plugin_assets_writable: Verzeichnis für Plugin-Assets beschreibbar
   text_project_closed: Dieses Projekt ist geschlossen und kann nicht bearbeitet werden.
   text_project_destroy_confirmation: Sind Sie sicher, dass Sie das Projekt löschen wollen?
+  text_project_close_confirmation: Sind Sie sicher, dass Sie das Projekt '%{value}' schließen wollen?
+  text_project_reopen_confirmation: Sind Sie sicher, dass Sie das Projekt '%{value}' wieder öffnen wollen?
+  text_project_archive_confirmation: Sind Sie sicher, dass Sie das Projekt '%{value}' archivieren wollen?
   text_project_identifier_info: 'Kleinbuchstaben (a-z), Ziffern, Binde- und Unterstriche erlaubt.<br />Einmal gespeichert, kann die Kennung nicht mehr geändert werden.'
   text_reassign_time_entries: 'Gebuchte Aufwände diesem Ticket zuweisen:'
   text_regexp_info: z. B. ^[A-Z0-9]+$

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 62577376fa7591bda7b5ce33a725847fa5e82a03..5cda61e3d6545adf8647928e6649e4b2a28f119c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1208,6 +1208,9 @@ en:
   text_regexp_info: eg. ^[A-Z0-9]+$
   text_project_destroy_confirmation: Are you sure you want to delete this project and related data?
   text_subprojects_destroy_warning: "Its subproject(s): %{value} will be also deleted."
+  text_project_close_confirmation: Are you sure you want to close the '%{value}' project to make it read-only?
+  text_project_reopen_confirmation: Are you sure you want to reopen the '%{value}' project?
+  text_project_archive_confirmation: Are you sure you want to archive the '%{value}' project?
   text_workflow_edit: Select a role and a tracker to edit the workflow
   text_are_you_sure: Are you sure?
   text_journal_changed: "%{label} changed from %{old} to %{new}"