From a3f45a6ed1ac1fdd25e42c83014e064c73004788 Mon Sep 17 00:00:00 2001 From: Cameron Dutro Date: Wed, 5 Dec 2012 16:28:40 -0800 Subject: [PATCH] Fixing wrong date format being returned for additional date formats --- History.txt | 4 ++++ .../calendars/additional_date_format_selector.rb | 8 ++++++-- lib/twitter_cldr/version.rb | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/History.txt b/History.txt index 7d6c8142e..22ccf4327 100644 --- a/History.txt +++ b/History.txt @@ -1,3 +1,7 @@ +== 2.0.1 + +* Fixed bug for additional date formats that was causing the wrong format to be returned. + == 2.0.0 * Added locales ga, ta, gl, cy, sr, bg, ku, ro, lv, be, sq, sk, and bn. diff --git a/lib/twitter_cldr/tokenizers/calendars/additional_date_format_selector.rb b/lib/twitter_cldr/tokenizers/calendars/additional_date_format_selector.rb index d55a89877..d335600fe 100644 --- a/lib/twitter_cldr/tokenizers/calendars/additional_date_format_selector.rb +++ b/lib/twitter_cldr/tokenizers/calendars/additional_date_format_selector.rb @@ -59,8 +59,12 @@ def position_score(entities, goal_entities) end def exist_score(entities, goal_entities) - goal_entities.count do |goal_entity| - !entities.any? { |entity| entity[0] == goal_entity[0] } + goal_entities.inject(0) do |sum, goal_entity| + if !entities.any? { |entity| entity[0] == goal_entity[0] } + sum + 1 + else + sum + end end end diff --git a/lib/twitter_cldr/version.rb b/lib/twitter_cldr/version.rb index ed2665bbb..d38629eb9 100644 --- a/lib/twitter_cldr/version.rb +++ b/lib/twitter_cldr/version.rb @@ -4,5 +4,5 @@ # http://www.apache.org/licenses/LICENSE-2.0 module TwitterCldr - VERSION = "2.0.0" + VERSION = "2.0.1" end