gettext_simple_rails 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 290c37e74f1b7060f1649328790356f73f7e57db
-  data.tar.gz: fea853034aee895ed19ef44075f954bd4bc2b4b3
+  metadata.gz: 4e9f89b39cca1dd44dd7cb081be7142f23be1521
+  data.tar.gz: f596c1a7eb5cf390432b7bb576e933df493ad658
 SHA512:
-  metadata.gz: de85e09d2606b44b9f846ae09806e2dc6fe443ff6fb8e5ab17ef43c30725e0f25894a3ec01704192412e97c775d9fee5f418bb117ffe360d19a52b0d54a468d2
-  data.tar.gz: a1efaa6beb26249ef35bb37a2af13986fd1bd74dd78f28bd80db5d748d7c4ffa7221320fa7653494f58febf1319ced88c4945fa4a11d7ce9709821458d1dfa77
+  metadata.gz: 25b0ad6a03fc80a953b28ffc70009addf5e7aa1d07619a1f3a4ff34a681718a96c3232814a0069de4f77872ba228db6c3d054fd0da600b18d24ebe12cdb0f556
+  data.tar.gz: b779e97c24ce3152dcb069533b886c30789749e8658b45300a09379a573b42e725c81d3b9d3a5a2028cc3668d350e74c02a0fc38dc383c5e460859e5b61db21e

data/lib/gettext_simple_rails/cache_handler.rb

@@ -7,8 +7,11 @@ class GettextSimpleRails::CacheHandler
       default_path_file = "#{Rails.root}/config/locales_gettext/#{locale}/LC_MESSAGES/default.po"
       next unless File.exists?(default_path_file)
       time = File.mtime(default_path_file)
-      newest_time = time if newest_time == nil || time > newest_time
-      newest_path = default_path_file
+      
+      if newest_time == nil || time > newest_time
+        newest_time = time
+        newest_path = default_path_file
+      end
     end
     
     return newest_path
@@ -35,7 +38,6 @@ class GettextSimpleRails::CacheHandler
     gs.register_kernel_methods
     
     injector = GettextSimpleRails::I18nInjector.new(:store_in_hash => true)
-    injector.inject_model_translations(gs)
     injector.inject_translator_translations(gs)
     
     File.open(static_cache_file_path, "w") do |fp|

data/lib/gettext_simple_rails/i18n_injector.rb

@@ -5,11 +5,11 @@ class GettextSimpleRails::I18nInjector
     @args = args
     @debug = args[:debug]
     @i18n_backend = I18n.config.backend
-    @store_hash = {} if args[:store_in_hash]
+    @store_hash = {}
   end
   
   def inject_translator_translations(gettext_simple)
-    @translator_translations = {}
+    @store_hash = {}
     
     GettextSimpleRails::Translators.load_all.each do |translator_data|
       translator = translator_data[:class].new
@@ -21,70 +21,16 @@ class GettextSimpleRails::I18nInjector
         injector_recursive gettext_simple, locale, translator.translations
       end
     end
-  end
-  
-  def inject_model_translations(gettext_simple)
-    GettextSimpleRails::ModelInspector.model_classes do |inspector|
-      model = {}
-      attributes = {}
-      
-      data = {
-        "activerecord" => {
-          "models" => {
-            inspector.snake_name => model
-          },
-          "attributes" => {
-            inspector.snake_name => attributes
-          }
-        }
-      }
-      
-      I18n.available_locales.each do |locale|
-        locale = locale.to_s
-        
-        unless gettext_simple.locale_exists?(locale)
-          debug "Skipping locale because it hasn't been loaded into GettextSimple: #{locale}" if @debug
-          next
-        end
-        
-        debug "Loading locale: #{locale}" if @debug
-        
-        one_translation = gettext_simple.translate_with_locale(locale, inspector.gettext_key_one)
-        if one_translation != inspector.gettext_key_one
-          model["one"] = one_translation
-        end
-        
-        other_translation = gettext_simple.translate_with_locale(locale, inspector.gettext_key_other)
-        if other_translation != inspector.gettext_key_other
-          model["other"] = other_translation
-        end
-        
-        inspector.attributes do |attribute|
-          attribute_translation = gettext_simple.translate_with_locale(locale, attribute.gettext_key)
-          if attribute_translation != attribute.gettext_key
-            debug "Translating #{inspector.snake_name}.#{attribute.name} to #{attribute_translation}" if @debug
-            attributes[attribute.name.to_s] = attribute_translation
-          else
-            debug "Skipping #{inspector.snake_name}.#{attribute.name}" if @debug
-          end
-        end
-        
-        inspector.relationships do |name, reflection|
-          relationship_translation = gettext_simple.translate_with_locale(locale, inspector.relationship_gettext_key(name))
-          if relationship_translation != inspector.relationship_gettext_key(name)
-            attributes[name.to_s] = relationship_translation
-          end
-        end
-        
-        store_translations(locale, data)
-      end
+    
+    @store_hash.each do |locale, language_hash|
+      @i18n_backend.store_translations(locale.to_sym, language_hash)
     end
   end
   
   def inject_from_static_translation_file(args)
     translation_hash = JSON.parse(File.read(args[:path]))
     translation_hash.each do |locale, language_hash|
-      store_translations(locale, language_hash)
+      @i18n_backend.store_translations(locale.to_sym, language_hash)
     end
   end
   
@@ -149,10 +95,6 @@ private
   end
   
   def store_translations(locale, translation_hash)
-    if @args[:store_in_hash]
-      @store_hash.deep_merge!({locale.to_sym => translation_hash})
-    else
-      @i18n_backend.store_translations(locale.to_sym, translation_hash)
-    end
+    @store_hash.deep_merge!({locale.to_sym => translation_hash})
   end
 end

data/lib/gettext_simple_rails/translators/active_record_attributes_translator.rb

@@ -0,0 +1,36 @@
+class GettextSimpleRails::Translators::ActiveRecordAttributesTranslator
+  def detected?
+    ::Kernel.const_defined?("ActiveRecord")
+  end
+  
+  def translations
+    @translations_hash = {
+      "activerecord" => {
+        "attributes" => {},
+        "models" => {}
+      }
+    }
+    attributes_hash = @translations_hash["activerecord"]["attributes"]
+    models_hash = @translations_hash["activerecord"]["models"]
+    
+    GettextSimpleRails::ModelInspector.model_classes do |inspector|
+      lower_class_name = StringCases.camel_to_snake(inspector.clazz.name)
+      models_hash[lower_class_name] = {
+        "one" => inspector.clazz.name,
+        "other" => inspector.clazz.name
+      }
+      attributes_hash[lower_class_name] = {} unless attributes_hash.key?(lower_class_name)
+      attributes = attributes_hash[lower_class_name]
+      
+      inspector.attributes do |attribute|
+        attributes[attribute.name.to_s] = attribute.name.to_s
+      end
+      
+      inspector.relationships do |name, reflection|
+        attributes[name.to_s] = name.to_s
+      end
+    end
+    
+    return @translations_hash
+  end
+end

data/lib/gettext_simple_rails/translators/{active_record_translator.rb → active_record_validations_translator.rb}

@@ -1,6 +1,6 @@
-class GettextSimpleRails::Translators::ActiveRecordTranslator
+class GettextSimpleRails::Translators::ActiveRecordValidationsTranslator
   def detected?
-    true
+    ::Kernel.const_defined?("ActiveRecord")
   end
   
   def translations
@@ -8,7 +8,7 @@ class GettextSimpleRails::Translators::ActiveRecordTranslator
       "activerecord" => {
         "errors" => {
           "messages" => {
-            "record_invalid" => "Invalid record"
+            "record_invalid" => "Invalid record: %{errors}"
           },
           "models" => {}
         }
@@ -29,6 +29,8 @@ private
       attributes_hash = @translations_hash["activerecord"]["errors"]["models"][clazz_snake_name]["attributes"]
       
       inspector.clazz._validators.each do |attribute_name, validators|
+        attribute_name = attribute_name.to_s
+        
         validators.each do |validator|
           attributes_hash[attribute_name] = {} unless attributes_hash.key?(attribute_name)
           attribute_hash = attributes_hash[attribute_name]

data/lib/gettext_simple_rails/translators/globalize_translator.rb

@@ -0,0 +1,32 @@
+class GettextSimpleRails::Translators::GlobalizeTranslator
+  def detected?
+    return ::Kernel.const_defined?("Globalize")
+  end
+  
+  def translations
+    @translations_hash = {
+      "activerecord" => {
+        "attributes" => {}
+      }
+    }
+    attributes = @translations_hash["activerecord"]["attributes"]
+    
+    GettextSimpleRails::ModelInspector.model_classes do |inspector|
+      next unless inspector.clazz.respond_to?(:globalize_migrator)
+      
+      class_lower_name = StringCases.camel_to_snake(inspector.clazz.name)
+      translate_class_name = "#{inspector.clazz.name}::Translation"
+      translate_class = translate_class_name.constantize
+      
+      id_column_name = "#{class_lower_name}_id"
+      translate_columns = translate_class.column_names - ["id", "locale", "created_at", "updated_at", id_column_name]
+      
+      translate_columns.each do |column_name|
+        attributes[class_lower_name] = {} unless attributes.key?(class_lower_name)
+        attributes[class_lower_name][column_name] = column_name
+      end
+    end
+    
+    return @translations_hash
+  end
+end

data/lib/gettext_simple_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextSimpleRails
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/tasks/gettext_simple_rails_tasks.rake

@@ -1,7 +1,6 @@
 namespace :gettext_simple_rails do
   task "all" => :environment do
     Rake::Task["gettext_simple_rails:generate_translator_files"].execute
-    Rake::Task["gettext_simple_rails:generate_model_translation_files"].execute
   end
   
   task "generate_translator_files" => :environment do
@@ -27,47 +26,6 @@ namespace :gettext_simple_rails do
     end
   end
   
-  task "generate_model_translation_files" => :environment do
-    GettextSimpleRails::ModelInspector.model_classes do |inspector|
-      translation_path = "#{GettextSimpleRails.translation_dir}/models/#{inspector.snake_name}_model_translations.rb"
-      FileUtils.mkdir_p(File.dirname(translation_path)) unless File.exists?(File.dirname(translation_path))
-      
-      File.open(translation_path, "w") do |fp|
-        fp.puts "class GettextSimpleRails::UserModelTranslations"
-        fp.puts "  def self.attribute_translations"
-        
-        inspector.attributes do |attribute|
-          fp.puts "    puts _('#{attribute.gettext_key}')"
-        end
-        
-        fp.puts "  end"
-        fp.puts ""
-        fp.puts "  def self.relationship_translations"
-        
-        inspector.relationships do |name, relationship|
-          fp.puts "    puts _('#{inspector.relationship_gettext_key(name)}')"
-        end
-        
-        fp.puts "  end"
-        fp.puts ""
-        fp.puts "  def self.paperclip_attachments"
-        
-        inspector.paperclip_attachments do |name|
-          fp.puts "    puts _('#{inspector.relationship_gettext_key(name)}')"
-        end
-        
-        fp.puts "  end"
-        fp.puts ""
-        fp.puts "  def self.model_name"
-        fp.puts "    puts _('#{inspector.gettext_key}.one')"
-        fp.puts "    puts _('#{inspector.gettext_key}.other')"
-        fp.puts "  end"
-        
-        fp.puts "end"
-      end
-    end
-  end
-  
   task "create" => :environment do
     require "fileutils"
     I18n.available_locales.each do |locale|

data/spec/{active_record_spec.rb → active_record_validations_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe GettextSimpleRails::Translators::ActiveRecordTranslator do
+describe GettextSimpleRails::Translators::ActiveRecordValidationsTranslator do
   before do
     # Make it possible to call the Rake task.
     ::Dummy::Application.load_tasks
@@ -13,7 +13,7 @@ describe GettextSimpleRails::Translators::ActiveRecordTranslator do
   end
   
   it "should generate translations for validations" do
-    filepath = "#{GettextSimpleRails.translation_dir}/active_record_translator_translations.rb"
+    filepath = "#{GettextSimpleRails.translation_dir}/active_record_validations_translator_translations.rb"
     cont = File.read(filepath)
     cont.should include "_('activerecord.errors.models.user.attributes.name.too_short')"
     cont.should include "_('activerecord.errors.models.user.attributes.name.invalid')"

data/spec/dummy/app/models/user.rb

@@ -1,11 +1,12 @@
 require "email_validator"
 
 class User < ActiveRecord::Base
+  translates :title
+  
   has_many :roles
   
   validates :name, :length => {:in => 2..255}
   validates :name, :uniqueness => true, :presence => true
   validates :name, :format => {:with => /\A[A-z]+\Z/}
-  
   validates :email, :email => true
 end

data/spec/dummy/config/application.rb

@@ -4,6 +4,7 @@ require 'rails/all'
 
 Bundler.require(*Rails.groups)
 require "gettext_simple_rails"
+require "globalize"
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/config/locales_gettext/static_translation_file.json

@@ -1 +1 @@
-{"en":{"activerecord":{"models":{"role":{},"user":{}},"attributes":{"role":{},"user":{}}},"date":{"day_names":[],"abbr_day_names":[],"month_names":[],"abbr_month_names":[]}},"da":{"activerecord":{"models":{"role":{},"user":{}},"attributes":{"role":{},"user":{}},"errors":{"models":{"user":{"attributes":{"name":{"too_short":"er for kort. Minimum er %{count}"}}}}}},"date":{"day_names":[],"abbr_day_names":[],"month_names":[],"abbr_month_names":[]}}}
+{"da":{"activerecord":{"errors":{"models":{"user":{"attributes":{"name":{"too_short":"er for kort. Minimum er %{count}"}}}}}},"date":{"day_names":[],"abbr_day_names":[],"month_names":[],"abbr_month_names":[]}},"en":{"date":{"day_names":[],"abbr_day_names":[],"month_names":[],"abbr_month_names":[]}}}

data/spec/dummy/db/migrate/20140515092420_create_user_translations.rb

@@ -0,0 +1,11 @@
+class CreateUserTranslations < ActiveRecord::Migration
+  def up
+    User.create_translation_table!(
+      :title => :string
+    )
+  end
+  
+  def down
+    User.drop_translation_table!
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,22 +11,26 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140411112622) do
+ActiveRecord::Schema.define(version: 20140515092420) do
 
-  create_table "gettext_simple_rails_roles", force: true do |t|
+  create_table "roles", force: true do |t|
     t.string   "role"
     t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "roles", force: true do |t|
-    t.string   "role"
-    t.integer  "user_id"
+  create_table "user_translations", force: true do |t|
+    t.integer  "user_id",    null: false
+    t.string   "locale",     null: false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "title"
   end
 
+  add_index "user_translations", ["locale"], name: "index_user_translations_on_locale"
+  add_index "user_translations", ["user_id"], name: "index_user_translations_on_user_id"
+
   create_table "users", force: true do |t|
     t.string   "name"
     t.date     "birthday_at"

data/spec/dummy/lib/gettext_simple_rails/active_record_attributes_translator_translations.rb

@@ -0,0 +1,40 @@
+class GettextSimpleRails::MonthNames
+  def translations
+    #. Default value: id
+    _('activerecord.attributes.role.id')
+    #. Default value: role
+    _('activerecord.attributes.role.role')
+    #. Default value: user_id
+    _('activerecord.attributes.role.user_id')
+    #. Default value: created_at
+    _('activerecord.attributes.role.created_at')
+    #. Default value: updated_at
+    _('activerecord.attributes.role.updated_at')
+    #. Default value: user
+    _('activerecord.attributes.role.user')
+    #. Default value: id
+    _('activerecord.attributes.user.id')
+    #. Default value: name
+    _('activerecord.attributes.user.name')
+    #. Default value: birthday_at
+    _('activerecord.attributes.user.birthday_at')
+    #. Default value: age
+    _('activerecord.attributes.user.age')
+    #. Default value: created_at
+    _('activerecord.attributes.user.created_at')
+    #. Default value: updated_at
+    _('activerecord.attributes.user.updated_at')
+    #. Default value: translations
+    _('activerecord.attributes.user.translations')
+    #. Default value: roles
+    _('activerecord.attributes.user.roles')
+    #. Default value: Role
+    _('activerecord.models.role.one')
+    #. Default value: Role
+    _('activerecord.models.role.other')
+    #. Default value: User
+    _('activerecord.models.user.one')
+    #. Default value: User
+    _('activerecord.models.user.other')
+  end
+end

data/spec/dummy/lib/gettext_simple_rails/active_record_validations_translator_translations.rb

@@ -0,0 +1,18 @@
+class GettextSimpleRails::MonthNames
+  def translations
+    #. Default value: Invalid record: %{errors}
+    _('activerecord.errors.messages.record_invalid')
+    #. Default value: is too short. The minimum is %{count}
+    _('activerecord.errors.models.user.attributes.name.too_short')
+    #. Default value: is too long. The maximum is %{count}
+    _('activerecord.errors.models.user.attributes.name.too_long')
+    #. Default value: has already been taken
+    _('activerecord.errors.models.user.attributes.name.taken')
+    #. Default value: cannot be blank
+    _('activerecord.errors.models.user.attributes.name.blank')
+    #. Default value: is invalid
+    _('activerecord.errors.models.user.attributes.name.invalid')
+    #. Default value: is invalid
+    _('activerecord.errors.models.user.attributes.email.invalid')
+  end
+end

data/spec/dummy/lib/gettext_simple_rails/date_translator_translations.rb

@@ -0,0 +1,60 @@
+class GettextSimpleRails::MonthNames
+  def translations
+    #. Default value: %Y-%m-%d
+    _('date.formats.default')
+    #. Default value: %b %d
+    _('date.formats.short')
+    #. Default value: %B %d, %Y
+    _('date.formats.long')
+    _('date.day_names.0')
+    _('date.day_names.1')
+    _('date.day_names.2')
+    _('date.day_names.3')
+    _('date.day_names.4')
+    _('date.day_names.5')
+    _('date.day_names.6')
+    _('date.abbr_day_names.0')
+    _('date.abbr_day_names.1')
+    _('date.abbr_day_names.2')
+    _('date.abbr_day_names.3')
+    _('date.abbr_day_names.4')
+    _('date.abbr_day_names.5')
+    _('date.abbr_day_names.6')
+    _('date.month_names.0')
+    _('date.month_names.1')
+    _('date.month_names.2')
+    _('date.month_names.3')
+    _('date.month_names.4')
+    _('date.month_names.5')
+    _('date.month_names.6')
+    _('date.month_names.7')
+    _('date.month_names.8')
+    _('date.month_names.9')
+    _('date.month_names.10')
+    _('date.month_names.11')
+    _('date.month_names.12')
+    _('date.abbr_month_names.0')
+    _('date.abbr_month_names.1')
+    _('date.abbr_month_names.2')
+    _('date.abbr_month_names.3')
+    _('date.abbr_month_names.4')
+    _('date.abbr_month_names.5')
+    _('date.abbr_month_names.6')
+    _('date.abbr_month_names.7')
+    _('date.abbr_month_names.8')
+    _('date.abbr_month_names.9')
+    _('date.abbr_month_names.10')
+    _('date.abbr_month_names.11')
+    _('date.abbr_month_names.12')
+    #. Default value: %a, %d %b %Y %H:%M:%S %z
+    _('time.formats.default')
+    #. Default value: %d %b %H:%M
+    _('time.formats.short')
+    #. Default value: %B %d, %Y %H:%M
+    _('time.formats.long')
+    #. Default value: am
+    _('time.am')
+    #. Default value: pm
+    _('time.pm')
+  end
+end

data/spec/dummy/lib/gettext_simple_rails/globalize_translator_translations.rb

@@ -0,0 +1,6 @@
+class GettextSimpleRails::MonthNames
+  def translations
+    #. Default value: title
+    _('activerecord.attributes.user.title')
+  end
+end

data/spec/dummy/lib/gettext_simple_rails/number_translator_translations.rb

@@ -0,0 +1,48 @@
+class GettextSimpleRails::MonthNames
+  def translations
+    #. Default value: ,
+    _('number.currency.format.delimiter')
+    #. Default value: %n %u
+    _('number.currency.format.format')
+    #. Default value: .
+    _('number.currency.format.separator')
+    #. Default value: $
+    _('number.currency.format.unit')
+    #. Default value: ,
+    _('number.format.delimiter')
+    #. Default value: .
+    _('number.format.separator')
+    #. Default value: %n %u
+    _('number.human.decimal_units.format')
+    #. Default value: Billion
+    _('number.human.decimal_units.units.billion')
+    #. Default value: Million
+    _('number.human.decimal_units.units.million')
+    #. Default value: Quadrillion
+    _('number.human.decimal_units.units.quadrillion')
+    #. Default value: Thousand
+    _('number.human.decimal_units.units.thousand')
+    #. Default value: Trillion
+    _('number.human.decimal_units.units.trillion')
+    #. Default value: 
+    _('number.human.decimal_units.units.unit')
+    #. Default value: 
+    _('number.human.format.delimiter')
+    #. Default value: %n %u
+    _('number.human.storage_units.format')
+    #. Default value: Byte
+    _('number.human.storage_units.units.byte.one')
+    #. Default value: Bytes
+    _('number.human.storage_units.units.byte.other')
+    #. Default value: GB
+    _('number.human.storage_units.units.gb')
+    #. Default value: KB
+    _('number.human.storage_units.units.kb')
+    #. Default value: MB
+    _('number.human.storage_units.units.mb')
+    #. Default value: TB
+    _('number.human.storage_units.units.tb')
+    #. Default value: 
+    _('number.percentage.format.delimiter')
+  end
+end