intl-messageformat 1.0.4 → 1.1.0

package/lib/core.js

@@ -1,3 +1,11 @@
+/*
+Copyright (c) 2014, Yahoo! Inc. All rights reserved.
+Copyrights licensed under the New BSD License.
+See the accompanying LICENSE file for terms.
+*/
+
+/* jslint esnext: true */
+
 "use strict";
 var src$utils$$ = require("./utils"), src$es5$$ = require("./es5"), src$compiler$$ = require("./compiler"), intl$messageformat$parser$$ = require("intl-messageformat-parser");
 exports["default"] = MessageFormat;
@@ -20,12 +28,11 @@ function MessageFormat(message, locales, formats) {
     // Defined first because it's used to build the format pattern.
     src$es5$$.defineProperty(this, '_locale',  {value: this._resolveLocale(locales)});
 
-    var pluralFn = MessageFormat.__localeData__[this._locale].pluralRuleFunction;
-
     // Compile the `ast` to a pattern that is highly optimized for repeated
     // `format()` invocations. **Note:** This passes the `locales` set provided
     // to the constructor instead of just the resolved locale.
-    var pattern = this._compilePattern(ast, locales, formats, pluralFn);
+    var pluralFn = this._findPluralRuleFunction(this._locale);
+    var pattern  = this._compilePattern(ast, locales, formats, pluralFn);
 
     // "Bind" `format()` method to `this` so it can be passed by reference like
     // the other `Intl` APIs.
@@ -118,17 +125,7 @@ src$es5$$.defineProperty(MessageFormat, '__addLocaleData', {value: function (dat
         );
     }
 
-    if (!data.pluralRuleFunction) {
-        throw new Error(
-            'Locale data provided to IntlMessageFormat is missing a ' +
-            '`pluralRuleFunction` property'
-        );
-    }
-
-    // Message format locale data only requires the first part of the tag.
-    var locale = data.locale.toLowerCase().split('-')[0];
-
-    MessageFormat.__localeData__[locale] = data;
+    MessageFormat.__localeData__[data.locale.toLowerCase()] = data;
 }});
 
 // Defines `__parse()` static method as an exposed private.
@@ -154,6 +151,26 @@ MessageFormat.prototype._compilePattern = function (ast, locales, formats, plura
     return compiler.compile(ast);
 };
 
+MessageFormat.prototype._findPluralRuleFunction = function (locale) {
+    var localeData = MessageFormat.__localeData__;
+    var data       = localeData[locale.toLowerCase()];
+
+    // The locale data is de-duplicated, so we have to traverse the locale's
+    // hierarchy until we find a `pluralRuleFunction` to return.
+    while (data) {
+        if (data.pluralRuleFunction) {
+            return data.pluralRuleFunction;
+        }
+
+        data = data.parentLocale && localeData[data.parentLocale.toLowerCase()];
+    }
+
+    throw new Error(
+        'Locale data added to IntlMessageFormat is missing a ' +
+        '`pluralRuleFunction` for :' + locale
+    );
+};
+
 MessageFormat.prototype._format = function (pattern, values) {
     var result = '',
         i, len, part, id, value;
@@ -207,38 +224,40 @@ MessageFormat.prototype._mergeFormats = function (defaults, formats) {
 };
 
 MessageFormat.prototype._resolveLocale = function (locales) {
-    if (!locales) {
-        locales = MessageFormat.defaultLocale;
-    }
-
     if (typeof locales === 'string') {
         locales = [locales];
     }
 
+    // Create a copy of the array so we can push on the default locale.
+    locales = (locales || []).concat(MessageFormat.defaultLocale);
+
     var localeData = MessageFormat.__localeData__;
-    var i, len, locale;
+    var i, len, localeParts, data;
 
+    // Using the set of locales + the default locale, we look for the first one
+    // which that has been registered. When data does not exist for a locale, we
+    // traverse its ancestors to find something that's been registered within
+    // its hierarchy of locales. Since we lack the proper `parentLocale` data
+    // here, we must take a naive approach to traversal.
     for (i = 0, len = locales.length; i < len; i += 1) {
-        // We just need the root part of the langage tag.
-        locale = locales[i].split('-')[0].toLowerCase();
-
-        // Validate that the langage tag is structurally valid.
-        if (!/[a-z]{2,3}/.test(locale)) {
-            throw new Error(
-                'Language tag provided to IntlMessageFormat is not ' +
-                'structrually valid: ' + locale
-            );
-        }
+        localeParts = locales[i].toLowerCase().split('-');
+
+        while (localeParts.length) {
+            data = localeData[localeParts.join('-')];
+            if (data) {
+                // Return the normalized locale string; e.g., we return "en-US",
+                // instead of "en-us".
+                return data.locale;
+            }
 
-        // Return the first locale for which we have CLDR data registered.
-        if (src$utils$$.hop.call(localeData, locale)) {
-            return locale;
+            localeParts.pop();
         }
     }
 
+    var defaultLocale = locales.pop();
     throw new Error(
         'No locale data has been added to IntlMessageFormat for: ' +
-        locales.join(', ')
+        locales.join(', ') + ', or the default locale: ' + defaultLocale
     );
 };
 

package/lib/en.js

@@ -1,4 +1,5 @@
+// GENERATED FILE
 "use strict";
-exports["default"] = {"locale":"en","pluralRuleFunction":function (n) {var i=Math.floor(Math.abs(n)),v=n.toString().replace(/^[^.]*\.?/,"").length;n=Math.floor(n);if(i===1&&v===0)return"one";return"other";}};
+exports["default"] = {"locale":"en","pluralRuleFunction":function (n,ord){var s=String(n).split("."),v0=!s[1],t0=Number(s[0])==n,n10=t0&&s[0].slice(-1),n100=t0&&s[0].slice(-2);if(ord)return n10==1&&n100!=11?"one":n10==2&&n100!=12?"two":n10==3&&n100!=13?"few":"other";return n==1&&v0?"one":"other"}};
 
 //# sourceMappingURL=en.js.map

package/lib/es5.js

@@ -1,3 +1,11 @@
+/*
+Copyright (c) 2014, Yahoo! Inc. All rights reserved.
+Copyrights licensed under the New BSD License.
+See the accompanying LICENSE file for terms.
+*/
+
+/* jslint esnext: true */
+
 "use strict";
 var src$utils$$ = require("./utils");