* 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

app/views/dmsf_detail/_upload_file_locked.html.erb

@@ -1,32 +1,51 @@
-<div class="box dmsf_upload">
+<div class="box dmsf_detail">
 	<%= hidden_field_tag("commited_files[#{i}][disk_filename]", upload.disk_filename) %>
 	<%= hidden_field_tag("commited_files[#{i}][name]", upload.name) %>
-	<fieldset class="tabular">
-		<legend><%= h(upload.name) %></legend>
-		<p class="warning">File locked!</p>
-	    <div class="splitcontentleft">
+	<p class="warning"><%= l(:info_file_locked) %></p>
+	
+	<div class="clear">
+		<div class="splitcontentleft">
 			<p>
-				<%= label_tag("", "Title:") %>
+				<%= label_tag("", l(:label_title) + ":") %>
 				<%= h(upload.title) %>
 			</p>
-			<p>
-				<%= label_tag("", "Description:") %>
-				<%= h(upload.description) %>
-			</p>
-			<p>
-				<%= label_tag("", "Version:") %>
-				<%= upload.major_version %>.<%= upload.minor_version %>
-			</p>
 		</div>
 		<div class="splitcontentright">
 			<p>
-				<%= label_tag("", "Mime:") %>
-				<%= h(upload.mime_type) %>
-			</p>
-			<p>
-				<%= label_tag("", "Size:") %>
-				<%= number_to_human_size(upload.size) %>
+				<%= label_tag("", l(:label_filename) + ":") %>
+				<%= h(upload.name) %>
 			</p>
 		</div>
-    </fieldset>
+	</div>
+	<p class="no-ident">
+		<%= label_tag("", l(:label_description) + ":") %>
+	</p>
+	<div class="wiki data clear">
+		<%= textilizable(upload.description) %>
+	</div>
+	<div class="splitcontentleft">
+		<p>
+			<%= label_tag("", l(:label_version) + ":") %>
+			<%= upload.major_version %>.<%= upload.minor_version %>
+		</p>
+		<p>
+			<%= 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 %>
+		</p>
+	</div>
+	<div class="splitcontentright clear">
+		<p>
+			<%= label_tag("", l(:label_mime) + ":") %>
+			<%= h(upload.mime_type) %>
+		</p>
+		<p>
+			<%= label_tag("", l(:label_size) + ":") %>
+			<%= number_to_human_size(upload.size) %>
+		</p>
+	</div>
+	<br style="clear: both"/>
 </div>

app/views/dmsf_detail/upload_files.html.erb

@@ -1,4 +1,4 @@
-<% html_title("DMSF") %>
+<% html_title(l(:dmsf)) %>
 
 <div class="contextual">
 </div>
@@ -12,7 +12,7 @@
 <%= textilizable(@folder.description) unless @folder.nil? %>
 </div>
 
-<h3>Uploaded Files</h3>
+<h3><%=l(:heading_uploaded_files)%></h3>
 <%
 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 %>

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"
   

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"
   

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"
   

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"
   

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"
   

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"
   

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"
   

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"