From f7b589199d18c0c2b77a2332b37d6cd6effc5187 Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Thu, 7 Jul 2011 08:43:40 +0000 Subject: [PATCH] * included info for folders git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@196 5e329b0b-a2ee-ea63-e329-299493fc886d --- app/views/dmsf/show.html.erb | 10 +++++----- config/locales/cs.yml | 1 + config/locales/de.yml | 4 +++- config/locales/en-GB.yml | 1 + config/locales/en-IS.yml | 1 + config/locales/en.yml | 2 ++ config/locales/es.yml | 1 + config/locales/fr.yml | 1 + config/locales/ja.yml | 4 ++++ config/locales/ru.yml | 1 + 10 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb index 417d3111..32ff80e0 100644 --- a/app/views/dmsf/show.html.erb +++ b/app/views/dmsf/show.html.erb @@ -61,10 +61,10 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder :class => "icon icon-folder") %>
[<%= subfolder.deep_file_count %>]
- <%= number_to_human_size(subfolder.deep_size) %> - + <%= number_to_human_size(subfolder.deep_size) %> + <%= subfolder.updated_at.strftime("%Y-%m-%d %H:%M") %> - + <%= h(subfolder.user) %> <% if User.current.allowed_to?(:file_approval, @project) %>
@@ -124,7 +124,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder <% end %> - <%= file.last_revision.version unless file.last_revision.nil? %> + <%= file.last_revision.version %> <% case file.last_revision.workflow when 1 then %><%= image_tag("waitingforapproval.png", :title => l(:title_waiting_for_approval), :plugin => "redmine_dmsf") %> @@ -132,7 +132,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder :plugin => "redmine_dmsf") %> <% end %> - <%= h(file.last_revision.user) unless file.last_revision.nil? %> + <%= h(file.last_revision.user) %> <% if User.current.allowed_to?(:file_approval, @project) %>
diff --git a/config/locales/cs.yml b/config/locales/cs.yml index afa6998b..33befdba 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -166,4 +166,5 @@ cs: # Not translated :label_dmsf_updated: "DMSF updated" + :title_total_size_of_all_files: "Total size of all files under this folder" \ No newline at end of file diff --git a/config/locales/de.yml b/config/locales/de.yml index 6811ae5c..78dfd98d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -163,4 +163,6 @@ de: :heading_access_downloads_emails: "Herunterladene/Emails" :heading_access_first: "Erste" :heading_access_last: "Letzte" - + +#Not translated + :title_total_size_of_all_files: "Total size of all files under this folder" diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2add14b8..3df7d226 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -160,4 +160,5 @@ en-GB: :heading_access_first: "First" :heading_access_last: "Last" :label_dmsf_updated: "DMSF updated" + :title_total_size_of_all_files: "Total size of all files under this folder" \ No newline at end of file diff --git a/config/locales/en-IS.yml b/config/locales/en-IS.yml index 2add14b8..3df7d226 100644 --- a/config/locales/en-IS.yml +++ b/config/locales/en-IS.yml @@ -160,4 +160,5 @@ en-GB: :heading_access_first: "First" :heading_access_last: "Last" :label_dmsf_updated: "DMSF updated" + :title_total_size_of_all_files: "Total size of all files under this folder" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index a0b8fa36..0a36ac02 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -164,4 +164,6 @@ en: :heading_access_first: "First" :heading_access_last: "Last" :label_dmsf_updated: "DMSF updated" + + :title_total_size_of_all_files: "Total size of all files under this folder" \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index e955af50..f4d13a27 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -162,4 +162,5 @@ es: :heading_access_first: "First" :heading_access_last: "Last" :label_dmsf_updated: "DMSF updated" + :title_total_size_of_all_files: "Total size of all files under this folder" \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1d3b2790..619d844d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -160,4 +160,5 @@ fr: :heading_access_first: "First" :heading_access_last: "Last" :label_dmsf_updated: "DMSF updated" + :title_total_size_of_all_files: "Total size of all files under this folder" \ No newline at end of file diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 00716701..eda97ab6 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -163,3 +163,7 @@ ja: :heading_access_downloads_emails: "ダウンロード/電子メール" :heading_access_first: "初回アクセス" :heading_access_last: "最終アクセス" + +#Not translated + :title_total_size_of_all_files: "Total size of all files under this folder" + \ No newline at end of file diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 6ca3284c..a2570d6c 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -160,4 +160,5 @@ ru: :heading_access_first: "First" :heading_access_last: "Last" :label_dmsf_updated: "DMSF updated" + :title_total_size_of_all_files: "Total size of all files under this folder" \ No newline at end of file