l10n 0.0.3 → 0.0.4

data/lib/l10n.rb

@@ -1,38 +1,40 @@
 require 'i18n'
 require 'action_view'
+require 'action_dispatch'
 require 'active_support'
 
+require 'l10n/version'
 require 'l10n/core_extensions'
 require 'l10n/i18n_extensions'
 require 'l10n/numeric_column_conversions'
 require 'l10n/column_translation'
 require 'l10n/forms'
-
+require 'l10n/request'
 
 module L10n
   @number_helper = Object.new.tap { |obj| obj.extend ActionView::Helpers::NumberHelper }
   
   class << self
     
-    def default?
-      language_code == default_language_code
-    end
+    #def default?
+    #  language_code == default_language_code
+    #end
     
-    def language_code
-      normalize_language_code(locale) if locale
-    end
+    #def language_code
+    #  normalize_language_code(locale) if locale
+    #end
     
-    def default_language_code
-      normalize_language_code(default_locale) if default_locale
-    end
+    #def default_language_code
+    #  normalize_language_code(default_locale) if default_locale
+    #end
     
     #def avaliable_locales
     #  
     #end
     
-    def available_language_codes
-      i18n_available_locales.map { |i18n_locale| normalize_language_code(i18n_locale) }.uniq
-    end
+    #def available_language_codes
+    #  i18n_available_locales.map { |i18n_locale| normalize_language_code(i18n_locale) }.uniq
+    #end
     
     def number_with_precision(number, options = {})
       #options.symbolize_keys!
@@ -45,17 +47,17 @@ module L10n
         
     private
     
-    def normalize_language_code(code)
-      code.to_s[0..1].downcase
-    end
+    #def normalize_language_code(code)
+    #  code.to_s[0..1].downcase
+    #end
     
-    def i18n_available_locales
-      I18n.available_locales
-    end
+    #def i18n_available_locales
+    #  I18n.available_locales
+    #end
     
-    def i18n_current_language
-      
-    end
+    #def i18n_current_language
+    #  
+    #end
       
   end
   

data/lib/l10n/column_translation.rb

@@ -36,15 +36,23 @@ module L10n
           end
           define_method "#{attr_name}_translations" do
             translations = { I18n.default_language_code => read_attribute(attr_name) }
-            (I18n.supported_language_codes - [I18n.default_language_code]).each do |language_code|
+            I18n.translation_language_codes.each do |language_code|
               translations[language_code] = read_attribute("#{attr_name}_#{language_code}")
             end
             translations
           end
           define_method "#{attr_name}_translations=" do |translations|
+            translations = translations.dup
+            if all = translations.delete(:all)
+              send("#{attr_name}=", all)
+              I18n.translation_language_codes.each do |language_code|
+                method_name = "#{attr_name}_#{language_code}="
+                send(method_name, all) if respond_to?(method_name)
+              end
+            end
             translations.each do |language_code, value|
               method_name = "#{attr_name}_#{language_code}="
-              send("#{attr_name}_#{language_code}=", value) if respond_to?(method_name)
+              send(method_name, value) if respond_to?(method_name)
             end
           end
         end

data/lib/l10n/i18n_extensions.rb

@@ -3,6 +3,7 @@ module L10n
    
     def self.included(base)
       base.extend ClassMethods
+      base.mattr_accessor :preferred_locale
     end
    
     module ClassMethods
@@ -10,18 +11,19 @@ module L10n
       def default?
         language_code == default_language_code
       end
-     
+      
       def language_code
         normalize_language_code(locale) if locale
       end
       
-      def country_code
-        if locale.to_s.match(/\w\w-\w\w/)
-          locale.to_s[-2..-1]
-        else
-          normalize_locale_code(locale)[-2..-1]
-        end
-      end
+      ## deprecated
+      #def country_code
+      #  if locale.to_s.match(/\w\w-\w\w/)
+      #    locale.to_s[-2..-1]
+      #  else
+      #    normalize_locale_code(locale)[-2..-1]
+      #  end
+      #end
      
       def default_language_code
         normalize_language_code(default_locale) if default_locale
@@ -30,13 +32,19 @@ module L10n
       def available_language_codes
         available_locales.map { |locale| normalize_language_code(locale) }.uniq
       end
-
-      def supported_language_codes
-        [:en, :de]
+      
+      def translation_language_codes
+        I18n.available_language_codes - [I18n.default_language_code]
+      end
+      
+      def available(locale)
+        return nil if locale.blank?
+        locale = normalize_locale_code(locale)
+        available_locales.include?(locale) ? locale : nil
       end
     
-      def preferred_locale
-        :de
+      def available?(locale)
+        available(locale) ? true : false
       end
      
       def as(tmp_locale)
@@ -54,11 +62,11 @@ module L10n
       end
       
       def as_each
-        supported_language_codes.inject({}) { |hash, code| hash[code] = I18n.as(code) { yield(code) }; hash }
+        available_language_codes.inject({}) { |hash, code| hash[code] = I18n.as(code) { yield(code) }; hash }
       end
       
       def translations(key)
-        supported_language_codes.inject({}) { |hash, code| hash[code] = I18n.as(code) { I18n.t(key) }; hash }
+        available_language_codes.inject({}) { |hash, code| hash[code] = I18n.as(code) { I18n.t(key) }; hash }
       end
       
       def translation_suffix
@@ -66,11 +74,13 @@ module L10n
       end
      
       private
-     
+      
+      # ISO 639-1 two-letter language code 
       def normalize_language_code(code)
         code.to_s[0..1].downcase.to_sym
       end
       
+      # deprecated
       def normalize_locale_code(code)
         normalize_language_code(code)
       end
@@ -80,4 +90,4 @@ module L10n
   end
 end
 
-I18n.extend L10n::I18nExtensions::ClassMethods
+I18n.send :include, L10n::I18nExtensions

data/lib/l10n/request.rb

@@ -0,0 +1,27 @@
+module L10n
+  module Request
+    
+    def accept_locales
+      return [] if env['HTTP_ACCEPT_LANGUAGE'].blank?
+      locale_groups = env['HTTP_ACCEPT_LANGUAGE'].split(',')
+      preferred_locales = []
+      for locale_group in locale_groups
+        locale = locale_group.split(';')
+        language_code, params = locale[0].to_s.strip, locale[1]
+        if /\A[A-z]{2}(-[A-z]{2})?\z/.match(language_code)
+          if params
+            name, value = params.split('=')
+            q = (name == 'q' and value.to_f > 0 ? value.to_f : 1.0)
+          else
+            q = 1.0
+          end
+          preferred_locales << [language_code, q]
+        end
+      end
+      preferred_locales.sort { |a, b| b.last <=> a.last }.map(&:first)
+    end
+        
+  end
+end
+
+ActionDispatch::Request.class_eval { include L10n::Request }

data/lib/l10n/version.rb

@@ -0,0 +1,3 @@
+module L10n
+  VERSION = '0.0.4'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: l10n
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2151919420 !ruby/object:Gem::Requirement
+  requirement: &2151917000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2151919420
+  version_requirements: *2151917000
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2151918880 !ruby/object:Gem::Requirement
+  requirement: &2151916280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151918880
+  version_requirements: *2151916280
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2151918160 !ruby/object:Gem::Requirement
+  requirement: &2151915440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151918160
+  version_requirements: *2151915440
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2151917520 !ruby/object:Gem::Requirement
+  requirement: &2151914740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151917520
+  version_requirements: *2151914740
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2151917000 !ruby/object:Gem::Requirement
+  requirement: &2151914220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151917000
+  version_requirements: *2151914220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2151916300 !ruby/object:Gem::Requirement
+  requirement: &2151913500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151916300
+  version_requirements: *2151913500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151915400 !ruby/object:Gem::Requirement
+  requirement: &2151912880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2151915400
+  version_requirements: *2151912880
 description: I18n that roarrrs
 email: mtgrosser@gmx.net
 executables: []
@@ -105,9 +105,10 @@ files:
 - lib/l10n/forms.rb
 - lib/l10n/i18n_extensions.rb
 - lib/l10n/numeric_column_conversions.rb
+- lib/l10n/request.rb
+- lib/l10n/version.rb
 - lib/l10n.rb
 - MIT-LICENSE
-- VERSION
 - README.md
 - Rakefile
 homepage: http://rubygems.org/gems/l10n

data/VERSION

@@ -1 +0,0 @@
-0.0.3