refinerycms-i18n 0.9.9 → 0.9.9.1

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9'
+version = '0.9.9.1'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir.glob("**/*").flatten.reject do |file|
   file =~ /\.gem(spec)?$/

data/lib/refinery/i18n.rb

@@ -61,7 +61,7 @@ module Refinery
 
         Refinery::Plugin.register do |plugin|
           plugin.name = "refinery_i18n"
-          plugin.version = %q{0.9.9}
+          plugin.version = %q{0.9.9.1}
           plugin.hide_from_menu = true
           plugin.always_allow_access = true
         end

data/lib/tasks/translate.rake

@@ -40,9 +40,8 @@ namespace :translate do
     locale_hash = {}
 
     puts "Searching for missing translations for the locale: #{locale}"
-    default_locale_files = Dir.glob(Rails.root.join('vendor', 'plugins', '*', 'config', 'locales', "#{locale}.yml").to_s)
-    default_locale_files += Dir.glob(Refinery.root.join('vendor', 'plugins', '*', 'config', 'locales', "#{locale}.yml").to_s)
-    default_locale_files += Dir.glob(Refinery.root.join('vendor', 'refinerycms', '*', 'config', 'locales', "#{locale}.yml").to_s)
+    default_locale_files = Dir.glob(Rails.root.join('vendor', 'engines', '*', 'config', 'locales', "#{locale}.yml").to_s)
+    default_locale_files += Dir.glob(Refinery.root.join('*', 'config', 'locales', "#{locale}.yml").to_s)
     default_locale_files += Dir.glob(File.join(Translate.locales_dir, "**","#{locale}.yml").to_s)
 
     default_locale_files.uniq.each do |locale_file_name|
@@ -53,26 +52,29 @@ namespace :translate do
     lookup_pattern = /\b(?:I18n\.t|I18n\.translate|t)(?:\s|\():?'([a-z0-9_]*.[a-z0-9_.]+)'\)?/
     templates = Dir.glob(Rails.root.join('app', '**', '*.{erb,rb}').to_s)
     templates += Dir.glob(Rails.root.join.join('vendor', 'plugins', '**', 'app', '**', '*.{erb,rb}').to_s)
-    templates += Dir.glob(Refinery.root.join('vendor', 'plugins', '**', 'app', '**', '*.{erb,rb}').to_s)
-    templates += Dir.glob(Refinery.root.join('vendor', 'refinerycms', '**', 'app', '**', '*.{erb,rb}').to_s)
+    templates += Dir.glob(Refinery.root.join('*', 'app', '**', '*.{erb,rb}').to_s)
 
     templates.reject{|t| t =~ /\/lib\/generators\/.+?\/templates\//}.uniq.each do |file_name|
       File.open(file_name, "r+").each do |line|
         line.scan(lookup_pattern) do |key_string|
-          # qualify the namespace if beginning with . like t('.log_out')
+          # qualify the namespace if beginning with . like t('.log_out') or has :scope => 'something.else'
+          namespace = []
           if key_string.first =~ /^\./
             namespace = file_name.split("app/").last.split(/^.+?\//).last.split('/')
-            namespace = namespace | [namespace.pop.gsub(/^\_/, '').split('.').first]
-            key_string = ["#{namespace.join('.')}#{key_string.first}"]
+            namespace |= [namespace.pop.gsub(/^\_/, '').split('.').first]
+          elsif (scope_matches = line.scan(/:scope\ +?=>\ +?["|']([^\'\"]+)["|']/)).any?
+            namespace = scope_matches.map { |scope| scope.first.split('.') }.flatten | ['']
           end
+          key_string = "#{namespace.join('.')}#{key_string.first}"
 
-          unless key_exist?(key_string.first.split("."), locale_hash)
+          # don't duplicate, don't use strings with string interpolation
+          unless key_string =~ /\#\{.+?\}/ or key_exist?(key_string.split("."), locale_hash)
             result << "#{key_string} in \t  #{file_name} \t is not in any #{locale} locale file"
           end
         end
-      end unless file_name =~ /translate\/spec/
+      end if file_name !~ /translate\/spec/
     end
-    puts result.empty? ? "No missing translations for locale: #{locale}" : "#{result.join("\n\n")}\n\nNumber of missing translations for #{locale}: #{result.length}"
+    puts result.empty? ? "No missing translations for locale: #{locale}" : "#{result.join("\n")}\n\nNumber of missing translations for #{locale}: #{result.length}"
   end
 
   desc "Show I18n keys that are missing in the specified locale YAML file. Defaults to I18n.default_locale, unless LOCALE env is specified"

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 9
-  version: 0.9.9
+  - 1
+  version: 0.9.9.1
 platform: ruby
 authors: 
 - Resolve Digital
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +13:00
+date: 2011-01-18 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency