summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-15 14:19:01 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-15 14:19:01 +0000
commitb636695631a244549d9004637bdffac4a5228130 (patch)
tree2d6614efbe0d6dbd9a5a7eebb8cbe61f28402d59
parent004a13b75ca11bef88327213eaf84082f234334c (diff)
downloadredmine-b636695631a244549d9004637bdffac4a5228130.tar.gz
redmine-b636695631a244549d9004637bdffac4a5228130.zip
Removed hard-coded strings (#703, #3521).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9979 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/workflows_helper.rb2
-rw-r--r--app/views/workflows/permissions.html.erb4
-rw-r--r--config/locales/en.yml4
-rw-r--r--config/locales/fr.yml4
4 files changed, 11 insertions, 3 deletions
diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index 3dd514042..a9bc5ac81 100644
--- 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 73cf91656..3f9ea2181 100644
--- 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 ef4466c52..a38171392 100644
--- 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 7a68b72c0..f8f0aa0a3 100644
--- 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