r18n-core 1.1.11 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b47c07c8bd6ee5322233ea9ab8fd2e6f62096a06
-  data.tar.gz: 72b876e87382bc4132952244b0dfe0083a9d91b0
+  metadata.gz: b02d3737730702d611d4ae58c955c6a8ada010ec
+  data.tar.gz: 6cd70b7df39a5d1e88e7931d9987d3b81cae309c
 SHA512:
-  metadata.gz: a0e8a7e05839673279849b8bb25d93fe9c7df0fe96232a22a87b711c0db544fbe57e7da969482c4e6c21197730cca31fbd75a38bb511654c12a076a712dd1974
-  data.tar.gz: 49db67bdbfbaf93250812bf283ae59e7f36a5a5203a476f0009275dcf48dec6102773df063e4e8af68d996da5286d80e2cfbcf70b887bfcde42afc6fcc7674d4
+  metadata.gz: 7d9c896e1da05e05b004070f78ca2f659216e13b3d4c14e9fb3b6deefab72ed3c950eb3e3d08d7d38dd62edf159c7294047e4d561c21de624734e78f3a710772
+  data.tar.gz: de05088818bf8af4f7919323cb73db54b7b3dc2283b257f961303d972f8ae1bafdbf8fd0395ce86616576d812e83025a23bcea3e8a6a98e997483e76c7e5bbc7

data/ChangeLog.md

@@ -1,3 +1,7 @@
+## 2.0.0 (Москва)
+* Remove Ruby 1.8 and 1.9 support.
+* Add JRuby 9000 support.
+
 ### 1.1.11 (São Paulo)
 * Allow to set Proc as `default` option in Rails I18n backend.
 

data/README.md

@@ -194,7 +194,7 @@ To create a filter you pass the following to `R18n::Filters.add`:
   `R18n::Filters.off`, `R18n::Filters.on` and
   `R18n::Filters.delete`.
 * Hash with options:
-  * `:passive => true` to filter translations only on load;
+  * `passive: true` to filter translations only on load;
   * `:position` within the list of current filters of this type
     (by default a new filter will be inserted into last position).
 
@@ -261,7 +261,7 @@ to use your own parser:
 # Disable standard Markdown filter
 Filters.off(:kramdown)
 # Add new filter for !!markdown YAML type
-Filters.add('markdown', :passive => true) do |content, config|
+Filters.add('markdown', passive: true) do |content, config|
   require 'redcarpet'
   markdown = ::Redcarpet::Markdown.new(Redcarpet::Render::HTML)
   markdown.render(content)

data/lib/r18n-core/filter_list.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Filters for translations content.
 
@@ -24,7 +23,7 @@ module R18n
   class FilterList
     # Process +value+ by filters in +enabled+.
     def process(filters_type, type, value, locale, path, params)
-      config = { :locale => locale, :path => path }
+      config = { locale: locale, path: path }
 
       enabled(filters_type, type).each do |filter|
         value = filter.call(value, config, *params)
@@ -51,7 +50,7 @@ module R18n
     # Process +value+ by global filters in +enabled+.
     def process_string(filters_type, value, config, params)
       if config.is_a? String
-        config = { :locale => value.locale, :path => config }
+        config = { locale: value.locale, path: config }
       end
       enabled(filters_type, String).each do |f|
         value = f.call(value, config, *params)

data/lib/r18n-core/filters.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Filters for translations content.
 
@@ -36,7 +35,7 @@ module R18n
   #   R18n::Filters.add('custom_type', :no_space) do |content, config, replace|
   #     content.gsub(' ', replace)
   #   end
-  #   R18n::Filters.add('custom_type', :passive => true) do |content, config|
+  #   R18n::Filters.add('custom_type', passive: true) do |content, config|
   #     content + '!'
   #   end
   #
@@ -76,8 +75,8 @@ module R18n
   #
   # You can enabled/disabled filters only for special I18n object:
   #
-  #   R18n::I18n.new('en', nil, :on_filters  => [:untranslated_html, :no_space],
-  #                             :off_filters => :untranslated )
+  #   R18n::I18n.new('en', nil, on_filters: [:untranslated_html, :no_space],
+  #                             off_filters: :untranslated )
   module Filters
     class << self
       # Hash of filter names to Filters.
@@ -225,7 +224,7 @@ module R18n
       content[type]
     else
       UnpluralizetedTranslation.new(config[:locale], config[:path],
-        :locale => config[:locale], :translations => content)
+        locale: config[:locale], translations: content)
     end
   end
 
@@ -270,18 +269,18 @@ module R18n
   end
   Filters.off(:untranslated_html)
 
-  Filters.add('escape', :escape_html, :passive => true) do |content, config|
+  Filters.add('escape', :escape_html, passive: true) do |content, config|
     config[:dont_escape_html] = true
     Utils.escape_html(content)
   end
 
-  Filters.add('html', :dont_escape_html, :passive => true) do |content, config|
+  Filters.add('html', :dont_escape_html, passive: true) do |content, config|
     config[:dont_escape_html] = true
     content
   end
 
   Filters.add([String, 'markdown', 'textile'],
-              :global_escape_html, :passive => true) do |html, config|
+              :global_escape_html, passive: true) do |html, config|
     if config[:dont_escape_html]
       html
     else
@@ -291,12 +290,12 @@ module R18n
   end
   Filters.off(:global_escape_html)
 
-  Filters.add('markdown', :kramdown, :passive => true) do |content, config|
+  Filters.add('markdown', :kramdown, passive: true) do |content, config|
     require 'kramdown'
     ::Kramdown::Document.new(content).to_html
   end
 
-  Filters.add('textile', :redcloth, :passive => true) do |content, config|
+  Filters.add('textile', :redcloth, passive: true) do |content, config|
     require 'redcloth'
     ::RedCloth.new(content).to_html
   end

data/lib/r18n-core/helpers.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Mixin with common methods.
 

data/lib/r18n-core/i18n.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 I18n support.
 
@@ -226,7 +225,7 @@ module R18n
         end
       end
 
-      @translation = Translation.new(@locale, '', :filters => @filters)
+      @translation = Translation.new(@locale, '', filters: @filters)
       @locales.each do |locale|
         loaded = false
         available_in_places.each do |place, available|

data/lib/r18n-core/locale.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Locale to i18n support.
 
@@ -92,8 +91,8 @@ module R18n
     # name, which return propetry value:
     #
     #   class R18n::Locales::En < R18n::Locale
-    #     set :title => 'English',
-    #         :code  => 'en'
+    #     set title: 'English',
+    #         code:  'en'
     #   end
     #
     #   locale = R18n::Locales::En.new
@@ -112,13 +111,13 @@ module R18n
       lang.downcase + (culture ? '-' + culture.upcase : '')
     end
 
-    set :sublocales => %w{en},
-        :week_start => :monday,
-        :time_am => 'AM',
-        :time_pm => 'PM',
-        :time_format => ' %H:%M',
-        :full_format => '%e %B',
-        :year_format => '_ %Y'
+    set sublocales:  %w{en},
+        week_start:  :monday,
+        time_am:     'AM',
+        time_pm:     'PM',
+        time_format: ' %H:%M',
+        full_format: '%e %B',
+        year_format: '_ %Y'
 
     def month_standalone; month_names; end
     def month_abbrs;      month_names; end
@@ -228,8 +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(R18n::Utils.to_date(time), i18n,
-                          R18n::Utils.to_date(now)) + format_time(time)
+        format_date_human(time.to_date, i18n, now.to_date) + format_time(time)
       else
         if -1 < minutes and 1 > minutes
           i18n.human_time.now

data/lib/r18n-core/translated.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Add i18n support to any class.
 
@@ -75,7 +74,7 @@ module R18n
   #
   # Method +translation+ will be more useful for options:
   #
-  #   translation :title, :methods => {:ru => :russian, :en => :english}
+  #   translation :title, methods: { ru: :russian, en: :english}
   module Translated
     class << self
       def included(base) #:nodoc:
@@ -100,7 +99,7 @@ module R18n
       # Add several proxy +methods+. See R18n::Translated for description.
       # It’s more compact, that +translation+.
       #
-      #   translations :title, :keywords, [:desciption, {:type => 'markdown'}]
+      #   translations :title, :keywords, [:desciption, { type: 'markdown' }]
       def translations(*methods)
         methods.each do |method|
           translation(*method)
@@ -110,7 +109,7 @@ module R18n
       # Add proxy-method +name+. See R18n::Translated for description.
       # It’s more useful to set options.
       #
-      #   translation :desciption, :type => 'markdown'
+      #   translation :desciption, type: 'markdown'
       def translation(name, options = {})
         if options[:methods]
           @unlocalized_getters[name] = R18n::Utils.

data/lib/r18n-core/translated_string.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Translation string for i18n support.
 

data/lib/r18n-core/translation.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Translation to i18n support.
 
@@ -90,9 +89,9 @@ module R18n
           case value
           when Hash
             value = Translation.new(@locale, path,
-              :locale => locale, :translations => value, :filters => @filters)
+              locale: locale, translations: value, filters: @filters)
           when String
-            c = { :locale => locale, :path => path }
+            c = { locale: locale, path: path }
             v = @filters.process_string(:passive, value, c, [])
             value = TranslatedString.new(v, locale, path, @filters)
           when Typed

data/lib/r18n-core/unsupported_locale.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Locale withou information file to i18n support.
 

data/lib/r18n-core/untranslated.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Untranslation string for i18n support.
 

data/lib/r18n-core/utils.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Common methods for i18n support.
 
@@ -21,16 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Common methods for another R18n code.
 module R18n
   module Utils
-    # Convert Time to Date. Backport from Ruby 1.9.
-    def self.to_date(time)
-      if '1.8.' == RUBY_VERSION[0..3]
-        d = Date.send(:civil_to_jd, time.year, time.mon, time.mday, Date::ITALY)
-        Date.new!(Date.send(:jd_to_ajd, d, 0, 0), 0, Date::ITALY)
-      else
-        time.to_date
-      end
-    end
-
     HTML_ENTRIES = { '&' => '&amp;', '<' => '&lt;', '>' => '&gt;' }
 
     # Escape HTML entries (<, >, &). Copy from HAML helper.

data/lib/r18n-core/version.rb

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

data/lib/r18n-core/yaml_loader.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Loader for YAML translations.
 

data/lib/r18n-core/yaml_methods.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Base methods to load translations for YAML.
 
@@ -19,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
 require 'yaml'
-require 'yecht' if RUBY_PLATFORM == 'java'
 
 module R18n
   # Base methods to load translations for YAML.
@@ -27,18 +25,14 @@ module R18n
   module YamlMethods
     # Detect class for private type depend on YAML parser.
     def detect_yaml_private_type
-      @private_type_class = if defined?(JRUBY_VERSION)
-        ::YAML::Yecht::PrivateType
-      elsif '1.8.' == RUBY_VERSION[0..3]
-        ::YAML::PrivateType
-      elsif 'syck' == ::YAML::ENGINE.yamler
+      @private_type_class = if defined?(Syck)
         ::Syck::PrivateType
       end
     end
 
     # Register global types in Psych
     def initialize_types
-      if '1.8.' != RUBY_VERSION[0..3] and 'psych' == ::YAML::ENGINE.yamler
+      if defined?(Psych)
         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

data/lib/r18n-core.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Main file to load all neccessary classes for i18n support.
 
@@ -18,8 +17,6 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-$KCODE = 'u' if '1.8.' == RUBY_VERSION[0..3]
-
 require 'pathname'
 
 dir = Pathname(__FILE__).dirname.expand_path + 'r18n-core'

data/locales/bg.rb

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

data/locales/ca.rb

@@ -1,22 +1,21 @@
-# encoding: utf-8
 module R18n
   class Locales::Ca < Locale
-    set :title => 'Català',
-        :sublocales => %w{es en},
+    set title:  'Català',
+        sublocales: %w{es en},
 
-        :wday_names => %w{diumenge dilluns dimarts dimecres dijous divendres
-                          dissabte},
-        :wday_abbrs => %w{dg dl dm dc dj dv ds},
+        wday_names: %w{diumenge dilluns dimarts dimecres dijous divendres
+                       dissabte},
+        wday_abbrs: %w{dg dl dm dc dj dv ds},
 
-        :month_names => %w{Gener Febrer Març Abril Maig Juny Juliol Agost
-                           Setembre Octubre Novembre Desembre},
-        :month_abbrs => %w{gen feb mar abr mai jun jul ago set oct nov des},
+        month_names: %w{Gener Febrer Març Abril Maig Juny Juliol Agost
+                        Setembre Octubre Novembre Desembre},
+        month_abbrs: %w{gen feb mar abr mai jun jul ago set oct nov des},
 
-        :date_format => '%d/%m/%Y',
-        :full_format => '%d de %B',
-        :year_format => '_ de %Y',
+        date_format: '%d/%m/%Y',
+        full_format: '%d de %B',
+        year_format: '_ de %Y',
 
-        :number_decimal => ",",
-        :number_group   => "."
+        number_decimal: ",",
+        number_group:   "."
   end
 end

data/locales/cs.rb

@@ -1,25 +1,24 @@
-# encoding: utf-8
 module R18n
   class Locales::Cs < Locale
-    set :title => 'Český',
-        :sublocales => %w{cz sk en},
+    set title: 'Český',
+        sublocales: %w{cz sk en},
 
-        :wday_names => %w{Neděle Pondělí Úterý Středa Čtvrtek Pátek Sobota},
-        :wday_abbrs => %w{Ne Po Út St Čt Pá So},
+        wday_names: %w{Neděle Pondělí Úterý Středa Čtvrtek Pátek Sobota},
+        wday_abbrs: %w{Ne Po Út St Čt Pá So},
 
-        :month_names => %w{ledna února března dubna května června července srpna
-                           září října listopadu prosince},
-        :month_abbrs => %w{led úno bře dub kvě čer čvc srp zář říj lis pro},
-        :month_standalone => %w{Leden Únor Březen Duben Květen Červen Červenec
-                                Srpen Září Říjen Listopad Prosinec},
+        month_names: %w{ledna února března dubna května června července srpna
+                        září října listopadu prosince},
+        month_abbrs: %w{led úno bře dub kvě čer čvc srp zář říj lis pro},
+        month_standalone: %w{Leden Únor Březen Duben Květen Červen Červenec
+                             Srpen Září Říjen Listopad Prosinec},
 
-        :time_am => 'dop.',
-        :time_pm => 'odp.',
-        :date_format => '%e. %m. %Y',
-        :full_format => '%e. %B',
+        time_am:     'dop.',
+        time_pm:     'odp.',
+        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

@@ -1,23 +1,21 @@
-# encoding: utf-8
 module R18n
   class Locales::Da < Locale
-    set :title => 'Dansk',
+    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},
+        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.},
+        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',
+        time_am:     'om formiddagen',
+        time_pm:     'om eftermiddagen',
+        date_format: '%d.%m.%Y',
+        full_format: '%d. %B %Y',
 
-        :number_decimal => ",",
-        :number_group   => "."
+        number_decimal: ",",
+        number_group:   "."
   end
 end

data/locales/de.rb

@@ -1,23 +1,22 @@
-# encoding: utf-8
 module R18n
   class Locales::De < Locale
-    set :title => 'Deutsch',
+    set title: 'Deutsch',
 
-        :wday_names => %w{Sonntag Montag Dienstag Mittwoch Donnerstag Freitag
-                          Samstag},
-        :wday_abbrs => %w{So Mo Di Mi Do Fr Sa},
+        wday_names: %w{Sonntag Montag Dienstag Mittwoch Donnerstag Freitag
+                       Samstag},
+        wday_abbrs: %w{So Mo Di Mi Do Fr Sa},
 
-        :month_names => %w{Januar Februar März April Mai Juni Juli August
-                           September Oktober November Dezember},
-        :month_abbrs => %w{Jan. Feb. Mär. Apr. Mai. Jun. Jul. Aug. Sep. Okt.
-                           Nov. Dez.},
+        month_names: %w{Januar Februar März April Mai Juni Juli August
+                        September Oktober November Dezember},
+        month_abbrs: %w{Jan. Feb. Mär. Apr. Mai. Jun. Jul. Aug. Sep. Okt.
+                        Nov. Dez.},
 
-        :time_am => 'vormittags',
-        :time_pm => 'nachmittags',
-        :date_format => '%d.%m.%Y',
-        :full_format => '%e. %B',
+        time_am:     'vormittags',
+        time_pm:     'nachmittags',
+        date_format: '%d.%m.%Y',
+        full_format: '%e. %B',
 
-        :number_decimal => ",",
-        :number_group   => "."
+        number_decimal: ",",
+        number_group:   "."
   end
 end

data/locales/en-au.rb

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

data/locales/en-gb.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'en')
 
 module R18n::Locales
   class EnGb < En
-    set :title => 'British English',
-        :sublocales => %w{en}
+    set title: 'British English',
+        sublocales: %w{en}
   end
 end

data/locales/en-us.rb

@@ -1,14 +1,12 @@
-# encoding: utf-8
-
 require File.join(File.dirname(__FILE__), 'en')
 
 module R18n::Locales
   class EnUs < En
-    set :title => 'American English',
-        :sublocales => %w{en},
+    set title: 'American English',
+        sublocales: %w{en},
 
-        :time_format => ' %I:%M %p',
-        :date_format => '%m/%d/%Y',
-        :full_format => '%B %e'
+        time_format: ' %I:%M %p',
+        date_format: '%m/%d/%Y',
+        full_format: '%B %e'
   end
 end

data/locales/en.rb

@@ -1,23 +1,23 @@
 module R18n
   class Locales::En < Locale
-    set :title => 'English',
-        :sublocales => [],
+    set title: 'English',
+        sublocales: [],
 
-        :week_start => :sunday,
-        :wday_names => %w{Sunday Monday Tuesday Wednesday Thursday Friday
-                          Saturday},
-        :wday_abbrs => %w{Sun Mon Tue Wed Thu Fri Sat},
+        week_start: :sunday,
+        wday_names: %w{Sunday Monday Tuesday Wednesday Thursday Friday
+                       Saturday},
+        wday_abbrs: %w{Sun Mon Tue Wed Thu Fri Sat},
 
-        :month_names => %w{January February March April May June July August
-                           September October November December},
-        :month_abbrs => %w{Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec},
+        month_names: %w{January February March April May June July August
+                        September October November December},
+        month_abbrs: %w{Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec},
 
-        :date_format => '%d/%m/%Y',
-        :full_format => '%e of %B',
-        :year_format => '_, %Y',
+        date_format: '%d/%m/%Y',
+        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)