r18n-core 0.4.8 → 0.4.9

data/base/ja.yml

@@ -1,19 +1,19 @@
-ok: 了解
-save: 保存
-cancel: キャンセル
+ok: '了解'
+save: '保存'
+cancel: 'キャンセル'
 'yes': 'はい'
 'no': 'いいえ'
-exit: 終了
-delete: 削除
+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日前
+  after_days: '%1日後'
+  tomorrow: '明日'
+  after_hours: '%1時間後'
+  after_minutes: '%1分後'
+  now: '今'
+  today: '今日'
+  minutes_ago: '%1分前'
+  hours_ago: '%1時間前'
+  yesterday: '昨日'
+  days_ago: '%1日前'

data/base/kk.yml

@@ -1,7 +1,7 @@
-ok: OK
-save: Сақтау
-cancel: Болдырмау
-'yes': Иә
-'no': Жоқ
-exit: Шығу
-delete: Алыстату
+ok: 'OK'
+save: 'Сақтау'
+cancel: 'Болдырмау'
+'yes': 'Иә'
+'no': 'Жоқ'
+exit: 'Шығу'
+delete: 'Алыстату'

data/base/lv.yml

@@ -1,31 +1,31 @@
-ok: Ok
-save: Saglabāt
-cancel: Atcelt
+ok: 'Ok'
+save: 'Saglabāt'
+cancel: 'Atcelt'
 'yes': 'Jā'
 'no': 'Nē'
-exit: Iziet
-delete: Dzēst
+exit: 'Iziet'
+delete: 'Dzēst'
 
 human_time:
   after_days: !!pl
-    1: nākamajā dienā
-    n: pēc %1 dienām
-  tomorrow: rīt
+    1: 'nākamajā dienā'
+    n: 'pēc %1 dienām'
+  tomorrow: 'rīt'
   after_hours: !!pl
-    1: nākamajā stundā
-    n: pēc %1 stundas
+    1: 'nākamajā stundā'
+    n: 'pēc %1 stundas'
   after_minutes: !!pl
-    1: nākamajā minūtē
-    n: pēc %1 minūtēm
-  now: tagad
-  today: šodien
+    1: 'nākamajā minūtē'
+    n: 'pēc %1 minūtēm'
+  now: 'tagad'
+  today: 'šodien'
   minutes_ago: !!pl
-    1: pirms minūtes
-    n: pirms %1 minūtēm
+    1: 'pirms minūtes'
+    n: 'pirms %1 minūtēm'
   hours_ago: !!pl
-    1: pirms stundas
-    n: pirms %1 stundām
-  yesterday: vakar
+    1: 'pirms stundas'
+    n: 'pirms %1 stundām'
+  yesterday: 'vakar'
   days_ago: !!pl
-    1: pirms vienas dienas
-    n: pirms %1 stundām
+    1: 'pirms vienas dienas'
+    n: 'pirms %1 stundām'

data/base/pl.yml

@@ -1,31 +1,31 @@
-ok: OK
-save: Zapisz
-cancel: Anuluj
-'yes': Tak
-'no': Nie
-exit: Wyjście
-delete: Usuń
+ok: 'OK'
+save: 'Zapisz'
+cancel: 'Anuluj'
+'yes': 'Tak'
+'no': 'Nie'
+exit: 'Wyjście'
+delete: 'Usuń'
 
 human_time:
   after_days: !!pl
-    1: po %1 dniu
-    n: po %1 dniach
-  tomorrow: jutro
+    1: 'po %1 dniu'
+    n: 'po %1 dniach'
+  tomorrow: 'jutro'
   after_hours: !!pl
-    1: po %1 godzinie
-    n: po %1 godzinach
+    1: 'po %1 godzinie'
+    n: 'po %1 godzinach'
   after_minutes: !!pl
-    1: po %1 minucie
-    n: po %1 minutach
-  now: teraz
-  today: dzisiaj
+    1: 'po %1 minucie'
+    n: 'po %1 minutach'
+  now: 'teraz'
+  today: 'dzisiaj'
   minutes_ago: !!pl
-    1: %1 minutę temu
-    n: %1 minut temu
+    1: '%1 minutę temu'
+    n: '%1 minut temu'
   hours_ago: !!pl
-    1: %1 godzinę temu
-    n: %1 godzin temu
-  yesterday: wczoraj
+    1: '%1 godzinę temu'
+    n: '%1 godzin temu'
+  yesterday: 'wczoraj'
   days_ago: !!pl
-    1: %1 dzień temu
-    n: %1 dni temu
+    1: '%1 dzień temu'
+    n: '%1 dni temu'

data/base/pt_br.yml

@@ -1,31 +1,31 @@
-ok: OK
-save: Salvar
-cancel: Cancelar 
-'yes': Sim
-'no': Não
-exit: Sair
-delete: Apagar
+ok: 'OK'
+save: 'Salvar'
+cancel: 'Cancelar'
+'yes': 'Sim'
+'no': 'Não'
+exit: 'Sair'
+delete: 'Apagar'
 
 human_time:
   after_days: !!pl
-    1: após %1 dia
-    n: após %1 dias
-  tomorrow: amanhã 
+    1: 'após %1 dia'
+    n: 'após %1 dias'
+  tomorrow: 'amanhã'
   after_hours: !!pl
-    1: após %1 hora
-    n: após %1 horas
+    1: 'após %1 hora'
+    n: 'após %1 horas'
   after_minutes: !!pl
-    1: após %1 minuto
-    n: após %1 minutos
-  now: agora
-  today: hoje 
+    1: 'após %1 minuto'
+    n: 'após %1 minutos'
+  now: 'agora'
+  today: 'hoje'
   minutes_ago: !!pl
-    1: %1 minuto atrás
-    n: %1 minutos atrás
+    1: '%1 minuto atrás'
+    n: '%1 minutos atrás'
   hours_ago: !!pl
-    1: %1 hora atrás
-    n: %1 horas atrás
-  yesterday: ontem 
+    1: '%1 hora atrás'
+    n: '%1 horas atrás'
+  yesterday: 'ontem'
   days_ago: !!pl
-    1: %1 dia atrás
-    n: %1 dias atrás
+    1: '%1 dia atrás'
+    n: '%1 dias atrás'

data/base/ru.yml

@@ -1,37 +1,37 @@
-ok: OK
-save: Сохранить
-cancel: Отмена
-'yes': Да
-'no': Нет
-exit: Выход
-delete: Удалить
+ok: 'OK'
+save: 'Сохранить'
+cancel: 'Отмена'
+'yes': 'Да'
+'no': 'Нет'
+exit: 'Выход'
+delete: 'Удалить'
 
 human_time:
   after_days: !!pl
-    1: через %1 день
-    2: через %1 дня
-    n: через %1 дней
-  tomorrow: завтра
+    1: 'через %1 день'
+    2: 'через %1 дня'
+    n: 'через %1 дней'
+  tomorrow: 'завтра'
   after_hours: !!pl
-    1: через %1 час
-    2: через %1 часа
-    n: через %1 часов
+    1: 'через %1 час'
+    2: 'через %1 часа'
+    n: 'через %1 часов'
   after_minutes: !!pl
-    1: через %1 минуту
-    2: через %1 минуты
-    n: через %1 минут
-  now: сейчас
-  today: сегодня
+    1: 'через %1 минуту'
+    2: 'через %1 минуты'
+    n: 'через %1 минут'
+  now: 'сейчас'
+  today: 'сегодня'
   minutes_ago: !!pl
-    1: %1 минуту назад
-    2: %1 минуты назад
-    n: %1 минут назад
+    1: '%1 минуту назад'
+    2: '%1 минуты назад'
+    n: '%1 минут назад'
   hours_ago: !!pl
-    1: %1 час назад
-    2: %1 часа назад
-    n: %1 часов назад
-  yesterday: вчера
+    1: '%1 час назад'
+    2: '%1 часа назад'
+    n: '%1 часов назад'
+  yesterday: 'вчера'
   days_ago: !!pl
-    1: %1 день назад
-    2: %1 дня назад
-    n: %1 дней назад
+    1: '%1 день назад'
+    2: '%1 дня назад'
+    n: '%1 дней назад'

data/base/sk.yml

@@ -1,34 +1,34 @@
-ok: OK
-save: Uložiť
-cancel: Zrušiť
-'yes': Áno
-'no': Nie
-exit: Koniec
-delete: Zmazať
+ok: 'OK'
+save: 'Uložiť'
+cancel: 'Zrušiť'
+'yes': 'Áno'
+'no': 'Nie'
+exit: 'Koniec'
+delete: 'Zmazať'
 
 human_time:
   after_days: !!pl
-    1: o %1 deň
-    2: o %1 dni
-    n: o %1 dní
-  tomorrow: zajtra
+    1: 'o %1 deň'
+    2: 'o %1 dni'
+    n: 'o %1 dní'
+  tomorrow: 'zajtra'
   after_hours: !!pl
-    1: o %1 hodinu
-    2: o %1 hodiny
-    n: o %1 hodín
+    1: 'o %1 hodinu'
+    2: 'o %1 hodiny'
+    n: 'o %1 hodín'
   after_minutes: !!pl
-    1: o %1 minútu
-    2: o %1 minúty
-    n: o %1 minút
-  now: teraz
-  today: dnes
+    1: 'o %1 minútu'
+    2: 'o %1 minúty'
+    n: 'o %1 minút'
+  now: 'teraz'
+  today: 'dnes'
   minutes_ago: !!pl
-    1: pred %1 minútou
-    n: pred %1 minútami
+    1: 'pred %1 minútou'
+    n: 'pred %1 minútami'
   hours_ago: !!pl
-    1: pred %1 hodinou
-    n: pred %1 hodinami
-  yesterday: včera
+    1: 'pred %1 hodinou'
+    n: 'pred %1 hodinami'
+  yesterday: 'včera'
   days_ago: !!pl
-    1: pred %1 dňom
-    n: pred %1 dňami
+    1: 'pred %1 dňom'
+    n: 'pred %1 dňami'

data/base/th.yml

@@ -1,19 +1,19 @@
-ok: OK
-save: บันทึก
-cancel: ยกเลิก
-'yes': ใช่
-'no': ไม่ใช่
-exit: ออก จาก
-delete: ลบ
+ok: '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 วัน ที่ ผ่าน มา
+  after_days: 'หลงจาก %1 วัน'
+  tomorrow: 'พรุ่งนี้'
+  after_hours: 'หลงจาก %1 ชั่วโมง'
+  after_minutes: 'หลงจาก %1 นาที'
+  now: 'ตอน นี้'
+  today: 'วัน นี้'
+  minutes_ago: '%1 นาที ที่ ผ่าน มา'
+  hours_ago: '%1 ชั่วโมง ที่ ผ่าน มา'
+  yesterday: 'เมื่อ วาน'
+  days_ago: '%1 วัน ที่ ผ่าน มา'

data/base/zh.yml

@@ -1,19 +1,19 @@
-ok: OK
-save: 保存
-cancel: 取消
-'yes': 是
-'no': 否
-exit: 退出
-delete: 删除
+ok: '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天
+  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

@@ -280,7 +280,7 @@ module R18n
   end
   
   Filters.add('textile', :redcloth, :passive => true) do |content, config|
-    require 'redcloth'
+    R18n::Utils.use_syck { require 'redcloth' }
     ::RedCloth.new(content).to_html
   end
 end

data/lib/r18n-core/locale.rb

@@ -227,20 +227,16 @@ module R18n
         format_date_human(R18n::Utils.to_date(time), i18n,
                           R18n::Utils.to_date(now)) + format_time(time)
       else
-        case minutes
-        when -59..-1
-          i18n.human_time.minutes_ago(minutes.round.abs)
-        when 1..59
-          i18n.human_time.after_minutes(minutes.round)
-        when -1..1
+        if -1 < minutes and 1 > minutes
           i18n.human_time.now
+        elsif 60 <= minutes
+          i18n.human_time.after_hours((diff / 60.0).floor)
+        elsif -60 >= minutes
+          i18n.human_time.hours_ago((diff / 60.0).floor)
+        elsif 0 < minutes
+          i18n.human_time.after_minutes(minutes.round)
         else
-          hours = (diff / 60.0).floor
-          if time > now
-            i18n.human_time.after_hours(hours)
-          else
-            i18n.human_time.hours_ago(hours)
-          end
+          i18n.human_time.minutes_ago(minutes.round.abs)
         end
       end
     end

data/lib/r18n-core/translated.rb

@@ -110,14 +110,16 @@ module R18n
       #   translation :desciption, :type => 'markdown'
       def translation(name, options = {})
         if options[:methods]
-          @unlocalized_getters[name] = R18n::Utils.hash_map(options[:methods]) { |l, i| [ l.to_s, i.to_s ] }
+          @unlocalized_getters[name] = R18n::Utils.
+            hash_map(options[:methods]) { |l, i| [ l.to_s, i.to_s ] }
           unless options[:no_write]
-            @unlocalized_setters[name] =R18n::Utils.hash_map(options[:methods]) { |l, i| [ l.to_s, i.to_s + '=' ] }
+            @unlocalized_setters[name] = R18n::Utils.
+              hash_map(options[:methods]) { |l, i| [ l.to_s, i.to_s + '=' ] }
           end
         end
         
         @translation_types[name] = options[:type]
-        call = options[:no_params] ? 'call' : 'call(*params)'
+        params = options[:no_params] ? '' : ', *params'
         
         class_eval <<-EOS, __FILE__, __LINE__
           def #{name}(*params)
@@ -125,7 +127,7 @@ module R18n
             R18n.get.locales.each do |locale|
               code = locale.code
               next unless unlocalized.has_key? code
-              result = method(unlocalized[code]).#{call}
+              result = send unlocalized[code]#{params}
               next unless result
               
               path = "\#{self.class.name}##{name}"
@@ -133,10 +135,12 @@ module R18n
               if type
                 return R18n::Filters.process(R18n::Filters.enabled,
                          type, result, locale, path, params)
-              else
+              elsif result.is_a? String
                 result = TranslatedString.new(result, locale, path)
                 return R18n::Filters.process_string(R18n::Filters.enabled,
                          result, path, params)
+              else
+                return result
               end
             end
             
@@ -152,21 +156,27 @@ module R18n
               R18n.get.locales.each do |locale|
                 code = locale.code
                 next unless unlocalized.has_key? code
-                return method(unlocalized[code]).call(*params)
+                return send unlocalized[code], *params
               end
             end
           EOS
         end
       end
+      
+      # Return array of methods to find +unlocalized_getters+ or
+      # +unlocalized_setters+.
+      def unlocalized_methods
+        self.instance_methods
+      end
 
       # Return Hash of locale code to getter method for proxy +method+. If you
       # didn’t set map in +translation+ option +methods+, it will be detect
       # automatically.
       def unlocalized_getters(method)
-        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(.*[^=])$')
+        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(\w+)$')
         unless @unlocalized_getters.has_key? method
           @unlocalized_getters[method] = {}
-          self.instance_methods.reject { |i| not i =~ matcher }.each do |i|
+          self.unlocalized_methods.reject { |i| not i =~ matcher }.each do |i|
             @unlocalized_getters[method][i.to_s.match(matcher)[1]] = i.to_s
           end
         end
@@ -177,10 +187,10 @@ module R18n
       # didn’t set map in +translation+ option +methods+, it will be detect
       # automatically.
       def unlocalized_setters(method)
-        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(.*)=$')
+        matcher = Regexp.new('^' + Regexp.escape(method.to_s) + '_(\w+)=$')
         unless @unlocalized_setters.has_key? method
           @unlocalized_setters[method] = {}
-          self.instance_methods.reject { |i| not i =~ matcher }.each do |i|
+          self.unlocalized_methods.reject { |i| not i =~ matcher }.each do |i|
             @unlocalized_setters[method][i.to_s.match(matcher)[1]] = i.to_s
           end
         end

data/lib/r18n-core/utils.rb

@@ -57,5 +57,18 @@ module R18n
       end
       a
     end
+    
+    # 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]
+        yield
+      else
+        origin_yamler = YAML::ENGINE.yamler
+        YAML::ENGINE.yamler = 'syck'
+        yield
+        YAML::ENGINE.yamler = origin_yamler
+      end
+    end
   end
 end

data/lib/r18n-core/version.rb

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

data/lib/r18n-core/yaml_loader.rb

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
 require 'yaml'
+require 'syck' if '1.8.' != RUBY_VERSION[0..3]
 
 module R18n
   module Loader
@@ -39,6 +40,11 @@ module R18n
       # Create new loader for +dir+ with YAML translations.
       def initialize(dir)
         @dir = File.expand_path(dir)
+        @private_type_class = if '1.8.' == RUBY_VERSION[0..3]
+          ::YAML::PrivateType
+        else
+          ::Syck::PrivateType
+        end
       end
       
       # Array of locales, which has translations in +dir+.
@@ -50,6 +56,17 @@ module R18n
       
       # Return Hash with translations for +locale+.
       def load(locale)
+        if '1.8.' != RUBY_VERSION[0..3] and 'psych' == ::YAML::ENGINE.yamler
+          Filters.by_type.keys.each do |type|
+            next unless type.is_a? String
+            # Yeah, I add R18n’s types to global, send me patch if you really
+            # use YAML types too ;).
+            Psych.add_domain_type('yaml.org,2002', type) do |full_type, value|
+              Typed.new(type, value)
+            end
+          end
+        end
+        
         translations = {}
         Dir.glob(File.join(@dir, "**/#{locale.code.downcase}.yml")).each do |file_name|
           Utils.deep_merge!(translations, ::YAML::load_file(file_name))
@@ -72,7 +89,7 @@ module R18n
         R18n::Utils.hash_map(a_hash) do |key, value|
           [key,
            case value
-             when ::YAML::PrivateType
+             when @private_type_class
                Typed.new(value.type_id, value.value)
              when Hash
                transform(value)

data/locales/bg.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+module R18n
+  class Locales::Bg < Locale
+    set :title => 'Български',
+        
+        :wday_names => %w{Неделя Понеделник Вторник Сряда Четвъртък Петък
+                          Събота},
+        :wday_abbrs => %w{Нед Пон Вто Сря Чет Пет Съб},
+        
+        :month_names => %w{Януари Февруари Март Април Май Юни Юли Август
+                           Септември Октомври Ноември Декември},
+        :month_abbrs => %w{Яну Фев Мар Апр Май Юни Юли Авг Сеп Окт Ное Дек},
+        :month_standalone => %w{Януари Февруари Март Април Май Юни Юли Август
+                           Септември Октомври Ноември Декември},
+        :date_format => '%d.%m.%Y',
+        
+        :number_decimal => ",",
+        :number_group   => " "
+  end
+end

data/locales/en-au.rb

@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), 'en')
+
+module R18n::Locales
+  class EnAu < En
+    set :title => 'Australian English',
+        :code =>  'en-AU',
+        :sublocales => %w{en}
+  end
+end