translate-rails3 0.1.1 → 0.1.2

data/README.md

@@ -43,6 +43,16 @@ Add to your Gemfile:
 
 Now visit /translate in your web browser to start translating.
 
+Configuration
+-------------
+
+(Optional) You can configure from_locales and to_locales explicitly through your environments/development.rb by adding
+
+	config.from_locales = [:en]
+	config.to_locales = [:ja, :es, :fr]
+
+Where [:en] and [:ja, :es, :fr] could be replaced by locale list of your choice.
+
 Dependencies
 ------------
 
@@ -56,6 +66,7 @@ Authors
 - Joakim Westerlund (web design)
 - Milan Novota (initial Rails 3 support)
 - Roman Shterenzon (Rails 3 cleanup and gem packaging)
+- Ichiro Yamamoto
 
 Many thanks to http://newsdesk.se for sponsoring the development of this plugin.
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/controllers/translate_controller.rb

@@ -19,7 +19,8 @@ class TranslateController < ActionController::Base
   end
   
   def translate
-    I18n.backend.store_translations(@to_locale, Translate::Keys.to_deep_hash(params[:key]))
+		processed_parameters = process_array_parameters(params[:key])
+    I18n.backend.store_translations(@to_locale, Translate::Keys.to_deep_hash(processed_parameters))
     Translate::Storage.new(@to_locale).write_to_file
     Translate::Log.new(@from_locale, @to_locale, params[:key].keys).write_to_file
     force_init_translations # Force reload from YAML file
@@ -39,8 +40,8 @@ class TranslateController < ActionController::Base
     @keys.reject! do |key|
       from_text = lookup(@from_locale, key)
       # When translating from one language to another, make sure there is a text to translate from.
-      # Always exclude non string translation objects as we don't support editing them in the UI.
-      (@from_locale != @to_locale && !from_text.present?) || (from_text.present? && !from_text.is_a?(String))      
+      # The only supported formats are String and Array. We don't support other formats
+      (@from_locale != @to_locale && !from_text.present?) || (from_text.present? && !from_text.is_a?(String) && !from_text.is_a?(Array))      
     end
   end
 
@@ -162,4 +163,17 @@ class TranslateController < ActionController::Base
   def log_hash
     @log_hash ||= Translate::Log.new(@from_locale, @to_locale, {}).read
   end
+
+	def process_array_parameters(parameter)
+		reconstructed_hash = Hash.new
+
+		parameter.each do |key, value|
+			if value.is_a?(String)
+				reconstructed_hash[key] = value
+			elsif value.is_a?(Hash)
+				reconstructed_hash[key] = Translate::Keys.arraylize(value)
+			end
+		end
+		reconstructed_hash
+	end
 end

data/app/helpers/translate_helper.rb

@@ -1,4 +1,35 @@
 module TranslateHelper
+
+	def render_translate_form(from_locale, to_locale, key)
+		from_text = lookup(from_locale, key)
+		if from_text.is_a?(String)
+			render :partial => 'string_form', :locals => 
+				{:from_locale => from_locale,
+					:to_locale => to_locale,
+					:key => key}
+		elsif from_text.is_a?(Array)
+			render :partial => 'array_form', :locals => 
+				{:from_locale => from_locale,
+					:to_locale => to_locale,
+					:key => key}
+		end
+	end
+
+	def from_locales
+		# Attempt to get the list of locale from configuration
+		from_loc = Rails.application.config.from_locales if Rails.application.config.respond_to?(:from_locales)
+		return I18n.available_locales if from_loc.blank?
+		raise StandardError, "from_locale expected to be an array" if from_loc.class != Array
+		from_loc
+	end
+
+	def to_locales
+		to_loc = Rails.application.config.to_locales if Rails.application.config.respond_to?(:to_locales)
+		return I18n.available_locales if to_loc.blank?
+		raise StandardError, "to_locales expected to be an array" if to_loc.class != Array
+		to_loc
+	end
+
   def simple_filter(labels, param_name = 'filter', selected_value = nil)
     selected_value ||= params[param_name]
     filter = []

data/app/views/translate/_array_form.html.erb

@@ -0,0 +1,42 @@
+<%
+	from_text = lookup(from_locale, key)
+	to_text = lookup(to_locale, key)
+	field_name = "key[#{key}]"
+%>
+
+<div class="translation">
+<% if from_text.present? %>
+	<p class="translation-text">
+		<ol>
+			<% from_text.each_with_index do |from_text_section, index| %>
+				<%
+					from_text_section = from_text_section.to_s
+					line_size = 100
+					n_lines = n_lines(from_text_section, line_size)
+					# this is needed so the controller doesn't freak out when there is no translations found
+					# for this element yet...
+					to_text = Array.new if to_text.blank?
+				%>
+				<li><%= from_text_section %></li>
+				<p class="edit-form">
+				<% if n_lines > 1 %>
+					<%= text_area_tag("#{field_name}[#{index}]", to_text[index], :size => "#{line_size}x#{n_lines}", :id => "#{key}[#{index}]") %>
+				<% else %>
+					<%= text_field_tag("#{field_name}[#{index}]", to_text[index], :size => line_size, :id => "#{key}[#{index}]") %>
+				<% end %>
+				<%= link_to_function 'Auto Translate', "getGoogleTranslation('#{key}[#{index}]', \"#{escape_javascript(from_text_section)}\", '#{@from_locale}', '#{@to_locale}')", :style => 'padding: 0; margin: 0;' %>
+				</p>
+			<% end %>
+		</ol>
+	</p>
+<% end %>
+<p>
+	<em>
+		<br/>
+		<strong>Key:</strong><%=h key %><br/>
+		<% if @files[key] %>
+			<strong>File:</strong><%= @files[key].join("<br/>") %>
+			<% end %>
+	</em>
+</p>
+</div>  

data/app/views/translate/_pagination.html.erb

@@ -21,4 +21,4 @@
 	  <% end %>
 	</ul>
 </div>
-<% end %>
+<% end %>

data/app/views/translate/_string_form.html.erb

@@ -0,0 +1,32 @@
+<%
+	from_text = lookup(from_locale, key)
+	to_text = lookup(to_locale, key)
+	line_size = 100
+	n_lines = n_lines(from_text, line_size)
+	field_name = "key[#{key}]"
+%>
+
+<div class="translation">    
+<% if from_text.present? %>
+	<p class="translation-text">
+		<%= simple_format(h(from_text)) %>
+	</p>
+<% end %>
+<p class="edit-form">
+<% if n_lines > 1 %>
+	<%= text_area_tag(field_name, to_text, :size => "#{line_size}x#{n_lines}", :id => key) %>
+<% else %>
+	<%= text_field_tag(field_name, to_text, :size => line_size, :id => key) %>
+<% end %>
+</p>
+<p>
+	<em>
+		<%= link_to_function 'Auto Translate', "getGoogleTranslation('#{key}', \"#{escape_javascript(from_text)}\", '#{@from_locale}', '#{@to_locale}')", :style => 'padding: 0; margin: 0;' %>
+		<br/>
+		<strong>Key:</strong><%=h key %><br/>
+		<% if @files[key] %>
+			<strong>File:</strong><%= @files[key].join("<br/>") %>
+			<% end %>
+	</em>
+</p>
+</div>  

data/app/views/translate/index.html.erb

@@ -20,8 +20,8 @@
      <%= hidden_field_tag(:filter, params[:filter]) %>
      <%= hidden_field_tag(:sort_by, params[:sort_by]) %>
      <label>Translate from</label>
-     <%= select_tag(:from_locale, options_for_select(I18n.available_locales, @from_locale.to_sym)) %> <span>to</span>
-     <%= select_tag(:to_locale, options_for_select(I18n.available_locales, @to_locale.to_sym)) %>
+     <%= select_tag(:from_locale, options_for_select(from_locales, @from_locale.to_sym)) %> <span>to</span>
+     <%= select_tag(:to_locale, options_for_select(to_locales, @to_locale.to_sym)) %>
      <%= submit_tag "Display" %>
    </p>
   </div>
@@ -70,38 +70,13 @@
     <p class="translate">
 	    <%= submit_tag "Save Translations" %>
 	  </p>
-	  <% @paginated_keys.each do |key| 
-	      from_text = lookup(@from_locale, key)
-	      to_text = lookup(@to_locale, key)
-	      line_size = 100
-	      n_lines = n_lines(from_text, line_size)
-	      field_name = "key[#{key}]"
-    %>
-	  <div class="translation">    
-		<% if from_text.present? %>
-		  <p class="translation-text">
-				<%= simple_format(h(from_text)) %>
-			</p>
+	  <% @paginated_keys.each do |key| %>
+			<%= 
+				# this is a helper method, we need to determine if the thing we are trying to translate is
+				# a string or an array, and it would be very messey if i put everything in this view
+				render_translate_form(@from_locale, @to_locale, key)
+			%>
 		<% end %>
-		<p class="edit-form">
-		<% if n_lines > 1 %>
-			<%= text_area_tag(field_name, to_text, :size => "#{line_size}x#{n_lines}", :id => key) %>
-		<% else %>
-			<%= text_field_tag(field_name, to_text, :size => line_size, :id => key) %>
-		<% end %>
-		</p>
-		<p>
-		  <em>
-			  <%= link_to_function 'Auto Translate', "getGoogleTranslation('#{key}', \"#{escape_javascript(from_text)}\", '#{@from_locale}', '#{@to_locale}')", :style => 'padding: 0; margin: 0;' %>
-			  <br/>
-			  <strong>Key:</strong><%=h key %><br/>
-			  <% if @files[key] %>
-				  <strong>File:</strong><%= @files[key].join("<br/>") %>
-			    <% end %>
-			</em>
-		</p>
-	</div>  
-<% end %>
   <p class="translate">
     <%= submit_tag "Save Translations" %>
 	</p>

data/lib/translate/keys.rb

@@ -5,17 +5,17 @@ class Translate::Keys
   def self.files
     @@files ||= Translate::Keys.new.files
   end
-  
+
   # Allows flushing of the files cache
   def self.files=(files)
     @@files = files
   end
-  
+
   def files
     @files ||= extract_files
-  end  
+  end
   alias_method :to_hash, :files
-  
+
   def keys
     files.keys
   end
@@ -44,7 +44,7 @@ class Translate::Keys
   end
 
   def self.translated_locales
-    I18n.available_locales.reject { |locale| [:root, I18n.default_locale.to_sym].include?(locale) }        
+    I18n.available_locales.reject { |locale| [:root, I18n.default_locale.to_sym].include?(locale) }
   end
 
   # Checks if a nested hash contains the keys in dot separated I18n key.
@@ -71,9 +71,9 @@ class Translate::Keys
       memo.is_a?(Hash) ? memo.try(:[], key) : nil
     end.nil?
   end
-  
+
   # Convert something like:
-  # 
+  #
   # {
   #  :pressrelease => {
   #    :label => {
@@ -81,9 +81,9 @@ class Translate::Keys
   #    }
   #   }
   # }
-  # 
+  #
   # to:
-  # 
+  #
   #  {'pressrelease.label.one' => "Pressmeddelande"}
   #
   def self.to_shallow_hash(hash)
@@ -98,13 +98,13 @@ class Translate::Keys
       shallow_hash
     end
   end
-  
+
   # Convert something like:
-  # 
+  #
   #  {'pressrelease.label.one' => "Pressmeddelande"}
-  # 
+  #
   # to:
-  # 
+  #
   # {
   #  :pressrelease => {
   #    :label => {
@@ -112,7 +112,7 @@ class Translate::Keys
   #    }
   #   }
   # }
-  def self.to_deep_hash(hash)    
+  def self.to_deep_hash(hash)
     hash.inject({}) do |deep_hash, (key, value)|
       keys = key.to_s.split('.').reverse
       leaf_key = keys.shift
@@ -128,11 +128,44 @@ class Translate::Keys
     hash1.merge!(hash2, &merger)
   end
 
+	# Convert something like:
+	#
+	# {'0' => "elem 1", '1' => "elem 2"}
+	#
+	# to:
+	#
+	# ["elem 1", "elem 2"]
+	#
+	def self.arraylize(input_hash)
+		input_hash.inject([]) do |constructed_array, (key, value)|
+			constructed_array << value
+			constructed_array
+		end
+	end
+
   private
 
   def extract_files
     files_to_scan.inject(HashWithIndifferentAccess.new) do |files, file|
-      IO.read(file).scan(i18n_lookup_pattern).flatten.map(&:to_sym).each do |key|
+      keys = IO.read(file)
+      if keys.respond_to? "encode"
+        keys = keys.encode("UTF-8").force_encoding("UTF-8")
+      end
+      error_count = 0
+      begin
+        encoded_keys = keys.scan(i18n_lookup_pattern)
+      rescue => e
+        unless error_count > 1
+          if keys.respond_to? 'encode!'
+            keys.encode!('utf-8', 'utf-8', :invalid => :replace)
+          end
+          error_count += 1
+          retry
+        else
+          puts "cannot fix: #{e} on : #{file}"
+        end
+      end
+      encoded_keys.flatten.map(&:to_sym).each do |key|
         files[key] ||= []
         path = Pathname.new(File.expand_path(file)).relative_path_from(Pathname.new(Rails.root)).to_s
         files[key] << path if !files[key].include?(path)

data/translate-rails3.gemspec

@@ -4,22 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{translate-rails3}
-  s.version = "0.1.1"
+  s.name = "translate-rails3"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Marklund", "Milan Novota", "Roman Shterenzon"]
-  s.date = %q{2011-05-09}
-  s.description = %q{This plugin provides a web interface for translating Rails I18n texts
-(requires Rails 3.0 or higher) from one locale to another.
-The plugin has been tested only with the simple I18n backend that ships
-with Rails.
-I18n texts are read from and written to YAML files under config/locales.
-
-This gem is a fork of the original https://github.com/mynewsdesk/translate
-and also includes work from this fork: https://github.com/milann/translate
-}
-  s.email = %q{romanbsd@yahoo.com}
+  s.date = "2011-11-23"
+  s.description = "This plugin provides a web interface for translating Rails I18n texts\n(requires Rails 3.0 or higher) from one locale to another.\nThe plugin has been tested only with the simple I18n backend that ships\nwith Rails.\nI18n texts are read from and written to YAML files under config/locales.\n\nThis gem is a fork of the original https://github.com/mynewsdesk/translate\nand also includes work from this fork: https://github.com/milann/translate\n"
+  s.email = "romanbsd@yahoo.com"
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -31,7 +23,9 @@ and also includes work from this fork: https://github.com/milann/translate
     "app/controllers/translate_controller.rb",
     "app/helpers/translate_helper.rb",
     "app/views/layouts/translate.html.erb",
+    "app/views/translate/_array_form.html.erb",
     "app/views/translate/_pagination.html.erb",
+    "app/views/translate/_string_form.html.erb",
     "app/views/translate/index.html.erb",
     "config/routes.rb",
     "init.rb",
@@ -56,13 +50,12 @@ and also includes work from this fork: https://github.com/milann/translate
     "spec/storage_spec.rb",
     "translate-rails3.gemspec"
   ]
-  s.homepage = %q{https://github.com/romanbsd/translate}
+  s.homepage = "https://github.com/romanbsd/translate"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Newsdesk translate plugin for Rails 3}
+  s.rubygems_version = "1.8.11"
+  s.summary = "Newsdesk translate plugin for Rails 3"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: translate-rails3
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - Peter Marklund
@@ -16,8 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 +03:00
-default_executable: 
+date: 2011-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ya2yaml
@@ -27,9 +22,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 30
         version: "0.30"
   type: :runtime
   version_requirements: *id001
@@ -58,7 +50,9 @@ files:
 - app/controllers/translate_controller.rb
 - app/helpers/translate_helper.rb
 - app/views/layouts/translate.html.erb
+- app/views/translate/_array_form.html.erb
 - app/views/translate/_pagination.html.erb
+- app/views/translate/_string_form.html.erb
 - app/views/translate/index.html.erb
 - config/routes.rb
 - init.rb
@@ -82,7 +76,6 @@ files:
 - spec/spec_helper.rb
 - spec/storage_spec.rb
 - translate-rails3.gemspec
-has_rdoc: true
 homepage: https://github.com/romanbsd/translate
 licenses: []
 
@@ -96,21 +89,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Newsdesk translate plugin for Rails 3