Merge pull request #1369 from salmanmp/translate-settings-column-names

Translate settings column names

app/views/settings/_dmsf_columns.html.erb

@@ -26,14 +26,19 @@
   <% columns.concat(extra_columns) if defined?(extra_columns) %>
   <% index = columns.index(l(:field_project)) %>
   <%# Move Project to the second position %>
-  <% if index %>
+    <% if index %>
     <% columns.insert(0, columns.delete_at(index)) %>
   <% end %>
   <% cfs = DmsfFileRevisionCustomField.visible.order(:position) %>
-  <% columns.concat(cfs.map{ |c| c.name }) %>
   <% selected_columns = DmsfFolder::DEFAULT_COLUMNS if selected_columns.blank? %>
   <% columns.each_with_index do |column, i| %>
     <%= check_box_tag 'settings[dmsf_columns][]', column, selected_columns.include?(column), id: "dmsf_column_#{i}" %>
+    <%= l("label_column_#{column}").capitalize %>
+    <br/>
+  <% end %>
+  <% columns = cfs.map{ |c| c.name }
+     columns.each_with_index do |column, i| %>
+    <%= check_box_tag 'settings[dmsf_columns][]', column, selected_columns.include?(column), id: "dmsf_column_#{i}" %>
     <%= h column.capitalize %>
     <br/>
   <% end %>

config/locales/en.yml

@@ -447,6 +447,14 @@ en:
     application to take it any effect.
   note_dmsf_office_bin_not_available: "LibreOffice's command line binary '%{value}' not available"
 
+  label_column_id: ID
+  label_column_title: Title
+  label_column_size: Size
+  label_column_modified: Modified
+  label_column_version: Version
+  label_column_workflow: Workflow
+  label_column_author: Author
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents