Localization plugin removed (replaced with GLoc)

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

5 files changed, 27 insertions, 30 deletions

diff --git a/redmine/app/views/roles/_form.rhtml b/redmine/app/views/roles/_form.rhtml
index cc30e82b0..b007d1e34 100644
--- a/redmine/app/views/roles/_form.rhtml
+++ b/redmine/app/views/roles/_form.rhtml
@@ -2,22 +2,22 @@
 
 <div class="box">
 <!--[form:role]-->

-<p><label for="role_name"><%=_('Name')%> <span class="required">*</span></label><br />
+<p><label for="role_name"><%=l(:field_name)%> <span class="required">*</span></label><br />
 <%= text_field 'role', 'name' %></p>

 

-<strong><%=_('Permissions')%></strong>

+<strong><%=l(:label_permissions)%>:</strong>

 <% permissions = @permissions.group_by {|p| p.group_id } %>

-<% permissions.keys.sort.each do |group_id| %>

-<fieldset><legend><%= _(Permission::GROUPS[group_id]) %></legend>

+<% permissions.keys.sort.each do |group_id| %>
+<fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>

 <% permissions[group_id].each do |p| %>

-  <div style="width:200px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>

-  <%= _(p.description) %>

+  <div style="width:170px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>

+  <%= l(p.description.to_sym) %>

   </div>

 <% end %>

 </fieldset>

 <% end %>

 <br />

-<a href="javascript:checkAll('role_form', true)"><%=_('Check all')%></a> |

-<a href="javascript:checkAll('role_form', false)"><%=_('Uncheck all')%></a><br />

+<a href="javascript:checkAll('role_form', true)"><%=l(:button_check_all)%></a> |

+<a href="javascript:checkAll('role_form', false)"><%=l(:button_uncheck_all)%></a><br />

 <!--[eoform:role]-->
 </div>
diff --git a/redmine/app/views/roles/edit.rhtml b/redmine/app/views/roles/edit.rhtml
index cffbe0119..0bc352506 100644
--- a/redmine/app/views/roles/edit.rhtml
+++ b/redmine/app/views/roles/edit.rhtml
@@ -1,10 +1,8 @@
-<h2><%=_('Role')%></h2> 
+<h2><%=l(:label_role)%></h2> 
 
 <%= start_form_tag ({ :action => 'edit', :id => @role }, :id => 'role_form') %>
 <%= render :partial => 'form' %>

-

-<br />

-<%= submit_tag _('Save') %>
+<%= submit_tag l(:button_save) %>
 <%= end_form_tag %>

 
 

diff --git a/redmine/app/views/roles/list.rhtml b/redmine/app/views/roles/list.rhtml
index eb1a9ecc2..ae92a8071 100644
--- a/redmine/app/views/roles/list.rhtml
+++ b/redmine/app/views/roles/list.rhtml
@@ -1,8 +1,8 @@
-<h2><%=_('Roles')%></h2>
+<h2><%=l(:label_role_plural)%></h2>
 
 <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
   <tr class="ListHead">
-    <th><%=_('Role')%></th>
+    <th><%=l(:label_role)%></th>
 	<th></th>
   </tr>
   
@@ -11,7 +11,7 @@
   <td><%= link_to role.name, :action => 'edit', :id => role %></td>
   <td align="center">

     <%= start_form_tag :action => 'destroy', :id => role %>

-    <%= submit_tag _('Delete'), :class => "button-small" %>

+    <%= submit_tag l(:button_delete), :class => "button-small" %>

     <%= end_form_tag %>
   </tr>
 <% end %>
@@ -20,4 +20,4 @@
 <%= pagination_links_full @role_pages %>
 <br />
 
-<%= link_to '&#187; ' + _('New role'), :action => 'new' %>
+<%= link_to '&#187; ' + l(:label_role_new), :action => 'new' %>
diff --git a/redmine/app/views/roles/new.rhtml b/redmine/app/views/roles/new.rhtml
index c82fb2144..11d2d9209 100644
--- a/redmine/app/views/roles/new.rhtml
+++ b/redmine/app/views/roles/new.rhtml
@@ -1,8 +1,7 @@
-<h2><%=_('New role')%></h2> 
+<h2><%=l(:label_role_new)%></h2> 
 

 <%= start_form_tag ({ :action => 'new' }, :id => 'role_form') %>
-<%= render :partial => 'form' %>

-
-<br /><%= submit_tag _('Create') %>
+<%= render :partial => 'form' %>
+<%= submit_tag l(:button_create) %>
 <%= end_form_tag %>
 
diff --git a/redmine/app/views/roles/workflow.rhtml b/redmine/app/views/roles/workflow.rhtml
index 652f6a0f1..3c2d46051 100644
--- a/redmine/app/views/roles/workflow.rhtml
+++ b/redmine/app/views/roles/workflow.rhtml
@@ -1,22 +1,22 @@
-<h2><%=_('Workflow setup')%></h2>

+<h2><%=l(:label_workflow)%></h2>

 

-<p><%=_('Select a workflow to edit')%>:</p>

+<p><%=l(:text_workflow_edit)%>:</p>

 

 <%= start_form_tag ({:action => 'workflow'}, :method => 'get') %>

 <div style="float:left;margin-right:10px;">

-<p><label for="role_id"><%=_('Role')%></label><br/>

+<p><label for="role_id"><%=l(:label_role)%></label><br/>

 <select id="role_id" name="role_id">

   <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>

 </select></p>

 </div>

 

 <div>

-<p><label for="tracker_id"><%=_('Tracker')%></label><br/>

+<p><label for="tracker_id"><%=l(:label_tracker)%></label><br/>

 <select id="tracker_id" name="tracker_id">

   <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>

 </select>

 

-<%= submit_tag _('Edit') %>

+<%= submit_tag l(:button_edit) %>

 </p>

 </div>

 <%= end_form_tag %>

@@ -28,8 +28,8 @@
   <%= form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) %>

 	<table>

 	<tr>

-	<td align="center"><strong><%=_('Issue status')%></strong></td>

-	<td align="center" colspan="<%= @statuses.length %>"><strong><%=_('New statuses allowed')%></strong></td>

+	<td align="center"><strong><%=l(:label_current_status)%></strong></td>

+	<td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td>

 	</tr>

 	<tr>

 	<td></td>

@@ -59,11 +59,11 @@
 	</table>

 <br />

 <p>

-<a href="javascript:checkAll('workflow_form', true)"><%=_('Check all')%></a> |

-<a href="javascript:checkAll('workflow_form', false)"><%=_('Uncheck all')%></a>

+<a href="javascript:checkAll('workflow_form', true)"><%=l(:button_check_all)%></a> |

+<a href="javascript:checkAll('workflow_form', false)"><%=l(:button_uncheck_all)%></a>

 </p>

 <br />

-<%= submit_tag _('Save') %>
+<%= submit_tag l(:button_save) %>
 <%= end_form_tag %>

 

 <% end %>