r18n-core 1.1.3 → 1.1.4

data/.rspec

@@ -1 +1 @@
---format documentation --colour
+--format documentation --colour

data/ChangeLog

@@ -1,3 +1,8 @@
+== 1.1.4 (Bokmål)
+* Add Norwegian “no” locale as gateway to Bokmål or Nynorsk.
+* Fix Norwegian Bokmål locale code.
+* Fix hungarian time format (Kővágó Zoltán).
+
 == 1.1.3 (Saint Petersburg)
 * Fix memory leak from cache key missmatch in Rails plugin (by silentshade).
 

data/Rakefile

@@ -16,11 +16,6 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
 
-task :spec_syck do
-  ENV['test_syck'] = '1'
-  Rake::Task['spec'].execute
-end
-
 require 'yard'
 YARD::Rake::YardocTask.new do |yard|
   yard.options << "--title='R18n #{R18n::VERSION}'"

data/lib/r18n-core/filters.rb

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

data/lib/r18n-core/utils.rb

@@ -65,21 +65,5 @@ 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 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
-        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 = '1.1.3'.freeze unless defined? R18n::VERSION
+  VERSION = '1.1.4'.freeze unless defined? R18n::VERSION
 end

data/lib/r18n-core/yaml_methods.rb

@@ -49,6 +49,5 @@ module R18n
         end
       end
     end
-
   end
 end

data/locales/en.rb

@@ -27,7 +27,7 @@ module R18n
         when 1; "#{n}st"
         when 2; "#{n}nd"
         when 3; "#{n}rd"
-        else "#{n}th"
+        else    "#{n}th"
         end
       end
     end

data/locales/hu.rb

@@ -14,7 +14,6 @@ module R18n
         :date_format => '%Y. %m. %d.',
         :full_format => '%B %e.',
         :year_format => '%Y. _',
-        :time_format => '%H:%M',
 
         :number_decimal => ",",
         :number_group   => " "
@@ -36,11 +35,11 @@ module R18n
     end
 
     def format_time_standard(time, *params)
-      format_date_standard(time) + ', ' + format_time(time)
+      format_date_standard(time) + ',' + format_time(time)
     end
 
     def format_time_full(time, *params)
-      format_date_full(time) + ', ' + format_time(time)
+      format_date_full(time) + ',' + format_time(time)
     end
   end
 end

data/locales/{nb-no.rb → nb.rb}

@@ -1,8 +1,8 @@
 #encoding: utf-8
 module R18n
-  class Locales::NbNo < Locale
-    set :title => 'Norsk', #Bokmål
-        :sublocales => %w{no nn-NO en},
+  class Locales::Nb < Locale
+    set :title => 'Norsk (bokmål)',
+        :sublocales => %w{no nn en},
 
         :week_start => :monday,
         :wday_names => %w{søndag mandag tirsdag onsdag torsdag fredag lørdag},
@@ -16,6 +16,6 @@ module R18n
         :full_format => '%e. %B %Y',
 
         :number_decimal => ",",
-        :number_group =>   " "
+        :number_group   => " "
   end
 end

data/locales/no.rb

@@ -0,0 +1,21 @@
+#encoding: utf-8
+module R18n
+  class Locales::No < Locale
+    set :title => 'Norsk',
+        :sublocales => %w{nb nn en},
+
+        :week_start => :monday,
+        :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 mars april mai juni juli august
+                           september oktober november desember},
+        :month_abbrs => %w{jan feb mar apr mai jun jul aug sep okt nov des},
+
+        :date_format => '%d.%m.%Y',
+        :full_format => '%e. %B %Y',
+
+        :number_decimal => ",",
+        :number_group   => " "
+  end
+end

data/spec/filters_spec.rb

@@ -164,7 +164,7 @@ describe R18n::Filters do
   end
 
   it "should pluralize translation without locale" do
-    i18n = R18n::I18n.new('no-LC', DIR)
+    i18n = R18n::I18n.new('nolocale', DIR)
     i18n.entries(1).should == 'ONE'
     i18n.entries(5).should == 'N'
   end

data/spec/i18n_spec.rb

@@ -28,10 +28,10 @@ describe R18n::I18n do
     i18n = R18n::I18n.new('en', DIR)
     i18n.locales.should == [R18n.locale('en')]
 
-    i18n = R18n::I18n.new(['ru', 'no-LC'], DIR)
+    i18n = R18n::I18n.new(['ru', 'nolocale-DL'], DIR)
     i18n.locales.should == [R18n.locale('ru'),
-                            R18n::UnsupportedLocale.new('no-LC'),
-                            R18n::UnsupportedLocale.new('no'),
+                            R18n::UnsupportedLocale.new('nolocale-DL'),
+                            R18n::UnsupportedLocale.new('nolocale'),
                             R18n.locale('en')]
   end
 
@@ -60,14 +60,14 @@ describe R18n::I18n do
 
   it "should load translations" do
     i18n = R18n::I18n.new(['ru', 'en'], DIR)
-    i18n.one.should == 'Один'
-    i18n[:one].should == 'Один'
+    i18n.one.should    == 'Один'
+    i18n[:one].should  == 'Один'
     i18n['one'].should == 'Один'
     i18n.only.english.should == 'Only in English'
   end
 
   it "should load translations from several dirs" do
-    i18n = R18n::I18n.new(['no-LC', 'en'], [TWO, DIR])
+    i18n = R18n::I18n.new(['nolocale', 'en'], [TWO, DIR])
     i18n.in.two.should == 'Two'
     i18n.in.another.level.should == 'Hierarchical'
   end
@@ -83,26 +83,26 @@ describe R18n::I18n do
   it "shouldn't use extension without app translations with same locale" do
     R18n.extension_places << EXT
 
-    i18n = R18n::I18n.new(['no-TR', 'en'], DIR)
+    i18n = R18n::I18n.new(['notransl', 'en'], DIR)
     i18n.ext.should == 'Extension'
   end
 
   it "should ignore case on loading" do
-    i18n = R18n::I18n.new('no-lc', [DIR])
+    i18n = R18n::I18n.new('nolocale', [DIR])
     i18n.one.should == 'ONE'
 
-    i18n = R18n::I18n.new('no-LC', [DIR])
+    i18n = R18n::I18n.new('nolocale', [DIR])
     i18n.one.should == 'ONE'
   end
 
   it "should load default translation" do
-    i18n = R18n::I18n.new('no-LC', DIR)
+    i18n = R18n::I18n.new('nolocale', DIR)
     i18n.one.should == 'ONE'
     i18n.two.should == 'Two'
   end
 
   it "should load sublocales for first locale" do
-    R18n::I18n.default = 'no-TR'
+    R18n::I18n.default = 'notransl'
 
     i18n = R18n::I18n.new('ru', DIR)
     i18n.one.should == 'Один'
@@ -111,7 +111,7 @@ describe R18n::I18n do
 
   it "should return available translations" do
     i18n = R18n::I18n.new('en', DIR)
-    i18n.available_locales.should =~ [R18n.locale('no-lc'),
+    i18n.available_locales.should =~ [R18n.locale('nolocale'),
                                       R18n.locale('ru'),
                                       R18n.locale('en')]
   end
@@ -182,15 +182,17 @@ describe R18n::I18n do
 
   it "should reload translations" do
     loader = Class.new do
-      @@answer = 1
       def available; [R18n.locale('en')]; end
-      def load(locale); { 'one' => @@answer }; end
+      def load(locale);
+        @answer ||= 0
+        @answer  += 1
+        { 'one' => @answer }
+      end
     end
 
     i18n = R18n::I18n.new('en', loader.new)
     i18n.one.should == 1
 
-    loader.class_eval { @@answer = 2 }
     i18n.reload!
     i18n.one.should == 2
   end
@@ -202,8 +204,8 @@ describe R18n::I18n do
   end
 
   it "should return first locale with locale file" do
-    i18n = R18n::I18n.new(['no-TR', 'no-LC', 'ru', 'en'], DIR)
-    i18n.locale.should      == R18n.locale('no-LC')
+    i18n = R18n::I18n.new(['notransl', 'nolocale', 'ru', 'en'], DIR)
+    i18n.locale.should      == R18n.locale('nolocale')
     i18n.locale.base.should == R18n.locale('ru')
   end
 

data/spec/locale_spec.rb

@@ -14,7 +14,7 @@ describe R18n::Locale do
 
   it "should check is locale exists" do
     R18n::Locale.exists?('ru').should be_true
-    R18n::Locale.exists?('no-LC').should be_false
+    R18n::Locale.exists?('nolocale').should be_false
   end
 
   it "should set locale properties" do
@@ -55,16 +55,16 @@ describe R18n::Locale do
   it "should use UnsupportedLocale if locale file isn't exists" do
     @en.should be_supported
 
-    unsupported = R18n.locale('no-LC')
+    unsupported = R18n.locale('nolocale-DL')
     unsupported.should_not be_supported
     unsupported.should be_a(R18n::UnsupportedLocale)
 
-    unsupported.code.downcase.should == 'no-lc'
-    unsupported.title.downcase.should == 'no-lc'
+    unsupported.code.downcase.should  == 'nolocale-dl'
+    unsupported.title.downcase.should == 'nolocale-dl'
     unsupported.ltr?.should be_true
 
     unsupported.pluralize(5).should == 'n'
-    unsupported.inspect.downcase.should == 'unsupported locale no-lc'
+    unsupported.inspect.downcase.should == 'unsupported locale nolocale-dl'
   end
 
   it "should format number in local traditions" do
@@ -157,15 +157,15 @@ describe R18n::Locale do
     upcase.code.should   == 'ru'
     downcase.code.should == 'ru'
 
-    upcase   = R18n.locale('no-LC')
-    downcase = R18n.locale('no-lc')
+    upcase   = R18n.locale('nolocale')
+    downcase = R18n.locale('nolocale')
     upcase.should == downcase
-    upcase.code.should   == 'no-lc'
-    downcase.code.should == 'no-lc'
+    upcase.code.should   == 'nolocale'
+    downcase.code.should == 'nolocale'
   end
 
   it "should load locale with underscore" do
-    R18n.locale('no_LC').code.should == 'no-lc'
+    R18n.locale('nolocale-DL').code.should == 'nolocale-dl'
   end
 
 end

data/spec/r18n_spec.rb

@@ -140,7 +140,7 @@ describe R18n do
   end
 
   it "should return available translations" do
-    R18n.available_locales(DIR).should =~ [R18n.locale('no-lc'),
+    R18n.available_locales(DIR).should =~ [R18n.locale('nolocale'),
                                            R18n.locale('ru'),
                                            R18n.locale('en')]
   end
@@ -151,7 +151,7 @@ describe R18n do
     t.one.should == 'One'
     R18n.available_locales.should =~ [R18n.locale('ru'),
                                       R18n.locale('en'),
-                                      R18n.locale('no-lc')]
+                                      R18n.locale('nolocale')]
   end
 
   it "should set default places by block" do

data/spec/spec_helper.rb

@@ -37,10 +37,6 @@ class CounterLoader
   end
 end
 
-if '1.8.' != RUBY_VERSION[0..3]
-  YAML::ENGINE.yamler = ENV['test_syck'] ? 'syck' : 'psych'
-end
-
 RSpec.configure do |c|
   c.filter_run_excluding :not_ruby => lambda { |version|
     RUBY_VERSION.to_s.start_with? version.to_s

data/spec/translated_spec.rb

@@ -58,7 +58,7 @@ describe R18n::Translated do
     @user_class.translation :name
     user = @user_class.new
 
-    R18n.set(['no-LC', 'ru', 'en'])
+    R18n.set(['nolocale', 'ru', 'en'])
     user.name_ru = 'Иван'
     user.name.locale.should == R18n.locale('ru')
   end
@@ -67,7 +67,7 @@ describe R18n::Translated do
     @user_class.translation :name
     user = @user_class.new
 
-    R18n.set('no-LC')
+    R18n.set('nolocale')
     user.name_en = 'John'
     user.name.locale.should == R18n.locale('en')
   end

data/spec/translation_spec.rb

@@ -58,8 +58,8 @@ describe R18n::Translation do
   end
 
   it "should return string with locale info" do
-    i18n = R18n::I18n.new(['no-LC', 'en'], DIR)
-    i18n.one.locale.should == R18n::UnsupportedLocale.new('no-LC')
+    i18n = R18n::I18n.new(['nolocale', 'en'], DIR)
+    i18n.one.locale.should == R18n::UnsupportedLocale.new('nolocale')
     i18n.two.locale.should == R18n.locale('en')
   end
 
@@ -84,9 +84,9 @@ describe R18n::Translation do
     translation = R18n::Translation.new(en, '',
       :locale => en, :translations => { 'a' => 'A' })
 
-    translation.a.b.should be_a(R18n::Untranslated)
-    translation.a.b.translated_path.should   == 'a.'
-    translation.a.b.untranslated_path.should == 'b'
+    translation.a.no_tr.should be_a(R18n::Untranslated)
+    translation.a.no_tr.translated_path.should   == 'a.'
+    translation.a.no_tr.untranslated_path.should == 'no_tr'
   end
 
   it "should inspect translation" do

data/spec/yaml_loader_spec.rb

@@ -26,13 +26,15 @@ describe R18n::Loader::YAML do
   it "should return all available translations" do
     @loader.available.should =~ [R18n.locale('ru'),
                                  R18n.locale('en'),
-                                 R18n.locale('no-lc')]
+                                 R18n.locale('nolocale')]
   end
 
   it "should load translation" do
     @loader.load(R18n.locale('ru')).should == {
-      'one' => 'Один', 'in' => {'another' => {'level' => 'Иерархический'}},
-      'typed' => R18n::Typed.new('my', 'value') }
+      'one'   => 'Один',
+      'in'    => { 'another' => { 'level' => 'Иерархический' } },
+      'typed' => R18n::Typed.new('my', 'value')
+    }
   end
 
   it "should return hash by dir" do
@@ -44,8 +46,8 @@ describe R18n::Loader::YAML do
     loader.available.should =~ [R18n.locale('ru'),
                                 R18n.locale('en'),
                                 R18n.locale('fr'),
-                                R18n.locale('no-tr'),
-                                R18n.locale('no-lc')]
+                                R18n.locale('notransl'),
+                                R18n.locale('nolocale')]
 
     translation = loader.load(R18n.locale('en'))
     translation['two'].should       == 'Two'

metadata

@@ -1,50 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 1.1.3
   prerelease: 
+  version: 1.1.4
 platform: ruby
 authors:
 - Andrey "A.I." Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.10
+  requirement: !ruby/object:Gem::Requirement
     none: false
-  type: :development
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.10
-    none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  name: yard
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
     none: false
-  type: :development
-  name: yard
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -52,10 +55,8 @@ dependencies:
     - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.9.0
+  requirement: !ruby/object:Gem::Requirement
     none: false
-  type: :development
-  name: rake
-  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,103 +64,102 @@ dependencies:
     - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.9.0
-    none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
   type: :development
   name: rspec-core
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
   type: :development
   name: rspec-expectations
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
   type: :development
   name: rspec-mocks
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
   type: :development
   name: kramdown
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
   type: :development
   name: RedCloth
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
   type: :development
   name: redcarpet
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
 description: ! "    R18n is a i18n tool to translate your Ruby application.\n    It
   has nice Ruby-style syntax, filters, flexible locales, custom loaders,\n    translation
@@ -197,7 +197,7 @@ files:
 - base/kk.yml
 - base/lv.yml
 - base/mn.rb
-- base/nb-no.yml
+- base/nb.yml
 - base/nl.yml
 - base/pl.yml
 - base/pt.yml
@@ -243,8 +243,9 @@ files:
 - locales/kk.rb
 - locales/lv.rb
 - locales/mn.rb
-- locales/nb-no.rb
+- locales/nb.rb
 - locales/nl.rb
+- locales/no.rb
 - locales/pl.rb
 - locales/pt-br.rb
 - locales/pt.rb
@@ -277,9 +278,9 @@ files:
 - spec/translation_spec.rb
 - spec/translations/extension/deep/en.yml
 - spec/translations/extension/en.yml
-- spec/translations/extension/no-tr.yml
+- spec/translations/extension/notransl.yml
 - spec/translations/general/en.yml
-- spec/translations/general/no-lc.yml
+- spec/translations/general/nolocale.yml
 - spec/translations/general/ru.yml
 - spec/translations/two/en.yml
 - spec/translations/two/fr.yml
@@ -291,23 +292,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -2892883410893894166
-      version: '0'
       segments:
       - 0
-  none: false
+      hash: -3448094811323145834
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -2892883410893894166
-      version: '0'
       segments:
       - 0
-  none: false
+      hash: -3448094811323145834
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23