@@ -22,6 +22,7 @@ In addition to the web UI this plugin adds the following rake tasks: translate:lost_in_translation translate:merge_keys translate:google +translate:changed The lost_in_translation task shows you any I18n keys in your code that are do not have translations in the YAML file for your default locale, i.e. config/locales/sv.yml. @@ -29,6 +30,8 @@ The merge_keys task is supposed to be used in conjunction with Sven Fuch's Rails The google task is used for auto translating from one locale to another using Google Translate. +The changed rake task can show you between one YAML file to another which keys have had their texts changed. + Installation ========= Obtain the source with: README @@ -28,6 +28,33 @@ class Translate::Keys # Convert something like: # + # { + # :pressrelease => { + # :label => { + # :one => "Pressmeddelande" + # } + # } + # } + # + # to: + # + # {'pressrelease.label.one' => "Pressmeddelande"} + # + def self.to_shallow_hash(hash) + hash.inject({}) do |shallow_hash, (key, value)| + if value.is_a?(Hash) + to_shallow_hash(value).each do |sub_key, sub_value| + shallow_hash[[key, sub_key].join(".")] = sub_value + end + else + shallow_hash[key.to_s] = value + end + shallow_hash + end + end + + # Convert something like: + # # {'pressrelease.label.one' => "Pressmeddelande"} # # to: @@ -41,7 +68,7 @@ class Translate::Keys # } def self.to_deep_hash(hash) hash.inject({}) do |deep_hash, (key, value)| - keys = key.split('.').reverse + keys = key.to_s.split('.').reverse leaf_key = keys.shift key_hash = keys.inject({leaf_key.to_sym => value}) { |hash, key| {key.to_sym => hash} } deep_merge!(deep_hash, key_hash) lib/translate/keys.rb @@ -53,21 +53,13 @@ describe Translate::Keys do describe "to_deep_hash" do it "convert shallow hash with dot separated keys to deep hash" do - Translate::Keys.to_deep_hash({ - 'pressrelease.label.one' => "Pressmeddelande", - 'pressrelease.label.other' => "Pressmeddelanden", - 'article' => "Artikel", - 'category' => '' - }).should == { - :pressrelease => { - :label => { - :one => "Pressmeddelande", - :other => "Pressmeddelanden" - } - }, - :article => "Artikel", - :category => '' - } + Translate::Keys.to_deep_hash(shallow_hash).should == deep_hash + end + end + + describe "to_shallow_hash" do + it "converts a deep hash to a shallow one" do + Translate::Keys.to_shallow_hash(deep_hash).should == shallow_hash end end @@ -77,6 +69,28 @@ describe Translate::Keys do # ########################################################################## + def shallow_hash + { + 'pressrelease.label.one' => "Pressmeddelande", + 'pressrelease.label.other' => "Pressmeddelanden", + 'article' => "Artikel", + 'category' => '' + } + end + + def deep_hash + { + :pressrelease => { + :label => { + :one => "Pressmeddelande", + :other => "Pressmeddelanden" + } + }, + :article => "Artikel", + :category => '' + } + end + def i18n_files_dir File.join(File.dirname(__FILE__), "files", "translate") end spec/keys_spec.rb @@ -139,4 +139,22 @@ namespace :translate do puts "\nTime elapsed: #{(((Time.now - start_at) / 60) * 10).to_i / 10.to_f} minutes" Translate::Storage.new(ENV['TO'].to_sym).write_to_file end + + desc "List keys that have changed I18n texts between YAML file ENV['FROM_FILE'] and YAML file ENV['TO_FILE']. Set ENV['VERBOSE'] to see changes" + task :changed => :environment do + from_hash = Translate::Keys.to_shallow_hash(Translate::File.new(ENV['FROM_FILE']).read) + to_hash = Translate::Keys.to_shallow_hash(Translate::File.new(ENV['TO_FILE']).read) + from_hash.each do |key, from_value| + if (to_value = to_hash[key]) && to_value != from_value + key_without_locale = key[/^[^.]+\.(.+)$/, 1] + if ENV['VERBOSE'] + puts "KEY: #{key_without_locale}" + puts "FROM VALUE: '#{from_value}'" + puts "TO VALUE: '#{to_value}'" + else + puts key_without_locale + end + end + end + end end tasks/translate.rake e01c84ba7cb5a801ad99363b8abf3f9bc341bbea Peter Marklund peter_marklund@fastmail.fm http://github.com/newsdesk/translate/commit/1f8ebd683b5bfb0fe3f21ece8d754e58f5401ef4 1f8ebd683b5bfb0fe3f21ece8d754e58f5401ef4 2009-08-29T03:41:21-07:00 2009-08-29T03:41:21-07:00 Added rake task translate:changed that can show you from one YAML file to another which keys have had their texts changed 806ae78491def41c889354282dcc78d25548b2e3 Peter Marklund peter_marklund@fastmail.fm