l10n 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36eedbf1cd75adfb0c60b0d129946830e3a51061
-  data.tar.gz: 7761e7398936575ac035ed7127f7bad266a79ba2
+  metadata.gz: 866b98e1c6683bc7ec991e01d7d2d1ee67311906
+  data.tar.gz: 3c5bb6f5e84a1d83839e35d470c9482fb764c9bb
 SHA512:
-  metadata.gz: 6a10d2ca1eb7c673c2dd710d09b1a6c991a48d986550f11ea7fa8dacb9acb64efe47711affc4bbea0d7f9aa69981003ffcb41df89f05d3554b01b0c2ad297cb6
-  data.tar.gz: 2ca30313f972703e11c4e22d1704649cd9c7347b1e33f4c236270a2bc34301674f1ce82b38859fc3392ff8d41fb895173fa5bd5391e229c7118fae0c3ec72025
+  metadata.gz: 3b955a86b74e926412306b7e03b7e81c93a781a7f866c0c92de4b1b46d005158e7b8700c572cc9b449fb49345f7dac135c20c2c3e0f44370de257e6a8ee8cbdb
+  data.tar.gz: 71f8806d4025bfb63697d44a0e1b76cd8da2a9fccc2b61378135eb9d512a5cef886d7f13b6564e31307dde6958128009258679b71fc0671935c43d8ce780d8b2

data/CHANGELOG

@@ -0,0 +1,5 @@
+* 1.1.0 - 2014-12-09
+
+- Adding Time#l
+- Adding I18n support for JavaScript
+- Updating README

data/README.md

@@ -1,15 +1,15 @@
-L10n - I18n that roarrrs
-========================
+# L10n - I18n that roarrrs
 
+## Installation
 
-Installation
-------------
+```ruby
+# Gemfile
+gem 'l10n'
+```
 
+## Setting up your app
 
-Setting up your app
--------------------
-
-In your language.yml, make sure to have definitions for 
+In your <language>.yml, make sure to have definitions for 
 
 number:
   precision:
@@ -20,12 +20,135 @@ number:
       
 As there is currently a bug in Rails: https://github.com/rails/rails/issues/4420
 
+## Features
+
+### ActiveRecord column translations
+
+```ruby
+class Fruit < ActiveRecord::Base
+  # columns: name, name_de, name_fr
+  
+  translates :name
+end
+
+apple = Fruit.new(name: 'Apple', name_de: 'Apfel', name_fr: 'Pomme')
+
+I18n.as(:en) { apple.name_t } => "Apple"
+I18n.as(:de) { apple.name_t } => "Apfel"
+I18n.as(:fr) { apple.name_t } => "Pomme"
+
+apple.name_translations => { en: "Apple", de: "Apfel", fr: "Pomme" }
+```
+
+Translated columns also support validation:
+
+```ruby
+class Fruit < ActiveRecord::Base
+  translates :name
+  
+  # all translation columns for "name" must be present
+  validate :name, translation: true
+end
+```
+
+### Core extensions
+
+#### String and Symbol
+
+```yaml
+# de.yml
+de:
+  words:
+    one: Eins
+    two: Zwei
+    three: Drei
+    four: Vier
+    five: Fünf
+    
+  hello: "Hallo %{name}!"
+```
+
+```ruby
+I18n.locale = :de
+
+'words.one'.t => 'Eins'
+
+'hello'.t(name: 'Otto') => "Hallo Otto!"
+```
+
+This also works with symbols.
+
+#### Formatting of numbers
+
+```ruby
+I18n.as('de') { 1234.5.to_formatted_s } => "1.234,50"
+I18n.as('en') { 1234.5.to_formatted_s } => "1,234.50"
+```
+
+This also works with instances of BigDecimal.
+
+#### Localization of decimal separator and delimiter for numbers
+
+```ruby
+I18n.as('de') { 1234.5.to_localized_s } => "1.234,5"
+I18n.as('en') { 1234.5.to_localized_s } => "1,234.5"
+```
+
+#### Localization of decimal separator and delimiter for numeric strings
+
+```ruby
+I18n.as(:de) { Numeric.localize('1,234.50') } => "1.234,50"
+I18n.as(:en) { Numeric.localize('1,234.50') } => "1,234.50"
+```
+
+### Automatic localization of numeric values in Rails forms and models
+
+```ruby
+# in your template
+<%= form_for @car do |f| %>
+  <% f.amount_field :price, precision: 2 %>
+<% end %>
+
+# in your controller, or elsewhere
+# params => { car: { price: "12.000,00" } }
+
+I18n.locale = :de
+@car = Car.new(params[:car]).price => 12000
+
+I18n.locale = :en
+@car = Car.new(params[:car]).price => 12
+```
+
+### Accept-Language header parsing in ActionDispatch::Request
+
+The Accept-Language header will be parsed, and locales will be returned ordered by user preference.
+
+```ruby
+# in your controller
+request.accept_locales => ["en-US", "en", "en-GB"]
+```
 
-Features
---------
+### Javascript I18n, interpolation and pluralization
 
+```yaml
+# en.yml
+en:
+  javascript:
+    hello: Hello {name}!
+    
+    apple:
+      one: '{count} apple'
+      other: '{count} apples'
+```
 
-```` ruby
+```ruby
+# in your application layout
+<%= i18n_script_tag %>
+```
 
-````
+```javascript
+// in any javascript
+"hello".t({ name: "JS" }) => "Hello JS!"
 
+"apple".t({ count: 4 }) => "5 apples"
+```

data/app/assets/javascripts/i18n.js

@@ -0,0 +1,33 @@
+var I18n = I18n || {};
+
+I18n.translate = function(str, options) {
+  options = options || {};
+  var fallback = options['fallback'] || ('Translation missing: ' + str);  // default is a JS reserved word
+  var translation, matches, method, match, interpolation_value;
+  var count = options['count'];
+  var keys = str.split('.');
+  var obj = this.translations;
+  while(obj && keys.length) obj = obj[keys.shift()];
+  if (obj) {
+    if ($.type(obj) == 'object' && count !== undefined) {
+      translation = obj[1 == count ? 'one' : 'other'];
+    } else {
+      translation = obj;
+    }
+    if ($.type(translation) == 'string' && (matches = translation.match(/{\w+?}/g))) {
+      while(match = matches.shift()) {
+        method = match.substr(1, match.length - 2);
+        interpolation_value = options[method];
+        if (interpolation_value == undefined) interpolation_value = ('undefined interpolation value: ' + method);
+        translation = translation.replace(new RegExp(match, 'g'), interpolation_value);
+      }
+    }
+  }
+  return translation || fallback;
+};
+
+I18n.t = function(str, options) {
+  return this.translate(str, options);
+};
+
+String.prototype.t = function(options){ return(I18n.translate(this, options)); }

data/lib/l10n.rb

@@ -1,4 +1,5 @@
 require 'i18n'
+require 'date'
 require 'bigdecimal'
 require 'action_view'
 require 'action_dispatch'
@@ -12,7 +13,9 @@ require 'l10n/numeric_column_conversions'
 require 'l10n/column_translation'
 require 'l10n/translation_validator'
 require 'l10n/forms'
+require 'l10n/javascript_helper'
 require 'l10n/request'
+require 'l10n/engine'
 
 files = Dir[File.join(File.dirname(__FILE__), 'locales/*.yml')]
 I18n.load_path.concat(files)

data/lib/l10n/core_extensions.rb

@@ -1,7 +1,7 @@
 require 'l10n/core_extensions/object_ext'
 require 'l10n/core_extensions/string_ext'
 require 'l10n/core_extensions/symbol_ext'
-require 'l10n/core_extensions/date_ext'
+require 'l10n/core_extensions/date_time_ext'
 require 'l10n/core_extensions/numeric_ext'
 require 'l10n/core_extensions/big_decimal_ext'
 

data/lib/l10n/core_extensions/{date_ext.rb → date_time_ext.rb}

@@ -1,6 +1,6 @@
 module L10n
   module CoreExtensions
-    module DateExt
+    module DateTimeExt
       def localize(*args)
         I18n.l(self, *args)
       end
@@ -9,4 +9,5 @@ module L10n
   end
 end
 
-Date.send :include, L10n::CoreExtensions::DateExt
+Date.send :include, L10n::CoreExtensions::DateTimeExt
+Time.send :include, L10n::CoreExtensions::DateTimeExt

data/lib/l10n/engine.rb

@@ -0,0 +1,7 @@
+require 'rails/engine'
+
+module L10n
+  class Engine < ::Rails::Engine
+    
+  end
+end

data/lib/l10n/javascript_helper.rb

@@ -2,13 +2,15 @@ module L10n
   module JavaScriptHelper
   
     def i18n_script_tag
-      javascript_tag(%%
+      javascript_tag %<
       var I18n = I18n || {};
       
       I18n.locale = function() {
         return("#{I18n.locale}");
       };
-      %)
+      
+      I18n.translations = #{I18n.t(:javascript).to_json};
+      >
     end
     
   end

data/lib/l10n/version.rb

@@ -1,3 +1,3 @@
 module L10n
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: l10n
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Matthias Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -122,24 +136,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
-description: I18n that roarrrs
+description: Extensions for Rails I18n
 email: mtgrosser@gmx.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG
 - MIT-LICENSE
 - README.md
-- Rakefile
+- app/assets/javascripts/i18n.js
 - lib/l10n.rb
 - lib/l10n/column_translation.rb
 - lib/l10n/core_extensions.rb
 - lib/l10n/core_extensions/big_decimal_ext.rb
-- lib/l10n/core_extensions/date_ext.rb
+- lib/l10n/core_extensions/date_time_ext.rb
 - lib/l10n/core_extensions/numeric_ext.rb
 - lib/l10n/core_extensions/object_ext.rb
 - lib/l10n/core_extensions/string_ext.rb
 - lib/l10n/core_extensions/symbol_ext.rb
+- lib/l10n/engine.rb
 - lib/l10n/forms.rb
 - lib/l10n/i18n_extensions.rb
 - lib/l10n/inflections.rb
@@ -150,8 +166,9 @@ files:
 - lib/l10n/version.rb
 - lib/locales/de.yml
 - lib/locales/en.yml
-homepage: http://rubygems.org/gems/l10n
-licenses: []
+homepage: https://github.com/mtgrosser/l10n
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -172,5 +189,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Extensions for Rails I18n
+summary: I18n that roarrrs
 test_files: []

data/Rakefile

@@ -1,22 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Run all tests'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.test_files = FileList['test/cases/*_test.rb']
-  t.verbose = true
-end
-
-desc 'Generate documentation'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'L10n'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end