UserSetting view now use new translation styles

app/views/projects/settings/_activities.html.erb

@@ -2,12 +2,12 @@
 
 <table class="list">
   <thead><tr>
-    <th><%= l(:field_name) %></th>
+    <th><%= Enumeration.human_attribute_name(:name) %></th>
     <th><%= l(:enumeration_system_activity) %></th>
     <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
-	<th><%= h value.name %></th>
+      <th><%= h value.name %></th>
     <% end %>
-    <th style="width:15%;"><%= l(:field_active) %></th>
+    <th style="width:15%;"><%= Enumeration.human_attribute_name(:active) %></th>
   </tr></thead>
 
   <% @project.activities(true).each do |enumeration| %>
@@ -19,9 +19,9 @@
     </td>
     <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td>
     <% enumeration.custom_field_values.each do |value| %>
-	<td align="center">
-      <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
-    </td>
+      <td align="center">
+        <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
+      </td>
     <% end %>
     <td align="center" style="width:15%;">
       <%= label_tag "enumerations_#{enumeration.id}_active", l(:description_active), :class => "hidden-for-sighted" %>
@@ -34,8 +34,8 @@
 
 <div class="contextual">
 <%= link_to(l(:button_reset), project_enumerations_path(@project),
-						:method => :delete,
-						:confirm => l(:text_are_you_sure),
+            :method => :delete,
+            :confirm => l(:text_are_you_sure),
             :class => 'icon icon-del') %>
 </div>
 

app/views/projects/settings/_boards.html.erb

@@ -1,8 +1,8 @@
 <% if @project.boards.any? %>
 <table class="list">
 	<thead><tr>
-		<th><%= l(:label_board) %></th>
-		<th><%= l(:field_description) %></th>
+		<th><%= Board.model_name.human %></th>
+		<th><%= Board.human_attribute_name(:description) %></th>
 		<th></th>
 		<th></th>
 	</tr></thead>

app/views/projects/settings/_issue_categories.html.erb

@@ -1,8 +1,8 @@
 <% if @project.issue_categories.any? %>
 <table class="list">
 	<thead><tr>
-	<th><%= l(:label_issue_category) %></th>
-	<th><%= l(:field_assigned_to) %></th>
+	<th><%= IssueCategory.model_name.human %></th>
+	<th><%= IssueCategory.human_attribute_name(:assigned_to) %></th>
 	<th></th>
 	</tr></thead>
 	<tbody>

app/views/projects/settings/_members.html.erb

@@ -19,7 +19,7 @@
   <% authorized = authorize_for('members', 'edit') %>
 <table class="list members">
 	<thead><tr>
-	  <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
+	  <th><%= User.model_name.human %> / <%= Group.model_name.human %></th>
 	  <th><%= l(:label_role_plural) %></th>
 	  <th style="width:15%"></th>
           <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>

app/views/projects/settings/_versions.html.erb

@@ -1,13 +1,13 @@
 <% if @project.shared_versions.any? %>
 <table class="list versions">
 	<thead><tr>
-    <th><%= l(:label_version) %></th>
-    <th><%= l(:field_start_date) %></th>
-    <th><%= l(:field_effective_date) %></th>
-    <th><%= l(:field_description) %></th>
-    <th><%= l(:field_status) %></th>
-    <th><%= l(:field_sharing) %></th>
-    <th><%= l(:label_wiki_page) %></th>
+    <th><%= Version.model_name.human %></th>
+    <th><%= Version.human_attribute_name(:start_date) %></th>
+    <th><%= Version.human_attribute_name(:effective_date) %></th>
+    <th><%= Version.human_attribute_name(:description) %></th>
+    <th><%= Version.human_attribute_name(:status) %></th>
+    <th><%= Version.human_attribute_name(:sharing) %></th>
+    <th><%= WikiPage.model_name.human %></th>
     <th style="width:15%"></th>
     </tr></thead>
 	<tbody>