Removed hard-coded strings (#703, #3521).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9979 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index 3dd5140428199f836bee167804fffe973d5a1d64..a9bc5ac81b067ec77cd2174d9bd4025a538a8b49 100644 (file)
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -21,7 +21,7 @@ module WorkflowsHelper
   def field_permission_tag(permissions, status, field)
     name = field.is_a?(CustomField) ? field.id.to_s : field
     select_tag("permissions[#{name}][#{status.id}]",
-      options_for_select([["", ""], ["Read-only", "readonly"], ["Required", "required"]], permissions[status.id][name])
+      options_for_select([["", ""], [l(:label_readonly), "readonly"], [l(:label_required), "required"]], permissions[status.id][name])
     )
   end
 end

diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb
index 73cf9165662602ce494c274bca916b986cea1262..3f9ea21815ca147f12c1655704b08319956800cb 100644 (file)
--- a/app/views/workflows/permissions.html.erb
+++ b/app/views/workflows/permissions.html.erb
@@ -4,8 +4,8 @@
 
 <div class="tabs">
   <ul>
-    <li><%= link_to 'Status transitions', {:action => 'edit', :role_id => @role, :tracker_id => @tracker} %></li>
-    <li><%= link_to 'Fields permissions', {:action => 'permissions', :role_id => @role, :tracker_id => @tracker}, :class => 'selected' %></li>
+    <li><%= link_to l(:label_status_transitions), {:action => 'edit', :role_id => @role, :tracker_id => @tracker} %></li>
+    <li><%= link_to l(:label_fields_permissions), {:action => 'permissions', :role_id => @role, :tracker_id => @tracker}, :class => 'selected' %></li>
   </ul>
 </div>
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ef4466c524070adb6771bf2c7b5c7893dc68f620..a381713923b7c9526dc856f15d0cfc6199828326 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -861,6 +861,10 @@ en:
   label_search_for_watchers: Search for watchers to add
   label_session_expiration: Session expiration
   label_show_closed_projects: View closed projects
+  label_status_transitions: Status transitions
+  label_fields_permissions: Fields permissions
+  label_readonly: Read-only
+  label_required: Required
 
   button_login: Login
   button_submit: Submit

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7a68b72c046ccdd2e8a75bb15a43411373c659f0..f8f0aa0a32d6a97d18c5a1de7943f724a1b10dce 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -836,6 +836,10 @@ fr:
   label_completed_versions: Versions passées
   label_session_expiration: Expiration des sessions
   label_show_closed_projects: Voir les projets fermés
+  label_status_transitions: Changements de statut
+  label_fields_permissions: Permissions sur les champs
+  label_readonly: Lecture
+  label_required: Obligatoire
 
   button_login: Connexion
   button_submit: Soumettre