r18n-core 0.4.7.1 → 0.4.8

data/ChangeLog

@@ -1,3 +1,10 @@
+== 0.4.8 (En ni to)
+* Fix support for Ruby 1.9.2.
+* Fix caching issue (by Viktors Rotanovs).
+* Add Danish locale (by Hans Czajkowski Jørgensen)
+* Fix Italian locale (by Viktors Rotanovs).
+* Move untranslated filters with html highlight to r18n-core.
+
 == 0.4.7.1 (Kyū)
 * Fix Japanese locale in Ruby 1.9.1.
 

data/README.rdoc

@@ -94,7 +94,8 @@ plugins).
 
 === Object Translation
 
-You can translate any class, including ORM models:
+You can translate any class, including ORM models (ActiveRecord, DataMapper,
+MongoMapper, Mongoid or others):
 
   require 'r18n-core/translated'
   
@@ -360,7 +361,8 @@ and <tt>:standard</tt> (the default):
 
 === Model
 
-You can add i18n support to any classes, including ORM models:
+You can add i18n support to any classes, including ORM models (ActiveRecord,
+DataMapper, MongoMapper, Mongoid or others):
 
   require 'r18n-core/translated'
   

data/base/da.yml

@@ -0,0 +1,31 @@
+ok: OK
+save: Gem
+cancel: Annullér
+'yes': 'Ja'
+'no': 'Nej'
+exit: Afslut
+delete: Slet
+
+human_time:
+  after_days: !!pl
+    1: efter %1 dag
+    n: efter %1 dage
+  tomorrow: i morgen
+  after_hours: !!pl
+    1: efter %1 time
+    n: efter %1 timer
+  after_minutes: !!pl
+    1: efter %1 minut
+    n: efter %1 minutter
+  now: nu
+  today: i dag
+  minutes_ago: !!pl
+    1: %1 minut siden
+    n: %1 minutter siden
+  hours_ago: !!pl
+    1: %1 time siden
+    n: %1 timer siden
+  yesterday: i går
+  days_ago: !!pl
+    1: %1 dag siden
+    n: %1 dage siden

data/lib/r18n-core/filters.rb

@@ -247,6 +247,12 @@ module R18n
     "#{translated}[#{untranslated}]"
   end
   
+  Filters.add(Untranslated, :untranslated_html) do |v, c, transl, untransl|
+    Utils.escape_html(transl) <<
+      '<span style="color: red">' << Utils.escape_html(untransl) << '</span>'
+  end
+  Filters.off(:untranslated_html)
+  
   Filters.add('escape', :escape_html, :passive => true) do |content, config|
     config[:dont_escape_html] = true
     Utils.escape_html(content)

data/lib/r18n-core/i18n.rb

@@ -183,7 +183,7 @@ module R18n
     # Return unique key for current locales in translation and places.
     def translation_cache_key
       @available_codes ||= @translation_places.inject([]) { |all, i|
-        all + i.available }.uniq.map { |i| i.code }
+        all + i.available }.uniq.map { |i| i.code.downcase }
       (@locales_codes & @available_codes).join(',') + '@' +
         R18n.default_loader.hash.to_s +
         @translation_places.hash.to_s + R18n.extension_places.hash.to_s

data/lib/r18n-core/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module R18n
-  VERSION = '0.4.7.1' unless defined? R18n::VERSION
+  VERSION = '0.4.8' unless defined? R18n::VERSION
 end

data/locales/da.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module R18n
+  class Locales::Da < Locale
+    set :title => 'Dansk',
+        
+        :wday_names => %w{søndag mandag tirsdag onsdag torsdag fredag
+                          lørdag},
+        :wday_abbrs => %w{søn man tir ons tor fre lør},
+        
+        :month_names => %w{januar februar marts april Maj juni juli august
+                           september oktober november december},
+        :month_abbrs => %w{jan. feb. mar. apr. maj jun. jul. aug. sep. okt.
+                           nov. dec.},
+        
+        :time_am => 'om formiddagen',
+        :time_pm => 'om eftermiddagen',
+        :date_format => '%d.%m.%Y',
+        :full_format => '%d. %B %Y',
+        
+        :number_decimal => ",",
+        :number_group   => "."
+  end
+end

data/locales/it.rb

@@ -7,7 +7,8 @@ module R18n
                           sabato},
         :wday_abbrs => %w{dom lun mar mer gio ven sab},
         
-        :month_names => %w{gennaio febbraio marzo aprile maggio giugno luglio},
+        :month_names => %w{gennaio febbraio marzo aprile maggio giugno
+                           luglio agosto settembre ottobre novembre dicembre},
         :month_abbrs => %w{gen feb mar apr mag giu lug ago set ott nov dic},
         
         :date_format => '%d/%m/%Y',

data/spec/filters_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n::Filters do
   before do
@@ -188,6 +188,13 @@ describe R18n::Filters do
     @i18n.in.another.to_s.should == 'in.another in.another[]'
   end
   
+  it "should format untranslated for web" do
+    R18n::Filters.off(:untranslated)
+    R18n::Filters.on(:untranslated_html)
+    @i18n.in.not.to_s.should == 'in.<span style="color: red">not</span>'
+    @i18n['<b>'].to_s.should == '<span style="color: red">&lt;b&gt;</span>'
+  end
+  
   it "should have filter for escape HTML" do
     @i18n.html.should == '&lt;script&gt;true &amp;&amp; false&lt;/script&gt;'
   end

data/spec/i18n_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n::I18n do
   before do

data/spec/locale_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n::Locale do
   before :all do

data/spec/locales/cs_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Cs do
   it "should use Czech pluralization" do

data/spec/locales/en-us_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::EnUs do
   it "should format American English date" do

data/spec/locales/en_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::En do
   it "should format English date" do

data/spec/locales/fr_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Fr do
   it "should format French date" do

data/spec/locales/hu_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Hu do
   it "should use Hungarian digits groups" do

data/spec/locales/it_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
  
 describe R18n::Locales::It do
   it "should format Italian date" do

data/spec/locales/pl_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Pl do
   it "should use Polish pluralization" do

data/spec/locales/ru_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Ru do
   it "should use Russian pluralization" do

data/spec/locales/sk_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Sk do
   it "should use Slovak pluralization" do

data/spec/locales/th_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe R18n::Locales::Ru do
   it "should use Thai calendar" do

data/spec/r18n_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n do
   include R18n::Helpers

data/spec/translated_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), 'spec_helper')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'r18n-core', 'translated')
+require File.expand_path('../spec_helper', __FILE__)
+require File.expand_path('../../lib/r18n-core/translated', __FILE__)
 
 describe R18n::Translated do
   before do

data/spec/translation_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n::Translation do
   

data/spec/yaml_loader_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n::Loader::YAML do
   before do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-core
 version: !ruby/object:Gem::Version 
-  hash: 113
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 4
-  - 7
-  - 1
-  version: 0.4.7.1
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 +04:00
+date: 2010-09-22 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +38,7 @@ files:
 - base/sk.yml
 - base/kk.yml
 - base/es.yml
+- base/da.yml
 - base/fi.yml
 - base/lv.yml
 - base/de.yml
@@ -79,6 +79,7 @@ files:
 - locales/ru.rb
 - locales/en-us.rb
 - locales/ja.rb
+- locales/da.rb
 - locales/en-gb.rb
 - locales/de.rb
 - locales/hu.rb