i18n-tasks 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c0488a6ce907e9327da7ed07ffea723e8f8010f
-  data.tar.gz: 8f5042c6c785f81d5c75bc953fcd7d2cce496870
+  metadata.gz: cc1e95e2717382abb299d60e4b207b2b0152bc66
+  data.tar.gz: 4bf82fe58f91e8513f7f8b37aa2ebb4cee2c8d87
 SHA512:
-  metadata.gz: 9297eb48c4d50a91e4825b2a3867360f0296f780bfecb7fd9e6ae39b98501ca916557f3ab12501be96ab45eccfbad46628d315b297edf761887d6c9471a98579
-  data.tar.gz: 6eebe2d12de95e7e8563409007dd2df906768e7860047370d3e5cd9952b6382ac8abcb3096b14e404431c9477c5a54793e4a2068df956346d57536c4338008f2
+  metadata.gz: 0b37c93c586cdd40a0222d91d8b0d92c93f8a21ce3738a54f4c90f4d22c36e63f7782e8e3107dbe395c1e0277f9a4e957470bf89f6000f6b1cef9e22a9da2d04
+  data.tar.gz: 1a92543a5ace12423673f658bd9b951d520abe22209325feafd9eafced5fc349a6810d3a69d5ca04dbcddb0dd53b0a5a5cccfb1da1a915cb7943eccb983803ce

data/CHANGES.md

@@ -1,3 +1,8 @@
+## v0.1.3
+
+* detect countable keys as used for unused task
+* account for non-string keys coming from yaml (thanks @lichtamberg)
+
 ## v0.1.2
 
 * added grep config options (thanks @dmke)

data/README.md

@@ -7,9 +7,9 @@ Rails I18n tasks to find missing / unused translations and more. Works with slim
 
 Use `rake -T i18n` to get the list of tasks with descriptions. There are 3 tasks available at the moment:
 
-* `i18n:missing` task shows all the keys that have not been translated yet *([source](./blob/master/lib/i18n/tasks/missing.rb))*
-* `i18n:prefill` task normalizes locale files, and adds missing keys from base locale to others *([source](./blob/master/lib/i18n/tasks/prefill.rb))*
-* `i18n:unused` task shows potentially unused translations *([source](./blob/master/lib/i18n/tasks/unused.rb))*
+* `i18n:missing` task shows all the keys that have not been translated yet *([source](/lib/i18n/tasks/missing.rb))*
+* `i18n:prefill` task normalizes locale files, and adds missing keys from base locale to others *([source](/lib/i18n/tasks/prefill.rb))*
+* `i18n:unused` task shows potentially unused translations *([source](/lib/i18n/tasks/unused.rb))*
 
 The `i18n:unused` task will detect pattern translations and not report them, e.g.:
 
@@ -18,9 +18,9 @@ t 'category.' + category.key # 'category.arts_and_crafts' considered used
 t "category.#{category.key}" # also works
 ```
 
-Relative keys (`t '.title'`) are supported too.
+Relative keys (`t '.title'`) are supported. Plural keys (key.one/many/other/etc) are supported.
 
-For more examples see [the tests](./blob/master/spec/i18n_tasks_spec.rb#L43-L59).
+For more examples see [the tests](/spec/i18n_tasks_spec.rb).
 
 
 ## Installation

data/lib/i18n/tasks/base_task.rb

@@ -100,6 +100,22 @@ module I18n
         "#{prefix}#{key}"
       end
 
+      PLURAL_KEY_RE = /\.(?:zero|one|two|few|many|other)$/
+
+      # @param key [String] i18n key
+      # @param data [Hash{String => String,Hash}] locale data
+      # @return the base form if the key is a specific plural form (e.g. apple for apple.many), and the key as passed otherwise
+      def depluralize_key(key, data)
+        return key if key !~ PLURAL_KEY_RE || t(data, key).is_a?(Hash)
+        parent_key      = key.split('.')[0..-2] * '.'
+        plural_versions = t(data, parent_key)
+        if plural_versions.is_a?(Hash) && plural_versions.all? { |k, v| ".#{k}" =~ PLURAL_KEY_RE && !v.is_a?(Hash) }
+          parent_key
+        else
+          key
+        end
+      end
+
 
       # @return [String] default i18n locale
       def base_locale

data/lib/i18n/tasks/output/terminal.rb

@@ -15,7 +15,7 @@ module I18n
         def unused(unused)
           $stderr.puts bold cyan("Unused i18n keys (#{unused.length})")
           key_col_width = unused.max_by { |x| x[0].length }[0].length + 2
-          unused.each { |(key, value)| puts "#{magenta key.ljust(key_col_width)}#{cyan value.strip}" }
+          unused.each { |(key, value)| puts "#{magenta key.ljust(key_col_width)}#{cyan value.to_s.strip}" }
         end
 
         private
@@ -28,7 +28,7 @@ module I18n
         }
 
         def print_missing_translation(m, opts)
-          locale, key, base_value, status_text = m[:locale], m[:key], m[:base_value].try(:strip), " #{STATUS_TEXTS[m[:type]]}"
+          locale, key, base_value, status_text = m[:locale], m[:key], m[:base_value].to_s.try(:strip), " #{STATUS_TEXTS[m[:type]]}"
 
           key = magenta key.ljust(opts[:key_col_width])
           s   = if m[:type] == :none

data/lib/i18n/tasks/unused.rb

@@ -6,12 +6,15 @@ module I18n
     class Unused < BaseTask
       # @return [Array<[String, String]>] all the unused translations as an array of [key, value] pairs
       def find_keys
-        r = []
-        traverse base_locale_data do |key, value|
-          r << [key, value] unless used_key?(key) || pattern_key?(key) || ignore_key?(key, :unused)
+        r    = []
+        data = base_locale_data
+        traverse data do |key, value|
+          next if pattern_key?(key) || ignore_key?(key, :unused)
+          key = depluralize_key(key, data)
+          r << [key, value] unless used_key?(key)
         end
-        r
+        r.uniq
       end
     end
   end
-end
+end

data/lib/i18n/tasks/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Tasks
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/spec/fixtures/app/views/index.html.slim

@@ -7,3 +7,5 @@ p = t 'ignore.a'
 p = t 'ignored_pattern.some_key'
 p = t 'ignore_eq_base_all.a'
 p = t 'ignore_eq_base_es.a'
+p = t 'numeric.a'
+p = t 'plural.a', count: 2

data/spec/i18n_tasks_spec.rb

@@ -13,8 +13,8 @@ describe 'rake i18n' do
   describe 'unused' do
     it 'detects unused' do
       TestCodebase.capture_stderr do
-        TestCodebase.rake_result('i18n:unused').should be_i18n_keys %w(unused.a)
-      end.should =~ /Unused i18n keys \(1\)/
+        TestCodebase.rake_result('i18n:unused').should be_i18n_keys %w(unused.a unused.numeric unused.plural)
+      end.should =~ /Unused i18n keys \(3\)/
     end
   end
 
@@ -30,19 +30,22 @@ describe 'rake i18n' do
   BENCH_KEYS = 30
   before do
     gen_data = ->(v) {
+      v_num = v.chars.map(&:ord).join('').to_i
       {
         'ca'                  => {'a' => v, 'b' => v, 'c' => v, 'd' => v, 'e' => "#{v}%{i}", 'f' => "#{v}%{i}"},
         'cb'                  => {'a' => v, 'b' => "#{v}%{i}"},
         'hash_pattern'        => {'a' => v},
         'hash_pattern2'       => {'a' => v},
-        'unused'              => {'a' => v},
+        'unused'              => {'a' => v, 'numeric' => v_num, 'plural' => {'one' => v, 'other' => v}},
         'ignore_unused'       => {'a' => v},
         'missing_in_es'       => {'a' => v},
         'same_in_es'          => {'a' => v},
         'ignore_eq_base_all'  => {'a' => v},
         'ignore_eq_base_es'   => {'a' => v},
         'blank_in_es'         => {'a' => v},
-        'relative'            => {'index' => {'title' => v}}
+        'relative'            => {'index' => {'title' => v}},
+        'numeric'             => {'a' => v_num},
+        'plural'              => {'a' => {'one' => v, 'other' => "%{count} #{v}s"}}
       }.tap { |r|
         gen = r["bench"] = {}
         BENCH_KEYS.times { |i| gen["key#{i}"] = v }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - glebm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails