* localized file details

git-svn-id: http://redmine-dmsf.googlecode.com/svn/trunk/redmine_dmsf@45 5e329b0b-a2ee-ea63-e329-299493fc886d

app/controllers/dmsf_detail_controller.rb

@@ -82,7 +82,6 @@ class DmsfDetailController < ApplicationController
 
   def file_detail
     @revision = @file.last_revision.clone
-    @revision.comment = ""
   end
 
   #TODO: separate control for approval

app/views/dmsf_detail/_file_new_revision.html.erb

@@ -1,5 +1,5 @@
-<div class="box dmsf_detail dmsf_revision">
+<div class="box dmsf_detail">
-	<strong>New Revision <a href="#" id="newRevisionFormContentToggle">[-]</a></strong>
+	<strong><%= l(:heading_new_revision) %> <a href="#" id="newRevisionFormContentToggle">[-]</a></strong>
 		<div id="newRevisionFormContent">
 			<% if @file.locked_for_user? %>
 				<p class="warning"><%= l(:info_file_locked) %></p>
@@ -24,47 +24,50 @@ form_for(:dmsf_file_revision, @revision, :url => {:action => "save_file", :id =>
 				<div class="clear">
 					<div class="splitcontentleft">
 						<p>
-							<%= label_tag("dmsf_file_revision_title", "Title:") %>
+							<%= label_tag("dmsf_file_revision_title", l(:label_title) + ":") %>
 							<%= f.text_field(:title, :size => "32") %>
 						</p>
 					</div>
 					<div class="splitcontentright">
 						<p>
-							<%= label_tag("", "Filename:") %>
+							<%= label_tag("", l(:label_filename) + ":") %>
 							<%= h(@revision.name) %>
 						</p>
 					</div>
 				</div>
 				<p class="no-ident">
-					<%= label_tag("dmsf_file_revision_description", "Description:") %>
+					<%= label_tag("dmsf_file_revision_description", l(:label_description) + ":") %>
 				</p>
 				<div class="wiki data clear">
 					<%= f.text_area(:description, :rows=> "6", :class => "wiki-edit") %>
 				</div>
 				<div class="splitcontentleft">
 					<p>
-						<%= label_tag("fileMinorVersionRadio", "Version:") %>
+						<%= label_tag("fileMinorVersionRadio", l(:label_version) + ":") %>
 					</p>
 					<div class="data clear">
 						<%= radio_button_tag("dmsf_file_revision[version]", "same", @revision.version == @file.last_revision.version, :id => "fileSameVersionRadio") %>
-						<%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version %> Same<br /> 
+						<%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version %> <%= l(:option_version_same) %><br /> 
 						<%= radio_button_tag("dmsf_file_revision[version]", "minor", 
 								@revision.major_version == @file.last_revision.major_version && @revision.minor_version != @file.last_revision.minor_version,
 								:id => "fileMinorVersionRadio") %> 
-						<%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version + 1 %> Minor<br />
+						<%= @file.last_revision.major_version %>.<%= @file.last_revision.minor_version + 1 %> <%= l(:option_version_minor) %><br />
 						<%= radio_button_tag("dmsf_file_revision[version]", "major", @revision.major_version != @file.last_revision.major_version) %> 
-						<%= @file.last_revision.major_version + 1 %>.0 Major<br />
+						<%= @file.last_revision.major_version + 1 %>.0 <%= l(:option_version_major) %><br />
 					</div>
 					<p>
-						<%= label_tag("dmsf_file_revision_workflow", "Workflow:") %>
+						<%= label_tag("dmsf_file_revision_workflow", l(:label_workflow) + ":") %>
 						<%= f.select(:workflow, 
-								options_for_select([["None", nil], ["Waiting for approval", 1], ["Approved", 2]], 
+								options_for_select([
+										[l(:option_workflow_none), nil], 
+										[l(:option_workflow_waiting_for_approval), 1],
+										[l(:option_workflow_approved), 2]], 
 									:selected => selected_workflow, :disabled => disabled_workflow)) %>
 					</p>
 				</div>
 				<div class="splitcontentright clear">
 					<p>
-						<%= label_tag("fileFileUpload", "New content:") %>
+						<%= label_tag("fileFileUpload", l(:label_new_content) + ":") %>
 						<div class="data">
 							<%= file_field_tag("dmsf_file_revision[file]", :size => 30, :id => "fileFileUpload") %>
 							<br />
@@ -76,13 +79,13 @@ form_for(:dmsf_file_revision, @revision, :url => {:action => "save_file", :id =>
 				</div>
 				<br style="clear: both"/>
 				<p>
-					<%= label_tag("dmsf_file_revision_comment", "Comment:") %>
+					<%= label_tag("dmsf_file_revision_comment", l(:label_comment) + ":") %>
 					<div class="data">
 						<%= f.text_area(:comment, :rows=> "2", :style => "width: 99%;") %>
 					</div>
 				</p>
 				<br />
-				<%= submit_tag("Create") %>
+				<%= submit_tag(l(:submit_create)) %>
 <% end %>
 			<% end %>
 		</div>

app/views/dmsf_detail/file_detail.html.erb

@@ -9,8 +9,8 @@
 / 
 <%= h(@file.last_revision.title) %> <div style="float: right"><%= h(@file.name) %></div>
 <% if @file.notification %>
-	<%= image_tag("notify.png", :plugin => "redmine_dmsf", :alt => "Not. act.",
+	<%= image_tag("notify.png", :plugin => "redmine_dmsf",
-		:title => "Notifications active") %>
+		:title => l(:title_notifications_active)) %>
 <% end %>
 </h2>
 
@@ -18,38 +18,38 @@
 	<%= render(:partial => 'file_new_revision') %>
 <% end %>
 
-<h3>Revisions</h3>
+<h3><%= l(:heading_revisions) %></h3>
 <% @file.revisions.each do |revision| %>
-<div class="box dmsf_detail dmsf_revision">
+<div class="box dmsf_detail">
 	<div style="float:right">
-		<%=  link_to("Download",
+		<%=  link_to(l(:title_download),
           {:controller=>"dmsf", :action => "download_revision", :id => @project, :revision_id => revision}) %>
 		<% if User.current.allowed_to?(:file_approval, @project) %>
-			| <%=  link_to("Delete",
+			| <%=  link_to(l(:title_delete),
 	          {:action => "delete_revision", :id => @project, :revision_id => revision},
-			  :class => "delete-link", :title => "Delete revision") %>
+			  :class => "delete-link", :title => l(:title_delete_revision)) %>
 		<% end %>
 	</div>
 		<p class="no-ident">
-			<%= label_tag("", revision.source_revision.nil? ? "Created:" : "Changed:") %>
+			<%= label_tag("", (revision.source_revision.nil? ? l(:label_created) : l(:label_changed))  + ":") %>
-			<%= revision.updated_at.strftime("%Y-%m-%d %H:%M:%S") %> by <%= h(revision.user) %>
+			<%= l(:info_changed_by_user, :changed => revision.updated_at.strftime("%Y-%m-%d %H:%M:%S"), :user => h(revision.user)) %>
 		</p>
 		<div class="clear">
 			<div class="splitcontentleft">
 				<p>
-					<%= label_tag("", "Title:") %>
+					<%= label_tag("", l(:label_title) + ":") %>
 					<%= h(revision.title) %>
 				</p>
 			</div>
 			<div class="splitcontentright">
 				<p>
-					<%= label_tag("", "Filename:") %>
+					<%= label_tag("", l(:label_filename) + ":") %>
 					<%= h(revision.name) %>
 				</p>
 			</div>
 		</div>
 		<p class="no-ident">
-			<%= label_tag("", "Description:") %>
+			<%= label_tag("", l(:label_description) + ":") %>
 		</p>
 		<div class="wiki clear" style="margin-left: 110px">
 			<%= textilizable(revision.description) %>
@@ -57,31 +57,31 @@
 		
 		<div class="splitcontentleft">
 			<p>
-				<%= label_tag("", "Version:") %>
+				<%= label_tag("", l(:label_version) + ":") %>
 				<%= revision.major_version %>.<%= revision.minor_version %>
 			</p>
 			<p>
-				<%= label_tag("", "Workflow:") %>
+				<%= label_tag("", l(:label_workflow) + ":") %>
 				<%= case revision.workflow
-						when 1 then "Waiting for approval"
+						when 1 then l(:option_workflow_waiting_for_approval)
-						when 2 then "Approved"
+						when 2 then l(:option_workflow_approved)
-						else "None" 
+						else l(:option_workflow_none) 
 					end %>
 			</p>
 		</div>
 		<div class="splitcontentright clear">
 			<p>
-				<%= label_tag("", "Mime:") %>
+				<%= label_tag("", l(:label_mime) + ":") %>
 				<%= h(revision.mime_type) %>&nbsp;
 			</p>
 			<p>
-				<%= label_tag("", "Size:") %>
+				<%= label_tag("", l(:label_size) + ":") %>
 				<%= number_to_human_size(revision.size) %>
 			</p>
 		</div>
 		<br style="clear: both"/>
 		<p class="no-ident clear">
-			<%= label_tag("", "Comment:") %>
+			<%= label_tag("", l(:label_comment) + ":") %>
 			<%= h(revision.comment) %>
 		</p>
 </div>

assets/stylesheets/dmsf.css

@@ -113,7 +113,7 @@ div.right_icon_box img.detail_icon {
 	margin-left: 110px;
 }
 
-.dmsf_revision label {
+.dmsf_detail label {
 	font-weight: bold;
 	width: 100px;
 	float: left;

config/locales/cs.yml

@@ -86,4 +86,25 @@ cs:
   :select_option_deactivated: "Deactivated"
   :select_option_activated: "Activated"
   :title_save_preferences: "Save preferences"
+
+  :heading_revisions: "Revisions"
+  :title_download: "Download"
+  :title_delete_revision: "Delete revision"
+  :label_created: "Created"
+  :label_changed: "Changed"
+  :info_changed_by_user: "%{changed} by %{user}"
+  :label_filename: "Filename"
+  :label_version: "Version"
+  :label_workflow: "Workflow"
+  :option_workflow_waiting_for_approval: "Waiting for approval"
+  :option_workflow_approved: "Approved"
+  :option_workflow_none: "None"
+  :label_mime: "Mime"
+  :label_size: "Size"
+  :label_comment: "Comment"
+  :heading_new_revision: "New Revision"
+  :option_version_same: "Same"
+  :option_version_minor: "Minor"
+  :option_version_major: "Major"
+  :label_new_content: "New content"
   

config/locales/de.yml

@@ -82,6 +82,25 @@ de:
   :select_option_deactivated: "Deactivated"
   :select_option_activated: "Activated"
   :title_save_preferences: "Save preferences"
-  
+  :heading_revisions: "Revisions"
+  :title_download: "Download"
+  :title_delete_revision: "Delete revision"
+  :label_created: "Created"
+  :label_changed: "Changed"
+  :info_changed_by_user: "%{changed} by %{user}"
+  :label_filename: "Filename"
+  :label_version: "Version"
+  :label_workflow: "Workflow"
+  :option_workflow_waiting_for_approval: "Waiting for approval"
+  :option_workflow_approved: "Approved"
+  :option_workflow_none: "None"
+  :label_mime: "Mime"
+  :label_size: "Size"
+  :label_comment: "Comment"
+  :heading_new_revision: "New Revision"
+  :option_version_same: "Same"
+  :option_version_minor: "Minor"
+  :option_version_major: "Major"
+  :label_new_content: "New content"
   
   

config/locales/en-GB.yml

@@ -82,5 +82,24 @@ en-GB:
   :select_option_deactivated: "Deactivated"
   :select_option_activated: "Activated"
   :title_save_preferences: "Save preferences"
-  
+  :heading_revisions: "Revisions"
+  :title_download: "Download"
+  :title_delete_revision: "Delete revision"
+  :label_created: "Created"
+  :label_changed: "Changed"
+  :info_changed_by_user: "%{changed} by %{user}"
+  :label_filename: "Filename"
+  :label_version: "Version"
+  :label_workflow: "Workflow"
+  :option_workflow_waiting_for_approval: "Waiting for approval"
+  :option_workflow_approved: "Approved"
+  :option_workflow_none: "None"
+  :label_mime: "Mime"
+  :label_size: "Size"
+  :label_comment: "Comment"
+  :heading_new_revision: "New Revision"
+  :option_version_same: "Same"
+  :option_version_minor: "Minor"
+  :option_version_major: "Major"
+  :label_new_content: "New content"
   

config/locales/en.yml

@@ -86,6 +86,24 @@ en:
   :select_option_deactivated: "Deactivated"
   :select_option_activated: "Activated"
   :title_save_preferences: "Save preferences"
-  
+  :heading_revisions: "Revisions"
-  
+  :title_download: "Download"
+  :title_delete_revision: "Delete revision"
+  :label_created: "Created"
+  :label_changed: "Changed"
+  :info_changed_by_user: "%{changed} by %{user}"
+  :label_filename: "Filename"
+  :label_version: "Version"
+  :label_workflow: "Workflow"
+  :option_workflow_waiting_for_approval: "Waiting for approval"
+  :option_workflow_approved: "Approved"
+  :option_workflow_none: "None"
+  :label_mime: "Mime"
+  :label_size: "Size"
+  :label_comment: "Comment"
+  :heading_new_revision: "New Revision"
+  :option_version_same: "Same"
+  :option_version_minor: "Minor"
+  :option_version_major: "Major"
+  :label_new_content: "New content"
   

config/locales/es.yml

@@ -82,4 +82,24 @@ es:
   :select_option_deactivated: "Deactivated"
   :select_option_activated: "Activated"
   :title_save_preferences: "Save preferences"
+  :heading_revisions: "Revisions"
+  :title_download: "Download"
+  :title_delete_revision: "Delete revision"
+  :label_created: "Created"
+  :label_changed: "Changed"
+  :info_changed_by_user: "%{changed} by %{user}"
+  :label_filename: "Filename"
+  :label_version: "Version"
+  :label_workflow: "Workflow"
+  :option_workflow_waiting_for_approval: "Waiting for approval"
+  :option_workflow_approved: "Approved"
+  :option_workflow_none: "None"
+  :label_mime: "Mime"
+  :label_size: "Size"
+  :label_comment: "Comment"
+  :heading_new_revision: "New Revision"
+  :option_version_same: "Same"
+  :option_version_minor: "Minor"
+  :option_version_major: "Major"
+  :label_new_content: "New content"
   

config/locales/fr.yml

@@ -82,4 +82,24 @@ fr:
   :select_option_deactivated: "Deactivated"
   :select_option_activated: "Activated"
   :title_save_preferences: "Save preferences"
+  :heading_revisions: "Revisions"
+  :title_download: "Download"
+  :title_delete_revision: "Delete revision"
+  :label_created: "Created"
+  :label_changed: "Changed"
+  :info_changed_by_user: "%{changed} by %{user}"
+  :label_filename: "Filename"
+  :label_version: "Version"
+  :label_workflow: "Workflow"
+  :option_workflow_waiting_for_approval: "Waiting for approval"
+  :option_workflow_approved: "Approved"
+  :option_workflow_none: "None"
+  :label_mime: "Mime"
+  :label_size: "Size"
+  :label_comment: "Comment"
+  :heading_new_revision: "New Revision"
+  :option_version_same: "Same"
+  :option_version_minor: "Minor"
+  :option_version_major: "Major"
+  :label_new_content: "New content"
   

config/locales/ja.yml

@@ -86,6 +86,25 @@ en:
   :select_option_deactivated: "Deactivated"
   :select_option_activated: "Activated"
   :title_save_preferences: "Save preferences"
-  
+  :heading_revisions: "Revisions"
+  :title_download: "Download"
+  :title_delete_revision: "Delete revision"
+  :label_created: "Created"
+  :label_changed: "Changed"
+  :info_changed_by_user: "%{changed} by %{user}"
+  :label_filename: "Filename"
+  :label_version: "Version"
+  :label_workflow: "Workflow"
+  :option_workflow_waiting_for_approval: "Waiting for approval"
+  :option_workflow_approved: "Approved"
+  :option_workflow_none: "None"
+  :label_mime: "Mime"
+  :label_size: "Size"
+  :label_comment: "Comment"
+  :heading_new_revision: "New Revision"
+  :option_version_same: "Same"
+  :option_version_minor: "Minor"
+  :option_version_major: "Major"
+  :label_new_content: "New content"
   
   

config/locales/ru.yml

@@ -82,5 +82,24 @@ ru:
   :select_option_deactivated: "Deactivated"
   :select_option_activated: "Activated"
   :title_save_preferences: "Save preferences"
-  
+  :heading_revisions: "Revisions"
+  :title_download: "Download"
+  :title_delete_revision: "Delete revision"
+  :label_created: "Created"
+  :label_changed: "Changed"
+  :info_changed_by_user: "%{changed} by %{user}"
+  :label_filename: "Filename"
+  :label_version: "Version"
+  :label_workflow: "Workflow"
+  :option_workflow_waiting_for_approval: "Waiting for approval"
+  :option_workflow_approved: "Approved"
+  :option_workflow_none: "None"
+  :label_mime: "Mime"
+  :label_size: "Size"
+  :label_comment: "Comment"
+  :heading_new_revision: "New Revision"
+  :option_version_same: "Same"
+  :option_version_minor: "Minor"
+  :option_version_major: "Major"
+  :label_new_content: "New content"