fixing broken tests

onomojo · Aug 29, 2016 · a9d7b8e · a9d7b8e
1 parent a1c9573
commit a9d7b8e
Show file tree

Hide file tree

Showing 18 changed files with 141 additions and 83 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,98 +1,136 @@
 PATH
   remote: .
   specs:
-    i18n-timezones (1.3.4)
+    i18n-timezones (1.3.6)
       i18n (~> 0.5)
       rails (>= 4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.0)
-      actionpack (= 4.0.0)
-      mail (~> 2.5.3)
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    atomic (1.1.13)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.1)
+    builder (3.2.2)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    hike (1.2.3)
-    i18n (0.6.5)
-    i18n-spec (0.1.2)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    minitest (4.7.5)
-    multi_json (1.7.9)
-    polyglot (0.3.5)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    i18n-spec (0.6.0)
+      iso
+    iso (0.2.2)
+      i18n
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nio4r (1.2.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
+    rack (2.0.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.0)
-      actionmailer (= 4.0.0)
-      actionpack (= 4.0.0)
-      activerecord (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.0)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rspec-core (2.14.2)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    rspec-rails (2.14.0)
+    rake (11.2.2)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    spork (1.0.0rc2)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    spork (1.0.0rc4)
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -102,3 +140,6 @@ DEPENDENCIES
   i18n-timezones!
   rspec-rails (>= 2.14.0)
   spork (~> 1.0rc)
+
+BUNDLED WITH
+   1.12.5
diff --git a/README.rdoc b/README.rdoc
@@ -48,6 +48,7 @@ If you find an error in a translation, please let us know. Please help us fill i
 
 
 == Version History
+* 1.3.6 - Fix mistakes of translation in Japanese. add hebrew translation. Fix Buenos Aires name in Russian
 * 1.3.5 - Adding pt-BR
 * 1.3.4 - Added missing Russian Federation timezones. Russian name of "Central America" was fixed.
 * 1.3.3 - Fix ru translation for Paris

diff --git a/lib/i18n_timezones/version.rb b/lib/i18n_timezones/version.rb
@@ -1,3 +1,3 @@
 module I18nTimezones
-  VERSION = "1.3.5"
+  VERSION = "1.3.6"
 end
diff --git a/rails/locale/ar.yml b/rails/locale/ar.yml
@@ -150,3 +150,4 @@ ar:
     "Montevideo": "مونتيفيديو"
     "Ulaanbaatar": "أولان باتور"
     "Chatham Is.": "هل تشاتام"
+    "Zurich": "زيوريخ"
diff --git a/rails/locale/de.yml b/rails/locale/de.yml
@@ -150,3 +150,4 @@ de:
     "Montevideo": "Montevideo"
     "Ulaanbaatar": "Ulaanbaatar"
     "Chatham Is.": "Chatham-Inseln"
+    "Zurich": "Zürich"
diff --git a/rails/locale/es.yml b/rails/locale/es.yml
@@ -151,3 +151,4 @@ es:
     "Ulaanbaatar": "Ulaanbaatar"
     "Chatham Is.": "Isla Chatham"
     "Tokelau Is.": "Isla de Tokelau"
+    "Zurich": "Zúrich"
diff --git a/rails/locale/fr.yml b/rails/locale/fr.yml
@@ -150,4 +150,4 @@ fr:
     "Montevideo": "Montevideo"
     "Ulaanbaatar": "Oulan-Bator"
     "Chatham Is.": "Îles Chatham"
-
+    "Zurich": "Zurich"
diff --git a/rails/locale/he.yml b/rails/locale/he.yml
@@ -151,3 +151,4 @@ he:
     "Ulaanbaatar": "אולן בטור"
     "Chatham Is.": "איי צ'טהאם"
     "Tokelau Is.": "איי טוקלאו"
+    "Zurich": "ציריך"
diff --git a/rails/locale/it.yml b/rails/locale/it.yml
@@ -150,3 +150,4 @@ it:
     "Montevideo": "Montevideo"
     "Ulaanbaatar": "Ulaanbaatar"
     "Chatham Is.": "Isole Chatham"
+    "Zurich": "Zurigo"
diff --git a/rails/locale/ja.yml b/rails/locale/ja.yml
@@ -150,3 +150,4 @@ ja:
     "Montevideo": "モンテビデオ"
     "Ulaanbaatar": "ウランバートル"
     "Chatham Is.": "チャタム島"
+    "Zurich": "チューリッヒ"
diff --git a/rails/locale/ko.yml b/rails/locale/ko.yml
@@ -150,3 +150,4 @@ ko:
     "Montevideo": "몬테비데오"
     "Ulaanbaatar": "울란바토르"
     "Chatham Is.": "채텀 아일랜드"
+    "Zurich": "취리히"
diff --git a/rails/locale/nl.yml b/rails/locale/nl.yml
@@ -150,3 +150,4 @@ nl:
     "Montevideo": "Montevideo"
     "Ulaanbaatar": "Ulaanbaatar"
     "Chatham Is.": "Chatham Eilanden"
+    "Zurich": "Zurich"
diff --git a/rails/locale/pt-BR.yml b/rails/locale/pt-BR.yml
@@ -150,3 +150,4 @@ pt-BR:
     "Montevideo": "Montevidéu"
     "Ulaanbaatar": "Ulaanbaatar"
     "Chatham Is.": "Ilha Chatham"
+    "Zurich": "Zurique"
diff --git a/rails/locale/pt.yml b/rails/locale/pt.yml
@@ -150,3 +150,4 @@ pt:
     "Montevideo": "Montevidéu"
     "Ulaanbaatar": "Ulaanbaatar"
     "Chatham Is.": "Ilha Chatham"
+    "Zurich": "Zurique"
diff --git a/rails/locale/ru.yml b/rails/locale/ru.yml
@@ -150,3 +150,4 @@ ru:
     "Montevideo": "Монтевидео"
     "Ulaanbaatar": "Улан-Батор"
     "Chatham Is.": "Остров Чатем"
+    "Zurich": "Цюрих"
diff --git a/rails/locale/zh-CN.yml b/rails/locale/zh-CN.yml
@@ -150,3 +150,4 @@ zh-CN:
     "Montevideo": "蒙得维的亚"
     "Ulaanbaatar": "乌兰巴托"
     "Chatham Is.": "查塔姆"
+    "Zurich": "苏黎世"
diff --git a/rails/locale/zh-TW.yml b/rails/locale/zh-TW.yml
@@ -146,4 +146,8 @@ zh-TW:
     "Tokelau Is.": "托克勞群島"
     "Montevideo": "蒙得維的亞"
     "Ulaanbaatar": "烏蘭巴托"
-    "Chatham Is.": "查塔姆"
+    "Chatham Is.": "查塔姆"
+    "Zurich": "蘇黎世"
+    "Kaliningrad": "加里寧格勒"
+    "Samara": "薩馬拉"
+    "Srednekolymsk": "中科雷姆斯克"
diff --git a/spec/unit/translations_spec.rb b/spec/unit/translations_spec.rb
@@ -6,8 +6,8 @@
     I18n.locale = locale_file.split('/').last.split('.').first
     ActiveSupport::TimeZone.all.each do |zone|
       p I18n.t(zone.name, :scope => :timezones, :separator => "\001") if I18n.t(zone.name, :scope => :timezones, :separator => "\001").include?('translation missing')
-      it { I18n.t(zone.name, :scope => :timezones, :separator => "\001").should_not == zone }
-      it { I18n.t(zone.name, :scope => :timezones, :separator => "\001").include?('translation missing').should == false }
+      it { expect(I18n.t(zone.name, :scope => :timezones, :separator => "\001")).not_to eq(zone) }
+      it { expect(I18n.t(zone.name, :scope => :timezones, :separator => "\001").include?('translation missing')).to eq(false) }
     end
   end
-end
+end