intl-messageformat 1.0.3 → 1.3.0

package/dist/intl-messageformat.js

@@ -159,7 +159,9 @@
 
             case 'pluralFormat':
                 options = this.compileOptions(element);
-                return new $$compiler$$PluralFormat(element.id, format.offset, options, pluralFn);
+                return new $$compiler$$PluralFormat(
+                    element.id, format.ordinal, format.offset, options, pluralFn
+                );
 
             case 'selectFormat':
                 options = this.compileOptions(element);
@@ -176,8 +178,8 @@
             optionsHash = {};
 
         // Save the current plural element, if any, then set it to a new value when
-        // compiling the options sub-patterns. This conform's the spec's algorithm
-        // for handling `"#"` synax in message text.
+        // compiling the options sub-patterns. This conforms the spec's algorithm
+        // for handling `"#"` syntax in message text.
         this.pluralStack.push(this.currentPlural);
         this.currentPlural = format.type === 'pluralFormat' ? element : null;
 
@@ -190,7 +192,7 @@
             optionsHash[option.selector] = this.compileMessage(option.value);
         }
 
-        // Pop the plural stack to put back the original currnet plural value.
+        // Pop the plural stack to put back the original current plural value.
         this.currentPlural = this.pluralStack.pop();
 
         return optionsHash;
@@ -210,18 +212,19 @@
         return typeof value === 'string' ? value : String(value);
     };
 
-    function $$compiler$$PluralFormat(id, offset, options, pluralFn) {
-        this.id       = id;
-        this.offset   = offset;
-        this.options  = options;
-        this.pluralFn = pluralFn;
+    function $$compiler$$PluralFormat(id, useOrdinal, offset, options, pluralFn) {
+        this.id         = id;
+        this.useOrdinal = useOrdinal;
+        this.offset     = offset;
+        this.options    = options;
+        this.pluralFn   = pluralFn;
     }
 
     $$compiler$$PluralFormat.prototype.getOption = function (value) {
         var options = this.options;
 
         var option = options['=' + value] ||
-                options[this.pluralFn(value - this.offset)];
+                options[this.pluralFn(value - this.offset, this.useOrdinal)];
 
         return option || options.other;
     };
@@ -343,67 +346,88 @@
                 },
             peg$c22 = "plural",
             peg$c23 = { type: "literal", value: "plural", description: "\"plural\"" },
-            peg$c24 = function(offset, options) {
+            peg$c24 = function(pluralStyle) {
                     return {
-                        type   : 'pluralFormat',
-                        offset : offset || 0,
-                        options: options
+                        type   : pluralStyle.type,
+                        ordinal: false,
+                        offset : pluralStyle.offset || 0,
+                        options: pluralStyle.options
+                    };
+                },
+            peg$c25 = "selectordinal",
+            peg$c26 = { type: "literal", value: "selectordinal", description: "\"selectordinal\"" },
+            peg$c27 = function(pluralStyle) {
+                    return {
+                        type   : pluralStyle.type,
+                        ordinal: true,
+                        offset : pluralStyle.offset || 0,
+                        options: pluralStyle.options
                     }
                 },
-            peg$c25 = "select",
-            peg$c26 = { type: "literal", value: "select", description: "\"select\"" },
-            peg$c27 = function(options) {
+            peg$c28 = "select",
+            peg$c29 = { type: "literal", value: "select", description: "\"select\"" },
+            peg$c30 = function(options) {
                     return {
                         type   : 'selectFormat',
                         options: options
-                    }
+                    };
                 },
-            peg$c28 = "=",
-            peg$c29 = { type: "literal", value: "=", description: "\"=\"" },
-            peg$c30 = function(selector, pattern) {
+            peg$c31 = "=",
+            peg$c32 = { type: "literal", value: "=", description: "\"=\"" },
+            peg$c33 = function(selector, pattern) {
                     return {
                         type    : 'optionalFormatPattern',
                         selector: selector,
                         value   : pattern
                     };
                 },
-            peg$c31 = "offset:",
-            peg$c32 = { type: "literal", value: "offset:", description: "\"offset:\"" },
-            peg$c33 = function(number) {
+            peg$c34 = "offset:",
+            peg$c35 = { type: "literal", value: "offset:", description: "\"offset:\"" },
+            peg$c36 = function(number) {
                     return number;
                 },
-            peg$c34 = { type: "other", description: "whitespace" },
-            peg$c35 = /^[ \t\n\r]/,
-            peg$c36 = { type: "class", value: "[ \\t\\n\\r]", description: "[ \\t\\n\\r]" },
-            peg$c37 = { type: "other", description: "optionalWhitespace" },
-            peg$c38 = /^[0-9]/,
-            peg$c39 = { type: "class", value: "[0-9]", description: "[0-9]" },
-            peg$c40 = /^[0-9a-f]/i,
-            peg$c41 = { type: "class", value: "[0-9a-f]i", description: "[0-9a-f]i" },
-            peg$c42 = "0",
-            peg$c43 = { type: "literal", value: "0", description: "\"0\"" },
-            peg$c44 = /^[1-9]/,
-            peg$c45 = { type: "class", value: "[1-9]", description: "[1-9]" },
-            peg$c46 = function(digits) {
+            peg$c37 = function(offset, options) {
+                    return {
+                        type   : 'pluralFormat',
+                        offset : offset,
+                        options: options
+                    };
+                },
+            peg$c38 = { type: "other", description: "whitespace" },
+            peg$c39 = /^[ \t\n\r]/,
+            peg$c40 = { type: "class", value: "[ \\t\\n\\r]", description: "[ \\t\\n\\r]" },
+            peg$c41 = { type: "other", description: "optionalWhitespace" },
+            peg$c42 = /^[0-9]/,
+            peg$c43 = { type: "class", value: "[0-9]", description: "[0-9]" },
+            peg$c44 = /^[0-9a-f]/i,
+            peg$c45 = { type: "class", value: "[0-9a-f]i", description: "[0-9a-f]i" },
+            peg$c46 = "0",
+            peg$c47 = { type: "literal", value: "0", description: "\"0\"" },
+            peg$c48 = /^[1-9]/,
+            peg$c49 = { type: "class", value: "[1-9]", description: "[1-9]" },
+            peg$c50 = function(digits) {
                 return parseInt(digits, 10);
             },
-            peg$c47 = /^[^{}\\\0-\x1F \t\n\r]/,
-            peg$c48 = { type: "class", value: "[^{}\\\\\\0-\\x1F \\t\\n\\r]", description: "[^{}\\\\\\0-\\x1F \\t\\n\\r]" },
-            peg$c49 = "\\#",
-            peg$c50 = { type: "literal", value: "\\#", description: "\"\\\\#\"" },
-            peg$c51 = function() { return '\\#'; },
-            peg$c52 = "\\{",
-            peg$c53 = { type: "literal", value: "\\{", description: "\"\\\\{\"" },
-            peg$c54 = function() { return '\u007B'; },
-            peg$c55 = "\\}",
-            peg$c56 = { type: "literal", value: "\\}", description: "\"\\\\}\"" },
-            peg$c57 = function() { return '\u007D'; },
-            peg$c58 = "\\u",
-            peg$c59 = { type: "literal", value: "\\u", description: "\"\\\\u\"" },
-            peg$c60 = function(digits) {
+            peg$c51 = /^[^{}\\\0-\x1F \t\n\r]/,
+            peg$c52 = { type: "class", value: "[^{}\\\\\\0-\\x1F \\t\\n\\r]", description: "[^{}\\\\\\0-\\x1F \\t\\n\\r]" },
+            peg$c53 = "\\\\",
+            peg$c54 = { type: "literal", value: "\\\\", description: "\"\\\\\\\\\"" },
+            peg$c55 = function() { return '\\'; },
+            peg$c56 = "\\#",
+            peg$c57 = { type: "literal", value: "\\#", description: "\"\\\\#\"" },
+            peg$c58 = function() { return '\\#'; },
+            peg$c59 = "\\{",
+            peg$c60 = { type: "literal", value: "\\{", description: "\"\\\\{\"" },
+            peg$c61 = function() { return '\u007B'; },
+            peg$c62 = "\\}",
+            peg$c63 = { type: "literal", value: "\\}", description: "\"\\\\}\"" },
+            peg$c64 = function() { return '\u007D'; },
+            peg$c65 = "\\u",
+            peg$c66 = { type: "literal", value: "\\u", description: "\"\\\\u\"" },
+            peg$c67 = function(digits) {
                     return String.fromCharCode(parseInt(digits, 16));
                 },
-            peg$c61 = function(chars) { return chars.join(''); },
+            peg$c68 = function(chars) { return chars.join(''); },
 
             peg$currPos          = 0,
             peg$reportedPos      = 0,
@@ -832,7 +856,10 @@
           if (s0 === peg$FAILED) {
             s0 = peg$parsepluralFormat();
             if (s0 === peg$FAILED) {
-              s0 = peg$parseselectFormat();
+              s0 = peg$parseselectOrdinalFormat();
+              if (s0 === peg$FAILED) {
+                s0 = peg$parseselectFormat();
+              }
             }
           }
 
@@ -922,7 +949,7 @@
         }
 
         function peg$parsepluralFormat() {
-          var s0, s1, s2, s3, s4, s5, s6, s7, s8;
+          var s0, s1, s2, s3, s4, s5;
 
           s0 = peg$currPos;
           if (input.substr(peg$currPos, 6) === peg$c22) {
@@ -945,35 +972,64 @@
               if (s3 !== peg$FAILED) {
                 s4 = peg$parse_();
                 if (s4 !== peg$FAILED) {
-                  s5 = peg$parseoffset();
-                  if (s5 === peg$FAILED) {
-                    s5 = peg$c9;
+                  s5 = peg$parsepluralStyle();
+                  if (s5 !== peg$FAILED) {
+                    peg$reportedPos = s0;
+                    s1 = peg$c24(s5);
+                    s0 = s1;
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$c2;
                   }
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$c2;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$c2;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$c2;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$c2;
+          }
+
+          return s0;
+        }
+
+        function peg$parseselectOrdinalFormat() {
+          var s0, s1, s2, s3, s4, s5;
+
+          s0 = peg$currPos;
+          if (input.substr(peg$currPos, 13) === peg$c25) {
+            s1 = peg$c25;
+            peg$currPos += 13;
+          } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$c26); }
+          }
+          if (s1 !== peg$FAILED) {
+            s2 = peg$parse_();
+            if (s2 !== peg$FAILED) {
+              if (input.charCodeAt(peg$currPos) === 44) {
+                s3 = peg$c10;
+                peg$currPos++;
+              } else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$c11); }
+              }
+              if (s3 !== peg$FAILED) {
+                s4 = peg$parse_();
+                if (s4 !== peg$FAILED) {
+                  s5 = peg$parsepluralStyle();
                   if (s5 !== peg$FAILED) {
-                    s6 = peg$parse_();
-                    if (s6 !== peg$FAILED) {
-                      s7 = [];
-                      s8 = peg$parseoptionalFormatPattern();
-                      if (s8 !== peg$FAILED) {
-                        while (s8 !== peg$FAILED) {
-                          s7.push(s8);
-                          s8 = peg$parseoptionalFormatPattern();
-                        }
-                      } else {
-                        s7 = peg$c2;
-                      }
-                      if (s7 !== peg$FAILED) {
-                        peg$reportedPos = s0;
-                        s1 = peg$c24(s5, s7);
-                        s0 = s1;
-                      } else {
-                        peg$currPos = s0;
-                        s0 = peg$c2;
-                      }
-                    } else {
-                      peg$currPos = s0;
-                      s0 = peg$c2;
-                    }
+                    peg$reportedPos = s0;
+                    s1 = peg$c27(s5);
+                    s0 = s1;
                   } else {
                     peg$currPos = s0;
                     s0 = peg$c2;
@@ -1002,12 +1058,12 @@
           var s0, s1, s2, s3, s4, s5, s6;
 
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 6) === peg$c25) {
-            s1 = peg$c25;
+          if (input.substr(peg$currPos, 6) === peg$c28) {
+            s1 = peg$c28;
             peg$currPos += 6;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c26); }
+            if (peg$silentFails === 0) { peg$fail(peg$c29); }
           }
           if (s1 !== peg$FAILED) {
             s2 = peg$parse_();
@@ -1034,7 +1090,7 @@
                   }
                   if (s5 !== peg$FAILED) {
                     peg$reportedPos = s0;
-                    s1 = peg$c27(s5);
+                    s1 = peg$c30(s5);
                     s0 = s1;
                   } else {
                     peg$currPos = s0;
@@ -1066,11 +1122,11 @@
           s0 = peg$currPos;
           s1 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 61) {
-            s2 = peg$c28;
+            s2 = peg$c31;
             peg$currPos++;
           } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c29); }
+            if (peg$silentFails === 0) { peg$fail(peg$c32); }
           }
           if (s2 !== peg$FAILED) {
             s3 = peg$parsenumber();
@@ -1129,7 +1185,7 @@
                         }
                         if (s8 !== peg$FAILED) {
                           peg$reportedPos = s0;
-                          s1 = peg$c30(s2, s6);
+                          s1 = peg$c33(s2, s6);
                           s0 = s1;
                         } else {
                           peg$currPos = s0;
@@ -1171,12 +1227,12 @@
           var s0, s1, s2, s3;
 
           s0 = peg$currPos;
-          if (input.substr(peg$currPos, 7) === peg$c31) {
-            s1 = peg$c31;
+          if (input.substr(peg$currPos, 7) === peg$c34) {
+            s1 = peg$c34;
             peg$currPos += 7;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c32); }
+            if (peg$silentFails === 0) { peg$fail(peg$c35); }
           }
           if (s1 !== peg$FAILED) {
             s2 = peg$parse_();
@@ -1184,7 +1240,48 @@
               s3 = peg$parsenumber();
               if (s3 !== peg$FAILED) {
                 peg$reportedPos = s0;
-                s1 = peg$c33(s3);
+                s1 = peg$c36(s3);
+                s0 = s1;
+              } else {
+                peg$currPos = s0;
+                s0 = peg$c2;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$c2;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$c2;
+          }
+
+          return s0;
+        }
+
+        function peg$parsepluralStyle() {
+          var s0, s1, s2, s3, s4;
+
+          s0 = peg$currPos;
+          s1 = peg$parseoffset();
+          if (s1 === peg$FAILED) {
+            s1 = peg$c9;
+          }
+          if (s1 !== peg$FAILED) {
+            s2 = peg$parse_();
+            if (s2 !== peg$FAILED) {
+              s3 = [];
+              s4 = peg$parseoptionalFormatPattern();
+              if (s4 !== peg$FAILED) {
+                while (s4 !== peg$FAILED) {
+                  s3.push(s4);
+                  s4 = peg$parseoptionalFormatPattern();
+                }
+              } else {
+                s3 = peg$c2;
+              }
+              if (s3 !== peg$FAILED) {
+                peg$reportedPos = s0;
+                s1 = peg$c37(s1, s3);
                 s0 = s1;
               } else {
                 peg$currPos = s0;
@@ -1207,22 +1304,22 @@
 
           peg$silentFails++;
           s0 = [];
-          if (peg$c35.test(input.charAt(peg$currPos))) {
+          if (peg$c39.test(input.charAt(peg$currPos))) {
             s1 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c36); }
+            if (peg$silentFails === 0) { peg$fail(peg$c40); }
           }
           if (s1 !== peg$FAILED) {
             while (s1 !== peg$FAILED) {
               s0.push(s1);
-              if (peg$c35.test(input.charAt(peg$currPos))) {
+              if (peg$c39.test(input.charAt(peg$currPos))) {
                 s1 = input.charAt(peg$currPos);
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c36); }
+                if (peg$silentFails === 0) { peg$fail(peg$c40); }
               }
             }
           } else {
@@ -1231,7 +1328,7 @@
           peg$silentFails--;
           if (s0 === peg$FAILED) {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c34); }
+            if (peg$silentFails === 0) { peg$fail(peg$c38); }
           }
 
           return s0;
@@ -1255,7 +1352,7 @@
           peg$silentFails--;
           if (s0 === peg$FAILED) {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c37); }
+            if (peg$silentFails === 0) { peg$fail(peg$c41); }
           }
 
           return s0;
@@ -1264,12 +1361,12 @@
         function peg$parsedigit() {
           var s0;
 
-          if (peg$c38.test(input.charAt(peg$currPos))) {
+          if (peg$c42.test(input.charAt(peg$currPos))) {
             s0 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c39); }
+            if (peg$silentFails === 0) { peg$fail(peg$c43); }
           }
 
           return s0;
@@ -1278,12 +1375,12 @@
         function peg$parsehexDigit() {
           var s0;
 
-          if (peg$c40.test(input.charAt(peg$currPos))) {
+          if (peg$c44.test(input.charAt(peg$currPos))) {
             s0 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c41); }
+            if (peg$silentFails === 0) { peg$fail(peg$c45); }
           }
 
           return s0;
@@ -1294,21 +1391,21 @@
 
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 48) {
-            s1 = peg$c42;
+            s1 = peg$c46;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c43); }
+            if (peg$silentFails === 0) { peg$fail(peg$c47); }
           }
           if (s1 === peg$FAILED) {
             s1 = peg$currPos;
             s2 = peg$currPos;
-            if (peg$c44.test(input.charAt(peg$currPos))) {
+            if (peg$c48.test(input.charAt(peg$currPos))) {
               s3 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c45); }
+              if (peg$silentFails === 0) { peg$fail(peg$c49); }
             }
             if (s3 !== peg$FAILED) {
               s4 = [];
@@ -1335,7 +1432,7 @@
           }
           if (s1 !== peg$FAILED) {
             peg$reportedPos = s0;
-            s1 = peg$c46(s1);
+            s1 = peg$c50(s1);
           }
           s0 = s1;
 
@@ -1345,77 +1442,95 @@
         function peg$parsechar() {
           var s0, s1, s2, s3, s4, s5, s6, s7;
 
-          if (peg$c47.test(input.charAt(peg$currPos))) {
+          if (peg$c51.test(input.charAt(peg$currPos))) {
             s0 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$c48); }
+            if (peg$silentFails === 0) { peg$fail(peg$c52); }
           }
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c49) {
-              s1 = peg$c49;
+            if (input.substr(peg$currPos, 2) === peg$c53) {
+              s1 = peg$c53;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$c50); }
+              if (peg$silentFails === 0) { peg$fail(peg$c54); }
             }
             if (s1 !== peg$FAILED) {
               peg$reportedPos = s0;
-              s1 = peg$c51();
+              s1 = peg$c55();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              if (input.substr(peg$currPos, 2) === peg$c52) {
-                s1 = peg$c52;
+              if (input.substr(peg$currPos, 2) === peg$c56) {
+                s1 = peg$c56;
                 peg$currPos += 2;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$c53); }
+                if (peg$silentFails === 0) { peg$fail(peg$c57); }
               }
               if (s1 !== peg$FAILED) {
                 peg$reportedPos = s0;
-                s1 = peg$c54();
+                s1 = peg$c58();
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
-                if (input.substr(peg$currPos, 2) === peg$c55) {
-                  s1 = peg$c55;
+                if (input.substr(peg$currPos, 2) === peg$c59) {
+                  s1 = peg$c59;
                   peg$currPos += 2;
                 } else {
                   s1 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$c56); }
+                  if (peg$silentFails === 0) { peg$fail(peg$c60); }
                 }
                 if (s1 !== peg$FAILED) {
                   peg$reportedPos = s0;
-                  s1 = peg$c57();
+                  s1 = peg$c61();
                 }
                 s0 = s1;
                 if (s0 === peg$FAILED) {
                   s0 = peg$currPos;
-                  if (input.substr(peg$currPos, 2) === peg$c58) {
-                    s1 = peg$c58;
+                  if (input.substr(peg$currPos, 2) === peg$c62) {
+                    s1 = peg$c62;
                     peg$currPos += 2;
                   } else {
                     s1 = peg$FAILED;
-                    if (peg$silentFails === 0) { peg$fail(peg$c59); }
+                    if (peg$silentFails === 0) { peg$fail(peg$c63); }
                   }
                   if (s1 !== peg$FAILED) {
-                    s2 = peg$currPos;
-                    s3 = peg$currPos;
-                    s4 = peg$parsehexDigit();
-                    if (s4 !== peg$FAILED) {
-                      s5 = peg$parsehexDigit();
-                      if (s5 !== peg$FAILED) {
-                        s6 = peg$parsehexDigit();
-                        if (s6 !== peg$FAILED) {
-                          s7 = peg$parsehexDigit();
-                          if (s7 !== peg$FAILED) {
-                            s4 = [s4, s5, s6, s7];
-                            s3 = s4;
+                    peg$reportedPos = s0;
+                    s1 = peg$c64();
+                  }
+                  s0 = s1;
+                  if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    if (input.substr(peg$currPos, 2) === peg$c65) {
+                      s1 = peg$c65;
+                      peg$currPos += 2;
+                    } else {
+                      s1 = peg$FAILED;
+                      if (peg$silentFails === 0) { peg$fail(peg$c66); }
+                    }
+                    if (s1 !== peg$FAILED) {
+                      s2 = peg$currPos;
+                      s3 = peg$currPos;
+                      s4 = peg$parsehexDigit();
+                      if (s4 !== peg$FAILED) {
+                        s5 = peg$parsehexDigit();
+                        if (s5 !== peg$FAILED) {
+                          s6 = peg$parsehexDigit();
+                          if (s6 !== peg$FAILED) {
+                            s7 = peg$parsehexDigit();
+                            if (s7 !== peg$FAILED) {
+                              s4 = [s4, s5, s6, s7];
+                              s3 = s4;
+                            } else {
+                              peg$currPos = s3;
+                              s3 = peg$c2;
+                            }
                           } else {
                             peg$currPos = s3;
                             s3 = peg$c2;
@@ -1428,25 +1543,22 @@
                         peg$currPos = s3;
                         s3 = peg$c2;
                       }
-                    } else {
-                      peg$currPos = s3;
-                      s3 = peg$c2;
-                    }
-                    if (s3 !== peg$FAILED) {
-                      s3 = input.substring(s2, peg$currPos);
-                    }
-                    s2 = s3;
-                    if (s2 !== peg$FAILED) {
-                      peg$reportedPos = s0;
-                      s1 = peg$c60(s2);
-                      s0 = s1;
+                      if (s3 !== peg$FAILED) {
+                        s3 = input.substring(s2, peg$currPos);
+                      }
+                      s2 = s3;
+                      if (s2 !== peg$FAILED) {
+                        peg$reportedPos = s0;
+                        s1 = peg$c67(s2);
+                        s0 = s1;
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$c2;
+                      }
                     } else {
                       peg$currPos = s0;
                       s0 = peg$c2;
                     }
-                  } else {
-                    peg$currPos = s0;
-                    s0 = peg$c2;
                   }
                 }
               }
@@ -1472,7 +1584,7 @@
           }
           if (s1 !== peg$FAILED) {
             peg$reportedPos = s0;
-            s1 = peg$c61(s1);
+            s1 = peg$c68(s1);
           }
           s0 = s1;
 
@@ -1518,12 +1630,11 @@
         // Defined first because it's used to build the format pattern.
         $$es5$$defineProperty(this, '_locale',  {value: this._resolveLocale(locales)});
 
-        var pluralFn = $$core$$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.
@@ -1616,17 +1727,7 @@
             );
         }
 
-        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];
-
-        $$core$$MessageFormat.__localeData__[locale] = data;
+        $$core$$MessageFormat.__localeData__[data.locale.toLowerCase()] = data;
     }});
 
     // Defines `__parse()` static method as an exposed private.
@@ -1652,6 +1753,26 @@
         return compiler.compile(ast);
     };
 
+    $$core$$MessageFormat.prototype._findPluralRuleFunction = function (locale) {
+        var localeData = $$core$$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
+        );
+    };
+
     $$core$$MessageFormat.prototype._format = function (pattern, values) {
         var result = '',
             i, len, part, id, value;
@@ -1705,41 +1826,43 @@
     };
 
     $$core$$MessageFormat.prototype._resolveLocale = function (locales) {
-        if (!locales) {
-            locales = $$core$$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($$core$$MessageFormat.defaultLocale);
+
         var localeData = $$core$$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 ($$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
         );
     };
-    var $$en$$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";}};
+    var $$en$$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"}};
 
     $$core$$default.__addLocaleData($$en$$default);
     $$core$$default.defaultLocale = 'en';