From b3e77ba6d6b256f6ad1f1f5b9b618910706b9719 Mon Sep 17 00:00:00 2001 From: "vit.jonas@gmail.com" Date: Thu, 19 May 2011 07:35:41 +0000 Subject: [PATCH] * finished Issue 9: Localization * improved UI for locked files upload commit git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@53 5e329b0b-a2ee-ea63-e329-299493fc886d --- .../dmsf_detail/_upload_file_locked.html.erb | 61 ++++++++++++------- app/views/dmsf_detail/upload_files.html.erb | 6 +- config/locales/cs.yml | 2 + config/locales/de.yml | 2 + config/locales/en-GB.yml | 2 + config/locales/en.yml | 3 +- config/locales/es.yml | 2 + config/locales/fr.yml | 2 + config/locales/ja.yml | 2 + config/locales/ru.yml | 2 + 10 files changed, 59 insertions(+), 25 deletions(-) diff --git a/app/views/dmsf_detail/_upload_file_locked.html.erb b/app/views/dmsf_detail/_upload_file_locked.html.erb index fd1e818d..b536ad54 100644 --- a/app/views/dmsf_detail/_upload_file_locked.html.erb +++ b/app/views/dmsf_detail/_upload_file_locked.html.erb @@ -1,32 +1,51 @@ -
+
<%= hidden_field_tag("commited_files[#{i}][disk_filename]", upload.disk_filename) %> <%= hidden_field_tag("commited_files[#{i}][name]", upload.name) %> -
- <%= h(upload.name) %> -

File locked!

-
+

<%= l(:info_file_locked) %>

+ +
+

- <%= label_tag("", "Title:") %> + <%= label_tag("", l(:label_title) + ":") %> <%= h(upload.title) %>

-

- <%= label_tag("", "Description:") %> - <%= h(upload.description) %> -

-

- <%= label_tag("", "Version:") %> - <%= upload.major_version %>.<%= upload.minor_version %> -

- <%= label_tag("", "Mime:") %> - <%= h(upload.mime_type) %> -

-

- <%= label_tag("", "Size:") %> - <%= number_to_human_size(upload.size) %> + <%= label_tag("", l(:label_filename) + ":") %> + <%= h(upload.name) %>

-
+
+

+ <%= label_tag("", l(:label_description) + ":") %> +

+
+ <%= textilizable(upload.description) %> +
+
+

+ <%= label_tag("", l(:label_version) + ":") %> + <%= upload.major_version %>.<%= upload.minor_version %> +

+

+ <%= label_tag("", l(:label_workflow) + ":") %> + <%= case upload.workflow + when 1 then l(:option_workflow_waiting_for_approval) + when 2 then l(:option_workflow_approved) + else l(:option_workflow_none) + end %> +

+
+
+

+ <%= label_tag("", l(:label_mime) + ":") %> + <%= h(upload.mime_type) %> +

+

+ <%= label_tag("", l(:label_size) + ":") %> + <%= number_to_human_size(upload.size) %> +

+
+
diff --git a/app/views/dmsf_detail/upload_files.html.erb b/app/views/dmsf_detail/upload_files.html.erb index ecf834b9..78056cb2 100644 --- a/app/views/dmsf_detail/upload_files.html.erb +++ b/app/views/dmsf_detail/upload_files.html.erb @@ -1,4 +1,4 @@ -<% html_title("DMSF") %> +<% html_title(l(:dmsf)) %>
@@ -12,7 +12,7 @@ <%= textilizable(@folder.description) unless @folder.nil? %> -

Uploaded Files

+

<%=l(:heading_uploaded_files)%>

<% i = 1 form_tag({:action => "commit_files", :id => @project, :folder_id => @folder}, @@ -26,7 +26,7 @@ form_tag({:action => "commit_files", :id => @project, :folder_id => @folder}, <% end %> <% i += 1 %> <% end %> - <%= submit_tag("Commit") %> + <%= submit_tag(l(:submit_commit)) %> <% end %> <% content_for :header_tags do %> diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 75c1f9b0..97dd7f4d 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -126,4 +126,6 @@ cs: :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)." :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed." :label_default_notifications: "File default notifications" + :heading_uploaded_files: "Uploaded Files" + :submit_commit: "Commit" \ No newline at end of file diff --git a/config/locales/de.yml b/config/locales/de.yml index cb46fc20..af33c6dc 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -121,4 +121,6 @@ de: :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)." :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed." :label_default_notifications: "File default notifications" + :heading_uploaded_files: "Uploaded Files" + :submit_commit: "Commit" \ No newline at end of file diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 871cc920..68a81a85 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -121,4 +121,6 @@ en-GB: :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)." :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed." :label_default_notifications: "File default notifications" + :heading_uploaded_files: "Uploaded Files" + :submit_commit: "Commit" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index df7ad7dc..a8009482 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -124,6 +124,7 @@ en: :note_stem_some: "Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'." :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)." :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed." - :label_default_notifications: "File default notifications" + :heading_uploaded_files: "Uploaded Files" + :submit_commit: "Commit" \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 0bb07430..5a292ca8 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -123,4 +123,6 @@ es: :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)." :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed." :label_default_notifications: "File default notifications" + :heading_uploaded_files: "Uploaded Files" + :submit_commit: "Commit" \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 4295a144..d6ddc454 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -121,4 +121,6 @@ fr: :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)." :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed." :label_default_notifications: "File default notifications" + :heading_uploaded_files: "Uploaded Files" + :submit_commit: "Commit" \ No newline at end of file diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 490f79a5..a8009482 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -125,4 +125,6 @@ en: :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)." :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed." :label_default_notifications: "File default notifications" + :heading_uploaded_files: "Uploaded Files" + :submit_commit: "Commit" \ No newline at end of file diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f4ea9e99..c34462bf 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -121,4 +121,6 @@ ru: :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)." :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed." :label_default_notifications: "File default notifications" + :heading_uploaded_files: "Uploaded Files" + :submit_commit: "Commit" \ No newline at end of file