r18n-core 1.0.0 → 1.0.1

data/ChangeLog

@@ -1,3 +1,12 @@
+== 1.0.1 (Phuket Town)
+* Fix translation reloading in Rails and Sinatra.
+* Use global R18n settings for Sinatra extension.
+* Allow to override desktop autodetect by LANG environment on all platforms.
+* Add support for JRuby in 1.9 mode.
+* Rename R18n.reset to R18n.reset! and add R18n.clear_cache!.
+* Fix Sinatra with loaded ActiveSupport.
+* Add Mongolian locale (by Elias Klughammer).
+
 == 1.0.0 (Bangkok)
 * Add R18n.default_places.
 * Rails SafeBuffer support.

data/README.md

@@ -204,6 +204,9 @@ The filter will receive at least two arguments:
 * A Hash with translation `locale` and `path`.
 * Parameters from translation request will be in the remaining arguments.
 
+In Rails application put your filters to `app/i18n/filters.rb`, it will be
+automatically reloaded in development.
+
 #### HTML Escape
 
 R18n contains 2 filters to escape HTML entities: by YAML type and global. If you
@@ -251,6 +254,20 @@ hi: !!markdown
 t.hi #=> "<p><strong>Hi</strong>, people!</p>"
 ```
 
+If you can’t use Kramdown you can redefine Markdown filter
+to use your own parser:
+
+```ruby
+# Disable standard Markdown filter
+Filters.off(:kramdown)
+# Add new filter for !!markdown YAML type
+Filters.add('markdown', :passive => true) do |content, config|
+  require 'redcarpet'
+  markdown = ::Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+  markdown.render(content)
+end
+```
+
 #### Textile
 
 To use Textile in your translations you must install the RedCloth gem:

data/base/mn.rb

@@ -0,0 +1,19 @@
+ok: 'Сайн'
+save: 'Хадгал'
+cancel: 'Цуцлах'
+'yes': 'Тийм'
+'no': 'Үгүй'
+exit: 'Гарц'
+delete: 'Устга'
+
+human_time:
+  after_days: '%1 Өдрийн дараа'
+  tomorrow: 'Маргааш'
+  after_hours: '%1 Цагийн дараа'
+  after_minutes: '%1 Минутны дараа'
+  now: 'Одоо'
+  today: 'Өнөөдөр'
+  minutes_ago: '%1 Минутны өмнө'
+  hours_ago: '%1 Цагийн өмнө'
+  yesterday: 'Өчигдөр'
+  days_ago: '%1 Өдрийн өмнө'

data/lib/r18n-core/filters.rb

@@ -246,14 +246,15 @@ module R18n
   Filters.off(:untranslated_bash)
 
   Filters.add(Untranslated, :untranslated_html) do |v, c, transl, untransl|
-    if defined? ActiveSupport::SafeBuffer
-      transl <<
-        '<span style="color: red">['.html_safe <<
-          untransl <<
-        ']</span>'.html_safe
+    prefix  = '<span style="color: red">['
+    postfix = ']</span>'
+    if prefix.respond_to? :html_safe
+      prefix  = prefix.html_safe
+      postfix = postfix.html_safe
+      transl  << prefix << untransl << postfix
     else
       Utils.escape_html(transl) <<
-      '<span style="color: red">[' << Utils.escape_html(untransl) << ']</span>'
+        prefix << Utils.escape_html(untransl) << postfix
     end
   end
   Filters.off(:untranslated_html)

data/lib/r18n-core/utils.rb

@@ -69,7 +69,10 @@ module R18n
     # Call +block+ with Syck yamler. It used to load RedCloth, which isn’t
     # support Psych.
     def self.use_syck(&block)
-      if '1.8.' == RUBY_VERSION[0..3]
+      if RUBY_PLATFORM == 'java' && defined?(YAML::ENGINE)
+        YAML::ENGINE.yamler = 'psych'
+        yield
+      elsif '1.8.' == RUBY_VERSION[0..3]
         yield
       else
         origin_yamler = YAML::ENGINE.yamler

data/lib/r18n-core/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module R18n
-  VERSION = '1.0.0'.freeze unless defined? R18n::VERSION
+  VERSION = '1.0.1'.freeze unless defined? R18n::VERSION
 end

data/lib/r18n-core.rb

@@ -36,6 +36,8 @@ require dir.join('yaml_loader').to_s
 require dir.join('i18n').to_s
 require dir.join('helpers').to_s
 
+require 'yecht' if RUBY_PLATFORM == 'java'
+
 module R18n
   autoload :Translated, 'r18n-core/translated'
 
@@ -72,11 +74,17 @@ module R18n
       (@setter && set(@setter.call))
     end
 
+    # Clean translations cache.
+    def clear_cache!
+      self.cache = { }
+    end
+
     # Delete I18n object from current thread and global variable.
-    def reset
+    def reset!
       thread[:r18n_i18n] = thread[:r18n_setter] = @i18n = @setter = nil
-      self.cache = {}
+      clear_cache!
     end
+    alias :reset :reset!
 
     # Get the current thread.
     def thread
@@ -149,5 +157,5 @@ module R18n
   self.default_loader   = R18n::Loader::YAML
   self.default_places   = nil
   self.extension_places = [Loader::YAML.new(dir + '../base')]
-  self.cache            = {}
+  self.clear_cache!
 end

data/locales/mn.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+module R18n
+  class Locales::Mn < Locale
+    set :title => 'Монгол',
+
+        :wday_names => ['Ням гариг', 'Даваа гариг', 'Мягмар гариг',
+                        'Лхагва гариг', 'Пүрэв гариг', 'Баасан гариг',
+                        'Бямба гариг'],
+        :wday_abbrs => %w{ня да мя лх пү ба бя},
+
+        :month_names => ['Нэгдүгээр сар', 'Хоёрдугаар сар', 'Гуравдугаар сар',
+                         'Дөрөвдүгээр сар', 'Тавдугаар сар', 'Зургадугаар сар',
+                         'Долдугаар сар', 'Наймдугаар сар', 'Есдүгээр сар',
+                         'Аравдугаар сар', 'Арваннэгдүгээр сар',
+                         'Арванхоёрдугаар сар'],
+
+        :date_format => '%Y-%m-%d',
+
+        :number_decimal => ",",
+        :number_group   => "."
+  end
+end

data/locales/pl.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module R18n
-  class Locales::Pl < R18n::Locale
+  class Locales::Pl < Locale
     set :title => 'Polski',
 
         :wday_names => %w{niedziela poniedziałek wtorek środa czwartek piątek

data/locales/pt.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module R18n
-  class Locales::Pt < R18n::Locale
+  class Locales::Pt < Locale
     set :title => 'Português',
 
         :wday_names => %w{domingo segunda-feira terça-feira quarta-feira

data/locales/th.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module R18n
-  class Locales::Th < R18n::Locale
+  class Locales::Th < Locale
     set :title => 'ภาษาไทย',
 
       :wday_names => %w{วันอาทิตย์ วันจันทร์ วันอังคาร วันพุธ วันพฤหัสบดี วันศุกร์ วันวัน

data/locales/zh-cn.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module R18n
-  class Locales::ZhCn < R18n::Locale
+  class Locales::ZhCn < Locale
     set :title => '简体中文',
         :sublocales => %w{zh en}
   end

data/locales/zh-tw.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module R18n
-  class Locales::ZhTw < R18n::Locale
+  class Locales::ZhTw < Locale
     set :title => '繁體中文',
         :sublocales => %w{zh en}
   end

data/locales/zh.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module R18n
-  class Locales::Zh < R18n::Locale
+  class Locales::Zh < Locale
     set :title => '中文',
 
         :wday_names => %w{星期日 星期一 星期二 星期三 星期四 星期五 星期六},

data/spec/i18n_spec.rb

@@ -125,7 +125,7 @@ describe R18n::I18n do
     R18n::I18n.new('en', counter)
     counter.loaded.should == 1
 
-    R18n.cache.clear
+    R18n.clear_cache!
     R18n::I18n.new('en', counter)
     counter.loaded.should == 2
   end

data/spec/r18n_spec.rb

@@ -7,7 +7,7 @@ describe R18n do
   after do
     R18n.default_loader = R18n::Loader::YAML
     R18n.default_places = nil
-    R18n.reset
+    R18n.reset!
   end
 
   it "should store I18n" do
@@ -15,7 +15,7 @@ describe R18n do
     R18n.set(i18n)
     R18n.get.should == i18n
 
-    R18n.reset
+    R18n.reset!
     R18n.get.should be_nil
   end
 
@@ -41,12 +41,18 @@ describe R18n do
     R18n.get.locales.should == [R18n.locale('en')]
   end
 
+  it "should clear cache" do
+    R18n.cache[:a] = 1
+    R18n.clear_cache!
+    R18n.cache.should be_empty
+  end
+
   it "should reset I18n objects and cache" do
     R18n.cache[:a] = 1
     R18n.set('en')
     R18n.thread_set('en')
 
-    R18n.reset
+    R18n.reset!
     R18n.get.should be_nil
     R18n.cache.should be_empty
   end
@@ -96,8 +102,8 @@ describe R18n do
     R18n.cache = { 1 => 2 }
     R18n.cache.should == { 1 => 2 }
 
-    R18n.cache.clear
-    R18n.cache.should == {}
+    R18n.clear_cache!
+    R18n.cache.should == { }
   end
 
   it "should convert Time to Date" do

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ TWO = TRANSLATIONS + 'two'     unless defined? TWO
 EXT = R18n::Loader::YAML.new(TRANSLATIONS + 'extension') unless defined? EXT
 
 RSpec.configure do |config|
-  config.before { R18n.cache.clear }
+  config.before { R18n.clear_cache! }
 end
 
 gem 'kramdown'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,6 +196,7 @@ files:
 - base/ja.yml
 - base/kk.yml
 - base/lv.yml
+- base/mn.rb
 - base/nb-no.yml
 - base/nl.yml
 - base/pl.yml
@@ -240,6 +241,7 @@ files:
 - locales/ja.rb
 - locales/kk.rb
 - locales/lv.rb
+- locales/mn.rb
 - locales/nb-no.rb
 - locales/nl.rb
 - locales/pl.rb
@@ -295,7 +297,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1924687969248369443
+      hash: -3931827469984591101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -304,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1924687969248369443
+      hash: -3931827469984591101
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23