amatsuda-i18n_generators 0.5.0 → 0.6.0

data/History.txt

@@ -1,3 +1,16 @@
+== 0.6.0
+
+* bugfixes:
+  * Could not load cldr data with short locale names
+* major enhancements:
+  * Include AR association names in model attributes translation
+  * Add 'generated' comment mark (#g) for generated lines in YAML (thanks to t-wada-senpai, Shimura-san, Toyofuku-san, Sezutsu-san and oukayuka-san!)
+  * Add --include-timestamps option and change default bahaviour not to include timestamp columns in translation YAML
+  * Add blank line between each blocks (thanks to Sawayanagi-san!)
+* enhancements:
+  * Avoid generating blank locale file
+  * Change GitHub fetch URL from blob/master/...?raw=true to raw/master
+
 == 0.5.0
 
 * bugfixes:

data/generators/i18n/i18n_generator.rb

@@ -4,7 +4,7 @@ require 'rails_generator/commands'
 require 'gettext'
 
 class I18nGenerator < Rails::Generator::NamedBase
-  attr_reader :locale_name, :cldr, :translator, :generate_translation_only, :generate_locale_only
+  attr_reader :locale_name, :cldr, :translator, :generate_translation_only, :generate_locale_only, :include_timestamps
 
   def initialize(runtime_args, runtime_options = {})
     if options[:scaffold]
@@ -29,6 +29,7 @@ class I18nGenerator < Rails::Generator::NamedBase
       lang = @locale_name.sub(/-.*$/, '')
       @translator = Translator.new lang
     end
+    @include_timestamps = true if options[:include_timestamps]
   end
 
   def manifest
@@ -59,8 +60,9 @@ class I18nGenerator < Rails::Generator::NamedBase
     opt.separator 'Options:'
     opt.on('--translation',
            'Generate translations for all models with their attributes and all translation keys in the view files.') {|v| options[:generate_translation_only] = v}
-    opt.on('--locale',
-           'Generate locale files.') {|v| options[:generate_locale_only] = v}
+    opt.on('--locale', 'Generate locale files.') {|v| options[:generate_locale_only] = v}
+    opt.on('--include-timestamps', 'Include timestamp columns in the YAML translation.') {|v| options[:include_timestamps] = v}
+    opt.on('--include-timestamp', 'Include timestamp columns in the YAML translation.') {|v| options[:include_timestamps] = v}
   end
 
   private

data/generators/i18n/lib/yaml.rb

@@ -52,7 +52,7 @@ module I18nLocaleGeneratorModule
         else
           %Q["#{self.value}"]
         end
-        "#{' ' * self.indent_level}#{self.key}: #{v}"
+        "#{' ' * self.indent_level}#{self.key}: #{v}  #g"  # g is for 'generated'!
       else
         @text
       end
@@ -144,8 +144,11 @@ module I18nLocaleGeneratorModule
       @current_line
     end
 
-    def to_s
+    def to_s(add_blank_line = false)
+      previous_indent_level = 0
       @lines.inject('') do |ret, n|
+        ret << "\n" if add_blank_line && (n.indent_level < previous_indent_level) && !n.text.blank? && !ret.ends_with?("\n\n")
+        previous_indent_level = n.indent_level
         ret << n.text + "\n"
       end
     end

data/generators/i18n_locale/i18n_locale_command.rb

@@ -25,7 +25,7 @@ module I18nGenerator::Generator
 
       def fetch_from_rails_i18n_repository
         file('i18n:base.yml', "config/locales/#{locale_name}.yml") do |f|
-          OpenURI.open_uri("http://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/#{locale_name}.yml?raw=true").read
+          OpenURI.open_uri("http://github.com/svenfuchs/rails-i18n/raw/master/rails/locale/#{locale_name}.yml").read
         end
       end
 

data/generators/i18n_locale/lib/cldr.rb

@@ -98,9 +98,10 @@ module I18nLocaleGeneratorModule
 
     private
     def summaries
-      s = [load_cldr_data(@locale_name.tr('-', '_'))]
-      if @locale_name =~ /^[a-zA-Z]{2}[-_][a-zA-Z]{2}$/
-        s << load_cldr_data(@locale_name.to(1))
+      returning [load_cldr_data(@locale_name.tr('-', '_'))] do |s|
+        if @locale_name =~ /^[a-zA-Z]{2}[-_][a-zA-Z]{2}$/
+          s << load_cldr_data(@locale_name.to(1))
+        end
       end
     end
     memoize :summaries

data/generators/i18n_translation/i18n_translation_command.rb

@@ -24,7 +24,9 @@ module I18nGenerator::Generator
         translation_keys = []
         translation_keys += models.map {|m| "activerecord.models.#{m.english_name}"}
         models.each do |model|
-          translation_keys += model.content_columns.map {|c| "activerecord.attributes.#{model.english_name}.#{c.name}"}
+          cols = model.content_columns + model.reflect_on_all_associations
+          cols.delete_if {|c| %w[created_at updated_at].include? c.name} unless self.include_timestamps
+          translation_keys += cols.map {|c| "activerecord.attributes.#{model.english_name}.#{c.name}"}
         end
         logger.debug "#{models.size} models found."
 
@@ -39,13 +41,17 @@ module I18nGenerator::Generator
         (translation_keys += I18n.backend.keys).uniq!
         I18n.backend = original_backend
 
-        # translate all keys and generate the YAML file
-        now = Time.now
-        translations = translate_all(translation_keys)
-        logger.debug "took #{Time.now - now} secs to translate."
+        if translation_keys.blank?
+          logger.info "No translation keys found. Skipped generating translation_#{locale_name}.yml file."
+        else
+          # translate all keys and generate the YAML file
+          now = Time.now
+          translations = translate_all(translation_keys)
+          logger.debug "took #{Time.now - now} secs to translate."
 
-        yaml = generate_yaml(locale_name, translations)
-        template 'i18n:translation.yml', "config/locales/translation_#{locale_name}.yml", :assigns => {:locale_name => locale_name, :translations => yaml.to_s}
+          yaml = generate_yaml(locale_name, translations)
+          template 'i18n:translation.yml', "config/locales/translation_#{locale_name}.yml", :assigns => {:locale_name => locale_name, :translations => yaml.to_s(true)}
+        end
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amatsuda-i18n_generators
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Akira Matsuda
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-15 00:00:00 -08:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency