r18n-core 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21310025f12aa831234a4f23eddea652e16357b2
-  data.tar.gz: 700a86f2ad422cb2d76ab5858e249d82ce26caa4
+  metadata.gz: 7bb0f68d184f4e8e36b9c3b0710b7bcda32e9dbc
+  data.tar.gz: c0e10b3c35f008b31e2d8173bef0047d2c478e6f
 SHA512:
-  metadata.gz: e9dc630d884df4c90641fb60cfc349286dabef359b632b30ddd89822a7910525390c80dc6d8a34ddbbd673a78bdd7f629e818d70f048ed1a9003cf4f77e42b17
-  data.tar.gz: 6aeb004d2b9f6d830d76892bf3d86b8d1562ae24693f1a8b0629e7c93af70e1b74f888e6dfac090f75585916a9399f0aa259501f6719b2502221e5bd02bf04a5
+  metadata.gz: 1f91f3a5de1bf85cabf0b6b6e8b922c0b1458016acde513f805c1d8cd00939170d98be77207975f50d57fe0f092cfad70df2275ffab28e8a56780d141d3aa909
+  data.tar.gz: 074759b4e79f377f18a901eaeaf55f347bc078620349eb68b4aaceb7e54572774c09e74920612cc546c69b25898f0fe214966651083d596b8cfacdf90934b7df

data/ChangeLog.md

@@ -1,3 +1,10 @@
+## 2.1 (Một)
+* Add Vietnamese locale (by Nguyễn Văn Được).
+* Add Persian locale.
+* Allow to change date/time order in locales.
+* Fix pluralization in locales without plural forms.
+* Fix Mongolian base translations.
+
 ## 2.0.4 (Ikkuna)
 * Fix Windows support (by janahanEDH).
 

data/base/fa.yml

@@ -0,0 +1,31 @@
+ok: 'باشه'
+save: 'ذخیر'
+cancel: 'لغو'
+'yes': 'بله'
+'no': 'هیچ'
+exit: 'خروج'
+delete: 'حذف'
+
+human_time:
+  after_days: !!pl
+    1: 'بعد از %1 روز'
+    n: 'پس از %1 روز'
+  tomorrow: 'فردا'
+  after_hours: !!pl
+    1: 'بعد از %1 ساعت'
+    n: 'پس از %1 ساعت'
+  after_minutes: !!pl
+    1: 'بعد از %1 دقیقه'
+    n: 'بپس از %1 دقیقه'
+  now: 'اکنون'
+  today: 'امروز'
+  minutes_ago: !!pl
+    1: '%1 دقیقه قبل'
+    n: '%1 دقیقه پیش'
+  hours_ago: !!pl
+    1: '%1 ساعت پیش'
+    n: '%1 ساعت پیش'
+  yesterday: 'دیروز'
+  days_ago: !!pl
+    1: '%1 روز قبل'
+    n: '%1 روز پیش'

data/base/vi.yml

@@ -0,0 +1,19 @@
+ok: 'OK'
+save: 'Lưu'
+cancel: 'Hủy'
+'yes': 'Đồng ý'
+'no': 'Không'
+exit: 'Thoát'
+delete: 'Xóa'
+
+human_time:
+  after_days: 'Sau %1 ngày'
+  tomorrow: 'ngày mai'
+  after_hours: 'Sau %1 giờ'
+  after_minutes: 'Sau %1 phút'
+  now: 'Ngay bây giờ'
+  today: 'ngày hôm nay'
+  minutes_ago: '%1 phút trước'
+  hours_ago: '%1 giờ trước'
+  yesterday: 'ngày hôm qua'
+  days_ago: '%1 ngày trước'

data/lib/r18n-core/locale.rb

@@ -115,7 +115,7 @@ module R18n
         week_start:  :monday,
         time_am:     'AM',
         time_pm:     'PM',
-        time_format: ' %H:%M',
+        time_format: '_ %H:%M',
         full_format: '%e %B',
         year_format: '_ %Y'
 
@@ -215,9 +215,9 @@ module R18n
       time.strftime(translated)
     end
 
-    # Format +time+ without date. For example, “12:59”.
-    def format_time(time)
-      strftime(time, time_format)
+    # Format +time+ and set +date+
+    def format_time(date, time)
+      strftime(time, time_format).sub('_', date.to_s)
     end
 
     # Format +time+ in human usable form. For example “5 minutes ago” or
@@ -227,7 +227,7 @@ module R18n
       minutes = (time - now) / 60.0
       diff = minutes.abs
       if (diff > 24 * 60) or (time.mday != now.mday and diff > 12 * 24)
-        format_date_human(time.to_date, i18n, now.to_date) + format_time(time)
+        format_time(format_date_human(time.to_date, i18n, now.to_date), time)
       else
         if -1 < minutes and 1 > minutes
           i18n.human_time.now
@@ -245,13 +245,13 @@ module R18n
 
     # Format +time+ in compact form. For example, “12/31/09 12:59”.
     def format_time_standard(time, *params)
-      format_date_standard(time) + format_time(time)
+      format_time(format_date_standard(time), time)
     end
 
     # Format +time+ in most official form. For example, “December 31st, 2009
     # 12:59”. For special cases you can replace it in locale’s class.
     def format_time_full(time, *params)
-      format_date_full(time) + format_time(time)
+      format_time(format_date_full(time), time)
     end
 
     # Format +date+ in human usable form. For example “5 days ago” or

data/lib/r18n-core/version.rb

@@ -1,3 +1,3 @@
 module R18n
-  VERSION = '2.0.4'.freeze unless defined? R18n::VERSION
+  VERSION = '2.1.0'.freeze unless defined? R18n::VERSION
 end

data/locales/bg.rb

@@ -12,7 +12,7 @@ module R18n
                              Септември Октомври Ноември Декември},
         date_format: '%d.%m.%Y',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
   end
 end

data/locales/ca.rb

@@ -15,7 +15,7 @@ module R18n
         full_format: '%d de %B',
         year_format: '_ de %Y',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/cs.rb

@@ -17,8 +17,8 @@ module R18n
         date_format: '%e. %m. %Y',
         full_format: '%e. %B',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
 
     def pluralize(n)
       case n

data/locales/da.rb

@@ -15,7 +15,7 @@ module R18n
         date_format: '%d.%m.%Y',
         full_format: '%d. %B %Y',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/de.rb

@@ -16,7 +16,7 @@ module R18n
         date_format: '%d.%m.%Y',
         full_format: '%e. %B',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/en-us.rb

@@ -5,7 +5,7 @@ module R18n::Locales
     set title: 'American English',
         sublocales: %w{en},
 
-        time_format: ' %I:%M %p',
+        time_format: '_ %I:%M %p',
         date_format: '%m/%d/%Y',
         full_format: '%B %e'
   end

data/locales/en.rb

@@ -16,8 +16,8 @@ module R18n
         full_format: '%e of %B',
         year_format: '_, %Y',
 
-        number_decimal: ".",
-        number_group:   ","
+        number_decimal: '.',
+        number_group:   ','
 
     def ordinalize(n)
       if (11..13).include?(n % 100)

data/locales/eo.rb

@@ -13,7 +13,7 @@ module R18n
         full_format: 'la %e-a de %B',
         year_format: '_ de %Y',
 
-        number_decimal: ".",
-        number_group:   " "
+        number_decimal: '.',
+        number_group:   ' '
   end
 end

data/locales/es-us.rb

@@ -8,7 +8,7 @@ module R18n::Locales
         time_format: ' %I:%M %p',
         date_format: '%m/%d/%Y',
 
-        number_decimal: ".",
-        number_group:   ","
+        number_decimal: '.',
+        number_group:   ','
   end
 end

data/locales/es.rb

@@ -13,7 +13,7 @@ module R18n
         full_format: '%d de %B',
         year_format: '_ de %Y',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/fa.rb

@@ -0,0 +1,50 @@
+module R18n
+  class Locales::Fa < Locale
+    set title: 'فارْسِى',
+
+      wday_names: %w{یکشنبه دوشنبه سه‌شنبه چهارشنبه پنج‌شنبه جمعه شنبه},
+        wday_abbrs: %w{ی د س چ پ ج ش},
+
+        month_names: %w{ژانویه فوریه مارس آوریل مه ژوئن ژوئیه اوت سپتامبر اکتبر نوامبر دسامبر},
+        month_abbrs: %w{ژانویه فوریه مارس آوریل مه ژوئن ژوئیه اوت سپتامبر اکتبر نوامبر دسامبر},
+
+        date_format: '%Y/%m/%d',
+        full_format: '%e %B',
+        year_format: '_ %Y',
+
+        number_decimal: '٫',
+        number_group:   '٬'
+
+    # Change direction
+    def ltr?; false; end
+
+    # Change numerals to Persian
+    def format_integer(integer)
+      persian_numerals super
+    end
+
+    # Change numerals to Persian
+    def format_float(integer)
+      persian_numerals super
+    end
+
+    # Change numerals to Persian
+    def strftime(time, format)
+      persian_numerals super
+    end
+
+    # Replace western numerals to Persian
+    def persian_numerals(str)
+      str.gsub('0', '۰')
+         .gsub('1', '۱')
+         .gsub('2', '۲')
+         .gsub('3', '۳')
+         .gsub('4', '۴')
+         .gsub('5', '۵')
+         .gsub('6', '۶')
+         .gsub('7', '۷')
+         .gsub('8', '۸')
+         .gsub('9', '۹')
+    end
+  end
+end

data/locales/fi.rb

@@ -15,14 +15,14 @@ module R18n
                              marraskuu joulukuu},
 
         date_format: '%d.%m.%Y',
-        time_format: ' %H.%M',
         full_format: '%e. %B',
+        time_format: '_ %H.%M',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ''
 
     def format_time_full(time, *params)
-      format_date_full(time) + ' kello' + format_time(time)
+      format_time(format_date_full(time) + ' kello', time)
     end
   end
 end

data/locales/fr.rb

@@ -13,8 +13,8 @@ module R18n
 
         date_format: '%d/%m/%Y',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
 
     def format_date_full(date, year = true, *params)
       full = super(date, year)

data/locales/gl.rb

@@ -14,7 +14,7 @@ module R18n
         full_format: '%d de %B',
         year_format: '_ de %Y',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/hr.rb

@@ -14,8 +14,8 @@ module R18n
         date_format: '%d.%m.%Y',
         full_format: '%e. %B',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
 
     def pluralize(n)
       if 0 == n

data/locales/hu.rb

@@ -13,9 +13,14 @@ module R18n
         date_format: '%Y. %m. %d.',
         full_format: '%B %e.',
         year_format: '%Y. _',
+        time_format: '_, %H:%M',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
+
+    def pluralize(n)
+      'n'
+    end
 
     def format_integer(integer)
       str = integer.to_s
@@ -32,13 +37,5 @@ module R18n
         str
       end
     end
-
-    def format_time_standard(time, *params)
-      format_date_standard(time) + ',' + format_time(time)
-    end
-
-    def format_time_full(time, *params)
-      format_date_full(time) + ',' + format_time(time)
-    end
   end
 end

data/locales/id.rb

@@ -11,7 +11,7 @@ module R18n
 
         date_format: '%d/%m/%Y',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/it.rb

@@ -12,13 +12,13 @@ module R18n
 
         date_format: '%d/%m/%Y',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
 
     def format_date_full(date, year = true, *params)
       full = super(date, year)
       if ' 1' == full[0..1]
-        "1º" + full[2..-1]
+        '1º' + full[2..-1]
       else
         full
       end

data/locales/ja.rb

@@ -13,7 +13,11 @@ module R18n
         full_format: '%m月%d日',
         year_format: '%Y年_',
 
-        number_decimal: ".",
-        number_group:   ","
+        number_decimal: '.',
+        number_group:   ','
+
+    def pluralize(n)
+      'n'
+    end
   end
 end

data/locales/kk.rb

@@ -18,7 +18,7 @@ module R18n
         full_format: '%B %e-і',
         year_format: '%Y жылы _',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
   end
 end

data/locales/lv.rb

@@ -18,8 +18,8 @@ module R18n
         full_format: '%e.%B',
         year_format: '%Y.gada _',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
 
     def pluralize(n)
       if 0 == n

data/locales/mn.rb

@@ -14,7 +14,7 @@ module R18n
 
         date_format: '%Y-%m-%d',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/nb.rb

@@ -14,7 +14,7 @@ module R18n
         date_format: '%d.%m.%Y',
         full_format: '%e. %B %Y',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
   end
 end

data/locales/nl.rb

@@ -15,7 +15,7 @@ module R18n
         date_format: '%d-%m-%Y',
         full_format: '%e %B',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/no.rb

@@ -14,7 +14,7 @@ module R18n
         date_format: '%d.%m.%Y',
         full_format: '%e. %B %Y',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
   end
 end

data/locales/pl.rb

@@ -15,8 +15,8 @@ module R18n
 
         date_format: '%d.%m.%Y',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
 
     def pluralize(n)
       return 0 if n == 0

data/locales/pt.rb

@@ -16,7 +16,7 @@ module R18n
         full_format: '%d de %B',
         year_format: '_ de %Y',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/ru.rb

@@ -16,8 +16,8 @@ module R18n
         time_pm:     ' вечера',
         date_format: '%d.%m.%Y',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
 
     def pluralize(n)
       if 0 == n

data/locales/sk.rb

@@ -17,8 +17,8 @@ module R18n
         date_format: '%d.%m.%Y',
         full_format: '%e. %B',
 
-        number_decimal: ",",
-        number_group:   " "
+        number_decimal: ',',
+        number_group:   ' '
 
     def pluralize(n)
       case n
@@ -34,4 +34,3 @@ module R18n
     end
   end
 end
-

data/locales/sr-latn.rb

@@ -14,8 +14,8 @@ module R18n
         date_format: '%d.%m.%Y',
         full_format: '%e. %B',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
 
     def pluralize(n)
       if 0 == n

data/locales/sv-se.rb

@@ -13,7 +13,7 @@ module R18n
         date_format: '%Y-%m-%d',
         full_format: '%e %B %Y',
 
-        number_decimal: ",",
-        number_group:   "."
+        number_decimal: ',',
+        number_group:   '.'
   end
 end

data/locales/th.rb

@@ -15,8 +15,12 @@ module R18n
       full_format: '%e %B',
       year_format: '_, %Y',
 
-      number_decimal: ".",
-      number_group:   ","
+      number_decimal: '.',
+      number_group:   ','
+
+    def pluralize(n)
+      'n'
+    end
 
     def strftime(time, format)
       year = (time.year + 543).to_s

data/locales/tr.rb

@@ -12,9 +12,13 @@ module R18n
         date_format: '%d.%m.%Y',
         full_format: '%B %e.',
         year_format: '%Y. _',
-        time_format: '%H:%M',
+        time_format: '_%H:%M',
 
-        number_decimal: ".",
-        number_group:   ","
+        number_decimal: '.',
+        number_group:   ','
+
+    def pluralize(n)
+      'n'
+    end
   end
 end

data/locales/vi.rb

@@ -0,0 +1,26 @@
+module R18n
+  class Locales::Vi < Locale
+    set title: 'Tiếng Việt',
+
+        wday_names: ['Chủ nhật', 'Thứ Hai', 'Thứ Ba', 'Thứ Tư', 'Thứ Năm',
+                     'Thứ Sáu', 'Thứ Bảy'],
+        wday_abbrs: %w{CN T2 T3 T4 T5 T6 T7},
+
+        month_names: ['tháng 1', 'tháng 2', 'tháng 3', 'tháng 4', 'tháng 5',
+                      'tháng 6', 'tháng 7', 'tháng 8',' tháng 9', 'tháng 10',
+                      'tháng 11', 'tháng 12'],
+        month_abbrs: %w{th1 th2 th3 th4 th5 th6 th7 th8 th9 th10 th11 th12},
+
+        date_format: '%d/%m/%Y',
+        full_format: 'ngày %e %B',
+        year_format: '_ năm %Y',
+        time_format: '%H:%M, _',
+
+        number_decimal: '.',
+        number_group:   ','
+
+    def pluralize(n)
+      'n'
+    end
+  end
+end

data/locales/zh.rb

@@ -12,7 +12,11 @@ module R18n
         full_format: '%m月%d日',
         year_format: '%Y年_',
 
-        number_decimal: ".",
-        number_group:   " "
+        number_decimal: '.',
+        number_group:   ' '
+
+      def pluralize(n)
+        'n'
+      end
   end
 end

data/spec/locales/fa_spec.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe R18n::Locales::Fa do
+  it "formats Persian numerals" do
+    fa = R18n::I18n.new('fa')
+    expect(fa.l(1234567890)).to eq('۱٬۲۳۴٬۵۶۷٬۸۹۰')
+    expect(fa.l(10.123)).to eq('۱۰٫۱۲۳')
+    expect(fa.l(Date.parse('2009-05-01'))).to eq('۲۰۰۹/۰۵/۰۱')
+  end
+end

data/spec/locales/th_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
-describe R18n::Locales::Ru do
+describe R18n::Locales::Th do
   it "uses Thai calendar" do
     th = R18n::I18n.new('th')
     expect(th.l(Time.at(0).utc, '%Y %y')).to eq('2513 13')

data/spec/locales/vi_spec.rb

@@ -0,0 +1,8 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe R18n::Locales::Vi do
+  it "change times position" do
+    th = R18n::I18n.new('vi')
+    expect(th.l(Time.at(0).utc)).to eq('00:00, 01/01/1970')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies: []
 description: |2
       R18n is a i18n tool to translate your Ruby application.
@@ -37,6 +37,7 @@ files:
 - base/en.yml
 - base/eo.yml
 - base/es.yml
+- base/fa.yml
 - base/fi.yml
 - base/fr.yml
 - base/gl.yml
@@ -47,7 +48,7 @@ files:
 - base/ja.yml
 - base/kk.yml
 - base/lv.yml
-- base/mn.rb
+- base/mn.yml
 - base/nb.yml
 - base/nl.yml
 - base/pl.yml
@@ -59,6 +60,7 @@ files:
 - base/th.yml
 - base/tr.yml
 - base/uk.yml
+- base/vi.yml
 - base/zh.yml
 - lib/r18n-core.rb
 - lib/r18n-core/filter_list.rb
@@ -87,6 +89,7 @@ files:
 - locales/eo.rb
 - locales/es-us.rb
 - locales/es.rb
+- locales/fa.rb
 - locales/fi.rb
 - locales/fr.rb
 - locales/gl.rb
@@ -111,6 +114,7 @@ files:
 - locales/th.rb
 - locales/tr.rb
 - locales/uk.rb
+- locales/vi.rb
 - locales/zh-cn.rb
 - locales/zh-tw.rb
 - locales/zh.rb
@@ -121,6 +125,7 @@ files:
 - spec/locales/cs_spec.rb
 - spec/locales/en-us_spec.rb
 - spec/locales/en_spec.rb
+- spec/locales/fa_spec.rb
 - spec/locales/fr_spec.rb
 - spec/locales/hu_spec.rb
 - spec/locales/it_spec.rb
@@ -128,6 +133,7 @@ files:
 - spec/locales/ru_spec.rb
 - spec/locales/sk_spec.rb
 - spec/locales/th_spec.rb
+- spec/locales/vi_spec.rb
 - spec/r18n_spec.rb
 - spec/spec_helper.rb
 - spec/translated_spec.rb
@@ -172,6 +178,7 @@ test_files:
 - spec/locales/cs_spec.rb
 - spec/locales/en-us_spec.rb
 - spec/locales/en_spec.rb
+- spec/locales/fa_spec.rb
 - spec/locales/fr_spec.rb
 - spec/locales/hu_spec.rb
 - spec/locales/it_spec.rb
@@ -179,6 +186,7 @@ test_files:
 - spec/locales/ru_spec.rb
 - spec/locales/sk_spec.rb
 - spec/locales/th_spec.rb
+- spec/locales/vi_spec.rb
 - spec/r18n_spec.rb
 - spec/spec_helper.rb
 - spec/translated_spec.rb