traduction 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 629c318e186d7c51213c2de944b13a54e6787b41
-  data.tar.gz: a78f2a7d171e7fadf460de5827ad5acd209b7248
+  metadata.gz: 7896ef7c18bc6753af115c08c21d08853872306f
+  data.tar.gz: 16a30f34948b80f751b9f99fd270fef7fbe1c0ac
 SHA512:
-  metadata.gz: f9f2649e1057e6c6b223c4f7ecb166751b97f6d884f5b791aea3f29e34e9e7df529026d42f2beef46fc8aedd135c60e6e525e80f33bc4f6b3019ac3f71ae563f
-  data.tar.gz: 3d6f0427004ef38cb1b99e658df588be2d61e9c42e0133f19320b0994286b1017c8fd6c27ad596dad818f77c9354a0d5cc3c4d9b9bee0d56ffe87a4b5c76ff86
+  metadata.gz: 84101da38daa7cf6f464d9358e114ba1d53c6a5f0565e63082d2c13dca4ae23c5df365ed6b09e832c5e2f30a5307f85d5444d0cd05d4df823f199aab8c846411
+  data.tar.gz: a52079aaff217cd3e19432757122c76cb8bee75e39618b1912f682621019a92a9466e91c895f6ade2189030a3be8e5d3247129b510b426b8fce65a0fa53d896e

data/README.md

@@ -24,14 +24,19 @@ Using Rake tasks, you may list :
   - obsolete changes in a specific locale, compared to default locale
   - untranslated changes in a specific locale, still compared to default locale
   - added keys since an old git commit
+  - all keys including modifications from a file (the file you might get back from translators)
+
+Format used for import/output is CSV having ';' as field separator and '"' as text quote char.
 
 Rake tasks are prefixed by 'traduction' namespace :
 
 ```
 $ rake -T | grep 'traduction'
-rake traduction:added[locale,revision]  # Show added keys for locale LOCALE since git revision
-rake traduction:obsolete[locale]        # Show obsolete keys for locale LOCALE
-rake traduction:untranslated[locale]    # Show untranslated keys for locale LOCALE
+rake traduction:added[locale,revision]   # Show added keys for locale LOCALE since git revision
+rake traduction:all[locale]              # Show all keys for locale LOCALE
+rake traduction:import[locale,filename]  # List keys from csv file returned by translators
+rake traduction:obsolete[locale]         # Show obsolete keys for locale LOCALE
+rake traduction:untranslated[locale]     # Show untranslated keys for locale LOCALE
 ```
 
 If you do not specify locale, Traduction will use `I18n.default_locale`.

data/lib/tasks/traduction.rake

@@ -8,6 +8,22 @@ end
 
 namespace :traduction do
 
+  desc "Show all keys for locale LOCALE"
+  task :all, [:locale] do |t, args|
+    args.with_defaults(:locale => 'es')
+    locale_to_check = args.locale
+    default_locale = Traduction::I18n.load_default_locale
+
+    puts Traduction::I18n.diff_all(
+                 from: [default_locale[:key], File.open(default_locale[:file])],
+                 to: [locale_to_check, File.open(Traduction::I18n.locale_file(locale_to_check))],
+                 prefix: locale_to_check,
+                 header: ['All keys', 'original value', 'translated value'],
+                 dont_ignore_values: true
+                 )
+  end
+  task :all => :environment
+
   desc "Show untranslated keys for locale LOCALE"
   task :untranslated, [:locale] do |t, args|
     args.with_defaults(:locale => 'es')

data/lib/traduction/hash_methods.rb

@@ -20,6 +20,25 @@ module Traduction
       ret
     end
 
+    def merge_hash(hash, options = {})
+      ret = {}
+      skip_remaining_hash = options[:skip_remaining_hash] || false
+
+      remaining_hash = hash
+      self.each do |k,v|
+        ret[k] = [v, hash[k]]
+        remaining_hash.delete(k) unless skip_remaining_hash
+      end
+
+      unless skip_remaining_hash
+        remaining_hash.each do |k,v|
+          ret[k] = [self[k], v]
+        end
+      end
+
+      ret
+    end
+
     def diff_more(other_hash, options = {})
       ignore_values = options[:ignore_values] || false
 

data/lib/traduction/i18n.rb

@@ -3,23 +3,39 @@ require 'yaml'
 module Traduction
   module I18n
     module I18nMethods
-      def diff_locales(options = {})
+      def diff_method(options = {}, &block)
         from_prefix, from_content = options[:from].to_a
         to_prefix, to_content = options[:to].to_a
-        prefix = options[:prefix]
         header = options[:header]
         format = options[:format] || :csv
+        flatten = options[:flatten] || false
 
         from = YAML::load(from_content)[from_prefix]
         to = YAML::load(to_content)[to_prefix]
 
-        data = diff_yaml(from, to, prefix: prefix)
+        data = yield from, to
+
+        generate_csv(data, header: header, flatten: flatten)
+      end
 
-        generate_csv(data, header: header)
+      def diff_all(options = {})
+        diff_method(options.merge(flatten: true)) do |from, to|
+          from.flatten_keys.merge_hash(to.flatten_keys)
+        end
+      end
+
+      def diff_locales(options = {})
+        prefix = options[:prefix]
+        dont_ignore_values = options[:dont_ignore_values] || false
+
+        diff_method(options) do |from, to|
+          diff_yaml(from, to, prefix: prefix, dont_ignore_values: dont_ignore_values)
+        end
       end
 
       def generate_csv(data, options = {})
         header = options[:header] || nil
+        flatten = options[:flatten] || false
 
         CSV.generate(Traduction::CSV_FORMAT) do |csv|
           unless header.nil?
@@ -30,7 +46,8 @@ module Traduction
               csv << header
             end
           end
-          data.each { |m| csv << m } if data.present?
+#binding.pry
+          data.each { |m| csv << (flatten ? m.flatten : m) } if data.present?
         end
       end
 
@@ -48,9 +65,10 @@ module Traduction
 
       def diff_yaml(from, to, options = {}, &block)
         prefix = options[:prefix] || nil
+        ignore_values = !(options[:dont_ignore_values] || false)
         data = []
 
-        from.diff_more(to, :ignore_values => true).flatten_keys(prefix).each do |k,v|
+        from.diff_more(to, :ignore_values => ignore_values).flatten_keys(prefix).each do |k,v|
           data << [k,v]
         end
 
@@ -61,13 +79,3 @@ module Traduction
     extend I18nMethods
   end
 end
-#
-# 
-#text: (CSV.generate do |csv|
-# 63           csv << @header
-# 64           @ragreements.each do |o|
-# 65             csv << o.values.map { |l| l.is_a?(Array) ? l.join("\n") : l }
-# 66           end
-# 67         end)
-#
-#

data/lib/traduction/version.rb

@@ -1,3 +1,3 @@
 module Traduction
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traduction
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Thomas Kienlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Help maintaining Rails translation files