twitter_cldr_js 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da2af24960801d8f8395bc58c8a4b0cb19ee60d2
-  data.tar.gz: e972df617fb7326a516104894c48294bf1181fef
+  metadata.gz: 7605ffd931d11a0eb0a81fbcff8115d86f53e948
+  data.tar.gz: 84af792cbd6668372a7cdcc8d7aaaa977c69222d
 SHA512:
-  metadata.gz: 38e04d716d55d6b5a1b26d7c11280b8f8da6492d2cc5b15de48ee4d4797d4173ad88c20663faf4fe0443107c2b528ec4035ad73ae7ade3ef3e25799318d15b26
-  data.tar.gz: 3b1b56d8246c6e0e019dfce8f2d720a31b42b89195127290f8f0f5789bcf0708b77be8901db999aff04147c9488702487f5ea1e1c06d37e1e727e051ac099031
+  metadata.gz: 61afec7294b57face9371425456b76372597dbbbf15ee4288553edb920b64a3bb2b3ae68dd0f4271b91a793e6001f4c4780499aa389ba46bca5942757caf79fb
+  data.tar.gz: 76dd252b3533c5e2bded08f27f69dc0268a45f8ebf0400a48c0bd257f465509ff1fe853dd50d33c5bfea08dad1db7c73d91a91d0f6758bbd740568dde5823074

data/Gemfile

@@ -11,7 +11,7 @@ group :test do
   end
 end
 
-group :development do
+group :development, :test do
   gem 'pry'
   gem 'pry-nav'
 end

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.2.4
+
+* Upgrading to twitter-cldr-rb 2.4.3 to fix abbreviated timespan issue in en-GB.
+* Fixing list formatter issue causing incorrect results when lists contain fewer than 2 elements.
+
 === 2.2.3
 
 * Fixing bad generated javascript.

data/README.md

@@ -217,12 +217,37 @@ To mitigate this problem, Unicode supports special invisible characters that for
 
 ```javascript
 var bidi_str = TwitterCldr.Bidi.from_string("hello نزوة world", {"direction": "RTL"});
-bidi.reorder_visually();
-bidi.toString();
+bidi_str.reorder_visually();
+bidi_str.toString();
 ```
-
 **Disclaimer**: Google Translate tells me the Arabic in the example above means "fancy", but my confidence is not very high, especially since all the letters are unattached. Apologies to any native speakers :)
 
+
+### Phone Codes
+
+Look up phone codes by territory:
+
+```javascript
+// United States
+TwitterCldr.PhoneCodes.code_for_territory("us")  // "1"
+
+// Perú
+TwitterCldr.PhoneCodes.code_for_territory("pe")  // "51"
+
+// Egypt
+TwitterCldr.PhoneCodes.code_for_territory("eg")  // "20"
+
+// Denmark
+TwitterCldr.PhoneCodes.code_for_territory("dk")  // "45"
+```
+
+Get a list of supported territories by using the `territories` method:
+
+```javascript
+TwitterCldr.PhoneCodes.territories()  // [:zw, :an, :tr, :by, :mh, ...]
+```
+
+
 ### Generating the JavaScript
 
 The JavaScript files that make up twitter-cldr-js can be automatically generated for each language via a set of Rake tasks.

data/lib/assets/javascripts/twitter_cldr/af.js

@@ -1,21 +1,22 @@
+
 /*
 // Copyright 2012 Twitter, Inc
 // http://www.apache.org/licenses/LICENSE-2.0
 
-// TwitterCLDR (JavaScript) v2.2.3
+// TwitterCLDR (JavaScript) v2.2.4
 // Authors:     Cameron Dutro [@camertron]
                 Kirill Lashuk [@KL_7]
                 portions by Sven Fuchs [@svenfuchs]
 // Homepage:    https://twitter.com
 // Description: Provides date, time, number, and list formatting functionality for various Twitter-supported locales in Javascript.
-*/
-
+ */
 
-/*<<module_def>>*/
 
+/*-module-*/
+/*_lib/twitter_cldr_*/
 
 (function() {
-  var TwitterCldr, key, obj, root, _ref, _ref1, _ref2, _ref3,
+  var TwitterCldr, key, obj, root,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
@@ -288,22 +289,23 @@
     }
 
     DateTimeFormatter.prototype.format = function(obj, options) {
-      var format_token, token, tokens,
-        _this = this;
-      format_token = function(token) {
-        var result;
-        result = "";
-        switch (token.type) {
-          case "pattern":
-            return _this.result_for_token(token, obj);
-          default:
-            if (token.value.length > 0 && token.value[0] === "'" && token.value[token.value.length - 1] === "'") {
-              return token.value.substring(1, token.value.length - 1);
-            } else {
-              return token.value;
-            }
-        }
-      };
+      var format_token, token, tokens;
+      format_token = (function(_this) {
+        return function(token) {
+          var result;
+          result = "";
+          switch (token.type) {
+            case "pattern":
+              return _this.result_for_token(token, obj);
+            default:
+              if (token.value.length > 0 && token.value[0] === "'" && token.value[token.value.length - 1] === "'") {
+                return token.value.substring(1, token.value.length - 1);
+              } else {
+                return token.value;
+              }
+          }
+        };
+      })(this);
       tokens = this.get_tokens(obj, options);
       return ((function() {
         var _i, _len, _results;
@@ -850,8 +852,7 @@
     __extends(DecimalFormatter, _super);
 
     function DecimalFormatter() {
-      _ref = DecimalFormatter.__super__.constructor.apply(this, arguments);
-      return _ref;
+      return DecimalFormatter.__super__.constructor.apply(this, arguments);
     }
 
     DecimalFormatter.prototype.format = function(number, options) {
@@ -955,8 +956,7 @@
     __extends(AbbreviatedNumberFormatter, _super);
 
     function AbbreviatedNumberFormatter() {
-      _ref1 = AbbreviatedNumberFormatter.__super__.constructor.apply(this, arguments);
-      return _ref1;
+      return AbbreviatedNumberFormatter.__super__.constructor.apply(this, arguments);
     }
 
     AbbreviatedNumberFormatter.prototype.NUMBER_MAX = Math.pow(10, 15);
@@ -976,9 +976,9 @@
     AbbreviatedNumberFormatter.prototype.get_key = function(number) {
       var i, zeroes;
       zeroes = ((function() {
-        var _i, _ref2, _results;
+        var _i, _ref, _results;
         _results = [];
-        for (i = _i = 0, _ref2 = Math.floor(number).toString().length - 1; 0 <= _ref2 ? _i < _ref2 : _i > _ref2; i = 0 <= _ref2 ? ++_i : --_i) {
+        for (i = _i = 0, _ref = Math.floor(number).toString().length - 1; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
           _results.push("0");
         }
         return _results;
@@ -1020,8 +1020,7 @@
     __extends(ShortDecimalFormatter, _super);
 
     function ShortDecimalFormatter() {
-      _ref2 = ShortDecimalFormatter.__super__.constructor.apply(this, arguments);
-      return _ref2;
+      return ShortDecimalFormatter.__super__.constructor.apply(this, arguments);
     }
 
     ShortDecimalFormatter.prototype.get_type = function() {
@@ -1036,8 +1035,7 @@
     __extends(LongDecimalFormatter, _super);
 
     function LongDecimalFormatter() {
-      _ref3 = LongDecimalFormatter.__super__.constructor.apply(this, arguments);
-      return _ref3;
+      return LongDecimalFormatter.__super__.constructor.apply(this, arguments);
     }
 
     LongDecimalFormatter.prototype.get_type = function() {
@@ -1158,9 +1156,9 @@
       })();
       widths.reverse();
       return ((function() {
-        var _i, _ref4, _results;
+        var _i, _ref, _results;
         _results = [];
-        for (index = _i = 0, _ref4 = widths.length; 0 <= _ref4 ? _i < _ref4 : _i > _ref4; index = 0 <= _ref4 ? ++_i : --_i) {
+        for (index = _i = 0, _ref = widths.length; 0 <= _ref ? _i < _ref : _i > _ref; index = 0 <= _ref ? ++_i : --_i) {
           if (widths.indexOf(widths[index], index + 1) === -1) {
             _results.push(widths[index]);
           }
@@ -1239,11 +1237,11 @@
     Currencies.currency_codes = function() {
       var data, _;
       return this.codes || (this.codes = (function() {
-        var _ref4, _results;
-        _ref4 = this.currencies;
+        var _ref, _results;
+        _ref = this.currencies;
         _results = [];
-        for (_ in _ref4) {
-          data = _ref4[_];
+        for (_ in _ref) {
+          data = _ref[_];
           _results.push(data.code);
         }
         return _results;
@@ -1251,11 +1249,11 @@
     };
 
     Currencies.for_code = function(currency_code) {
-      var country_name, data, result, _ref4;
+      var country_name, data, result, _ref;
       result = null;
-      _ref4 = this.currencies;
-      for (country_name in _ref4) {
-        data = _ref4[country_name];
+      _ref = this.currencies;
+      for (country_name in _ref) {
+        data = _ref[country_name];
         if (data.currency === currency_code) {
           result = {
             country: country_name,
@@ -1290,10 +1288,10 @@
     };
 
     ListFormatter.prototype.compose_list = function(list) {
-      var format_key, i, result, _i, _ref4;
+      var format_key, i, result, _i, _ref;
       result = this.compose(this.formats.end || this.formats.middle || "", [list[list.length - 2], list[list.length - 1]]);
       if (list.length > 2) {
-        for (i = _i = 3, _ref4 = list.length; 3 <= _ref4 ? _i <= _ref4 : _i >= _ref4; i = 3 <= _ref4 ? ++_i : --_i) {
+        for (i = _i = 3, _ref = list.length; 3 <= _ref ? _i <= _ref : _i >= _ref; i = 3 <= _ref ? ++_i : --_i) {
           format_key = i === list.length ? "start" : "middle";
           if (this.formats[format_key] == null) {
             format_key = "middle";
@@ -1311,7 +1309,7 @@
         _results = [];
         for (_i = 0, _len = elements.length; _i < _len; _i++) {
           element = elements[_i];
-          if (element !== null) {
+          if (element != null) {
             _results.push(element);
           }
         }
@@ -1359,10 +1357,10 @@
     }
 
     Bidi.bidi_class_for = function(code_point) {
-      var bidi_class, end, range, range_list, range_offset, ranges, start, _i, _len, _ref4;
-      _ref4 = this.bidi_classes;
-      for (bidi_class in _ref4) {
-        ranges = _ref4[bidi_class];
+      var bidi_class, end, range, range_list, range_offset, ranges, start, _i, _len, _ref;
+      _ref = this.bidi_classes;
+      for (bidi_class in _ref) {
+        ranges = _ref[bidi_class];
         for (range_offset in ranges) {
           range_list = ranges[range_offset];
           for (_i = 0, _len = range_list.length; _i < _len; _i++) {
@@ -1412,15 +1410,15 @@
     };
 
     Bidi.prototype.reorder_visually = function() {
-      var depth, finish, i, level, lowest_odd, max, start, tmpb, tmpo, _i, _j, _k, _len, _ref4, _ref5;
+      var depth, finish, i, level, lowest_odd, max, start, tmpb, tmpo, _i, _j, _k, _len, _ref, _ref1;
       if (!this.string_arr) {
         throw "No string given!";
       }
       max = 0;
       lowest_odd = MAX_DEPTH + 1;
-      _ref4 = this.levels;
-      for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-        level = _ref4[_i];
+      _ref = this.levels;
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        level = _ref[_i];
         max = TwitterCldr.Utilities.max([level, max]);
         if (!TwitterCldr.Utilities.is_even(level)) {
           lowest_odd = TwitterCldr.Utilities.min([lowest_odd, level]);
@@ -1439,7 +1437,7 @@
           while (finish < this.levels.length && this.levels[finish] >= depth) {
             finish += 1;
           }
-          for (i = _k = 0, _ref5 = (finish - start) / 2; 0 <= _ref5 ? _k < _ref5 : _k > _ref5; i = 0 <= _ref5 ? ++_k : --_k) {
+          for (i = _k = 0, _ref1 = (finish - start) / 2; 0 <= _ref1 ? _k < _ref1 : _k > _ref1; i = 0 <= _ref1 ? ++_k : --_k) {
             tmpb = this.levels[finish - i - 1];
             this.levels[finish - i - 1] = this.levels[start + i];
             this.levels[start + i] = tmpb;
@@ -1454,7 +1452,7 @@
     };
 
     Bidi.prototype.compute_paragraph_embedding_level = function() {
-      var type, _i, _len, _ref4;
+      var type, _i, _len, _ref;
       if (["LTR", "RTL"].indexOf(this.direction) > -1) {
         if (this.direction === "LTR") {
           return 0;
@@ -1462,9 +1460,9 @@
           return 1;
         }
       } else {
-        _ref4 = this.types;
-        for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
-          type = _ref4[_i];
+        _ref = this.types;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          type = _ref[_i];
           if (type === "L") {
             return 0;
           }
@@ -1481,13 +1479,13 @@
     };
 
     Bidi.prototype.compute_explicit_levels = function() {
-      var current_embedding, directional_override, embedding_stack, i, input, is_ltr, is_special, len, new_embedding, next_fmt, output, size, sp, _i, _j, _ref4, _ref5;
+      var current_embedding, directional_override, embedding_stack, i, input, is_ltr, is_special, len, new_embedding, next_fmt, output, size, sp, _i, _j, _ref, _ref1;
       current_embedding = this.base_embedding;
       directional_override = -1;
       embedding_stack = [];
       this.formatter_indices || (this.formatter_indices = []);
       sp = 0;
-      for (i = _i = 0, _ref4 = this.length; 0 <= _ref4 ? _i < _ref4 : _i > _ref4; i = 0 <= _ref4 ? ++_i : --_i) {
+      for (i = _i = 0, _ref = this.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
         is_ltr = false;
         is_special = true;
         is_ltr = this.types[i] === "LRE" || this.types[i] === "LRO";
@@ -1512,7 +1510,7 @@
               sp -= 1;
               new_embedding = embedding_stack[sp];
               current_embedding = new_embedding & 0x7f;
-              directional_override = new_embedding < 0 ? (_ref5 = (new_embedding & 1) === 0) != null ? _ref5 : {
+              directional_override = new_embedding < 0 ? (_ref1 = (new_embedding & 1) === 0) != null ? _ref1 : {
                 "L": "R"
               } : -1;
             }
@@ -1542,10 +1540,10 @@
     };
 
     Bidi.prototype.compute_runs = function() {
-      var current_embedding, i, last_run_start, run_count, where, _i, _j, _ref4, _ref5;
+      var current_embedding, i, last_run_start, run_count, where, _i, _j, _ref, _ref1;
       run_count = 0;
       current_embedding = this.base_embedding;
-      for (i = _i = 0, _ref4 = this.length; 0 <= _ref4 ? _i < _ref4 : _i > _ref4; i = 0 <= _ref4 ? ++_i : --_i) {
+      for (i = _i = 0, _ref = this.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
         if (this.levels[i] !== current_embedding) {
           current_embedding = this.levels[i];
           run_count += 1;
@@ -1554,7 +1552,7 @@
       where = 0;
       last_run_start = 0;
       current_embedding = this.base_embedding;
-      for (i = _j = 0, _ref5 = this.length; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; i = 0 <= _ref5 ? ++_j : --_j) {
+      for (i = _j = 0, _ref1 = this.length; 0 <= _ref1 ? _j < _ref1 : _j > _ref1; i = 0 <= _ref1 ? ++_j : --_j) {
         if (this.levels[i] !== current_embedding) {
           this.runs[where] = last_run_start;
           where += 1;
@@ -1649,8 +1647,8 @@
     };
 
     Bidi.prototype.resolve_implicit_levels = function() {
-      var i, _i, _ref4;
-      for (i = _i = 0, _ref4 = this.length; 0 <= _ref4 ? _i < _ref4 : _i > _ref4; i = 0 <= _ref4 ? ++_i : --_i) {
+      var i, _i, _ref;
+      for (i = _i = 0, _ref = this.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
         if ((this.levels[i] & 1) === 0) {
           if (this.types[i] === "R") {
             this.levels[i] += 1;
@@ -1719,11 +1717,11 @@
     };
 
     Bidi.prototype.reinsert_formatting_codes = function() {
-      var index, input, left_level, len, next_fmt, output, right_level, _i, _ref4;
+      var index, input, left_level, len, next_fmt, output, right_level, _i, _ref;
       if ((this.formatter_indices != null) && this.formatter_indices.length > 0) {
         input = this.length;
         output = this.levels.length;
-        for (index = _i = _ref4 = this.formatter_indices.length - 1; _ref4 <= 0 ? _i <= 0 : _i >= 0; index = _ref4 <= 0 ? ++_i : --_i) {
+        for (index = _i = _ref = this.formatter_indices.length - 1; _ref <= 0 ? _i <= 0 : _i >= 0; index = _ref <= 0 ? ++_i : --_i) {
           next_fmt = this.formatter_indices[index];
           len = output - next_fmt - 1;
           output = next_fmt;
@@ -1781,13 +1779,13 @@
     };
 
     Calendar.get_root = function(key, options) {
-      var format, names_form, root, _ref4;
+      var format, names_form, root, _ref;
       if (options == null) {
         options = {};
       }
       root = this.calendar[key];
       names_form = options["names_form"] || "wide";
-      format = options.format || ((root != null ? (_ref4 = root["stand-alone"]) != null ? _ref4[names_form] : void 0 : void 0) != null ? "stand-alone" : "format");
+      format = options.format || ((root != null ? (_ref = root["stand-alone"]) != null ? _ref[names_form] : void 0 : void 0) != null ? "stand-alone" : "format");
       return root[format][names_form];
     };
 
@@ -1795,6 +1793,43 @@
 
   })();
 
+  TwitterCldr.PhoneCodes = (function() {
+    function PhoneCodes() {}
+
+    PhoneCodes.phone_codes = {"ac":"247","ad":"376","ae":"971","af":"93","ag":"1","ai":"1","al":"355","am":"374","an":"599","ao":"244","aq":"672","ar":"54","as":"1","at":"43","au":"61","aw":"297","ax":"358","az":"994","ba":"387","bb":"1","bd":"880","be":"32","bf":"226","bg":"359","bh":"973","bi":"257","bj":"229","bl":"590","bm":"1","bn":"673","bo":"591","br":"55","bs":"1","bt":"975","bw":"267","by":"375","bz":"501","ca":"1","cc":"61","cd":"243","cf":"236","cg":"242","ch":"41","ci":"225","ck":"682","cl":"56","cm":"237","cn":"86","co":"57","cr":"506","cu":"53","cv":"238","cx":"61","cy":"357","cz":"420","de":"49","dj":"253","dk":"45","dm":"1","do":"1","dz":"213","ec":"593","ee":"372","eg":"20","er":"291","es":"34","et":"251","fi":"358","fj":"679","fk":"500","fm":"691","fo":"298","fr":"33","ga":"241","gb":"44","gd":"1","ge":"995","gf":"594","gg":"44","gh":"233","gi":"350","gl":"299","gm":"220","gn":"224","gp":"590","gq":"240","gr":"30","gt":"502","gu":"1","gw":"245","gy":"592","hk":"852","hn":"504","hr":"385","ht":"509","hu":"36","id":"62","ie":"353","il":"972","im":"44","in":"91","io":"246","iq":"964","ir":"98","is":"354","it":"39","je":"44","jm":"1","jo":"962","jp":"81","ke":"254","kg":"996","kh":"855","ki":"686","km":"269","kn":"1","kp":"850","kr":"82","kw":"965","ky":"1","kz":"7","la":"856","lb":"961","lc":"1","li":"423","lk":"94","lr":"231","ls":"266","lt":"370","lu":"352","lv":"371","ly":"218","ma":"212","mc":"377","md":"373","me":"382","mg":"261","mh":"692","mk":"389","ml":"223","mm":"95","mn":"976","mo":"853","mp":"1","mq":"596","mr":"222","ms":"1","mt":"356","mu":"230","mv":"960","mw":"265","mx":"52","my":"60","mz":"258","na":"264","nc":"687","ne":"227","nf":"672","ng":"234","ni":"505","nl":"31","no":"47","np":"977","nr":"674","nu":"683","nz":"64","om":"968","pa":"507","pe":"51","pf":"689","pg":"675","ph":"63","pk":"92","pl":"48","pm":"508","pr":"1","ps":"972","pt":"351","pw":"680","py":"595","qa":"974","re":"262","ro":"40","rs":"381","ru":"7","rw":"250","sa":"966","sb":"677","sc":"248","sd":"249","se":"46","sg":"65","sh":"290","si":"386","sj":"47","sk":"421","sl":"232","sm":"378","sn":"221","so":"252","sr":"597","ss":"211","st":"239","sv":"503","sy":"963","sz":"268","tc":"1","td":"235","tf":"262","tg":"228","th":"66","tj":"992","tk":"690","tl":"670","tm":"993","tn":"216","to":"676","tr":"90","tt":"1","tv":"688","tw":"886","tz":"255","ua":"380","ug":"256","us":"1","uy":"598","uz":"998","va":"39","vc":"1","ve":"58","vg":"1","vi":"1","vn":"84","vu":"678","wf":"681","ws":"685","ye":"967","yt":"262","za":"27","zm":"260","zw":"263"};
+
+    PhoneCodes.territories = function() {
+      var data, _;
+      return this.codes || (this.codes = (function() {
+        var _ref, _results;
+        _ref = this.phone_codes;
+        _results = [];
+        for (data in _ref) {
+          _ = _ref[data];
+          _results.push(data);
+        }
+        return _results;
+      }).call(this));
+    };
+
+    PhoneCodes.code_for_territory = function(territory) {
+      var phone_code, result, territory_code, _ref;
+      result = null;
+      _ref = this.phone_codes;
+      for (territory_code in _ref) {
+        phone_code = _ref[territory_code];
+        if (territory_code === territory) {
+          result = phone_code;
+          break;
+        }
+      }
+      return result;
+    };
+
+    return PhoneCodes;
+
+  })();
+
   TwitterCldr.NumberParser = (function() {
     function NumberParser() {
       this.group_separator = " ";
@@ -1830,11 +1865,11 @@
       }
       if (punct_list.length > 0 && punct_list.slice(-1)[0]["type"] === "decimal") {
         result = parseInt(((function() {
-          var _j, _len1, _ref4, _results;
-          _ref4 = num_list.slice(0, -1);
+          var _j, _len1, _ref, _results;
+          _ref = num_list.slice(0, -1);
           _results = [];
-          for (_j = 0, _len1 = _ref4.length; _j < _len1; _j++) {
-            num = _ref4[_j];
+          for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
+            num = _ref[_j];
             _results.push(num.value);
           }
           return _results;