react-intl 3.9.1 → 3.11.0

package/dist/react-intl.js

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019, Yahoo Inc.
+ * Copyright 2020, Yahoo Inc.
  * Copyrights licensed under the New BSD License.
  * See the accompanying LICENSE file for terms.
  */
@@ -195,6 +195,12 @@
 	   */
 
 	  TYPE[TYPE["plural"] = 6] = "plural";
+	  /**
+	   * Only possible within plural argument.
+	   * This is the `#` symbol that will be substituted with the count.
+	   */
+
+	  TYPE[TYPE["pound"] = 7] = "pound";
 	})(TYPE || (TYPE = {}));
 	/**
 	 * Type Guards
@@ -222,6 +228,9 @@
 	function isPluralElement(el) {
 	  return el.type === TYPE.plural;
 	}
+	function isPoundElement(el) {
+	  return el.type === TYPE.pound;
+	}
 	function isNumberSkeleton(el) {
 	  return !!(el && _typeof(el) === 'object' && el.type === 0
 	  /* number */
@@ -405,41 +414,50 @@
 	    }, insertLocation());
 	  };
 
-	  var peg$c2 = peg$otherExpectation("argumentElement");
-	  var peg$c3 = "{";
-	  var peg$c4 = peg$literalExpectation("{", false);
-	  var peg$c5 = "}";
-	  var peg$c6 = peg$literalExpectation("}", false);
+	  var peg$c2 = "#";
+	  var peg$c3 = peg$literalExpectation("#", false);
+
+	  var peg$c4 = function peg$c4() {
+	    return __assign({
+	      type: TYPE.pound
+	    }, insertLocation());
+	  };
+
+	  var peg$c5 = peg$otherExpectation("argumentElement");
+	  var peg$c6 = "{";
+	  var peg$c7 = peg$literalExpectation("{", false);
+	  var peg$c8 = "}";
+	  var peg$c9 = peg$literalExpectation("}", false);
 
-	  var peg$c7 = function peg$c7(value) {
+	  var peg$c10 = function peg$c10(value) {
 	    return __assign({
 	      type: TYPE.argument,
 	      value: value
 	    }, insertLocation());
 	  };
 
-	  var peg$c8 = peg$otherExpectation("numberSkeletonId");
-	  var peg$c9 = /^['\/{}]/;
-	  var peg$c10 = peg$classExpectation(["'", "/", "{", "}"], false, false);
-	  var peg$c11 = peg$anyExpectation();
-	  var peg$c12 = peg$otherExpectation("numberSkeletonTokenOption");
-	  var peg$c13 = "/";
-	  var peg$c14 = peg$literalExpectation("/", false);
+	  var peg$c11 = peg$otherExpectation("numberSkeletonId");
+	  var peg$c12 = /^['\/{}]/;
+	  var peg$c13 = peg$classExpectation(["'", "/", "{", "}"], false, false);
+	  var peg$c14 = peg$anyExpectation();
+	  var peg$c15 = peg$otherExpectation("numberSkeletonTokenOption");
+	  var peg$c16 = "/";
+	  var peg$c17 = peg$literalExpectation("/", false);
 
-	  var peg$c15 = function peg$c15(option) {
+	  var peg$c18 = function peg$c18(option) {
 	    return option;
 	  };
 
-	  var peg$c16 = peg$otherExpectation("numberSkeletonToken");
+	  var peg$c19 = peg$otherExpectation("numberSkeletonToken");
 
-	  var peg$c17 = function peg$c17(stem, options) {
+	  var peg$c20 = function peg$c20(stem, options) {
 	    return {
 	      stem: stem,
 	      options: options
 	    };
 	  };
 
-	  var peg$c18 = function peg$c18(tokens) {
+	  var peg$c21 = function peg$c21(tokens) {
 	    return __assign({
 	      type: 0
 	      /* number */
@@ -448,23 +466,29 @@
 	    }, insertLocation());
 	  };
 
-	  var peg$c19 = "::";
-	  var peg$c20 = peg$literalExpectation("::", false);
+	  var peg$c22 = "::";
+	  var peg$c23 = peg$literalExpectation("::", false);
 
-	  var peg$c21 = function peg$c21(skeleton) {
+	  var peg$c24 = function peg$c24(skeleton) {
 	    return skeleton;
 	  };
 
-	  var peg$c22 = function peg$c22(style) {
+	  var peg$c25 = function peg$c25() {
+	    messageCtx.push('numberArgStyle');
+	    return true;
+	  };
+
+	  var peg$c26 = function peg$c26(style) {
+	    messageCtx.pop();
 	    return style.replace(/\s*$/, '');
 	  };
 
-	  var peg$c23 = ",";
-	  var peg$c24 = peg$literalExpectation(",", false);
-	  var peg$c25 = "number";
-	  var peg$c26 = peg$literalExpectation("number", false);
+	  var peg$c27 = ",";
+	  var peg$c28 = peg$literalExpectation(",", false);
+	  var peg$c29 = "number";
+	  var peg$c30 = peg$literalExpectation("number", false);
 
-	  var peg$c27 = function peg$c27(value, type, style) {
+	  var peg$c31 = function peg$c31(value, type, style) {
 	    return __assign({
 	      type: type === 'number' ? TYPE.number : type === 'date' ? TYPE.date : TYPE.time,
 	      style: style && style[2],
@@ -472,16 +496,16 @@
 	    }, insertLocation());
 	  };
 
-	  var peg$c28 = "'";
-	  var peg$c29 = peg$literalExpectation("'", false);
-	  var peg$c30 = /^[^']/;
-	  var peg$c31 = peg$classExpectation(["'"], true, false);
-	  var peg$c32 = /^[^a-zA-Z'{}]/;
-	  var peg$c33 = peg$classExpectation([["a", "z"], ["A", "Z"], "'", "{", "}"], true, false);
-	  var peg$c34 = /^[a-zA-Z]/;
-	  var peg$c35 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
+	  var peg$c32 = "'";
+	  var peg$c33 = peg$literalExpectation("'", false);
+	  var peg$c34 = /^[^']/;
+	  var peg$c35 = peg$classExpectation(["'"], true, false);
+	  var peg$c36 = /^[^a-zA-Z'{}]/;
+	  var peg$c37 = peg$classExpectation([["a", "z"], ["A", "Z"], "'", "{", "}"], true, false);
+	  var peg$c38 = /^[a-zA-Z]/;
+	  var peg$c39 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
 
-	  var peg$c36 = function peg$c36(pattern) {
+	  var peg$c40 = function peg$c40(pattern) {
 	    return __assign({
 	      type: 1
 	      /* dateTime */
@@ -490,18 +514,23 @@
 	    }, insertLocation());
 	  };
 
-	  var peg$c37 = "date";
-	  var peg$c38 = peg$literalExpectation("date", false);
-	  var peg$c39 = "time";
-	  var peg$c40 = peg$literalExpectation("time", false);
-	  var peg$c41 = "plural";
-	  var peg$c42 = peg$literalExpectation("plural", false);
-	  var peg$c43 = "selectordinal";
-	  var peg$c44 = peg$literalExpectation("selectordinal", false);
-	  var peg$c45 = "offset:";
-	  var peg$c46 = peg$literalExpectation("offset:", false);
-
-	  var peg$c47 = function peg$c47(value, pluralType, offset, options) {
+	  var peg$c41 = function peg$c41() {
+	    messageCtx.push('dateOrTimeArgStyle');
+	    return true;
+	  };
+
+	  var peg$c42 = "date";
+	  var peg$c43 = peg$literalExpectation("date", false);
+	  var peg$c44 = "time";
+	  var peg$c45 = peg$literalExpectation("time", false);
+	  var peg$c46 = "plural";
+	  var peg$c47 = peg$literalExpectation("plural", false);
+	  var peg$c48 = "selectordinal";
+	  var peg$c49 = peg$literalExpectation("selectordinal", false);
+	  var peg$c50 = "offset:";
+	  var peg$c51 = peg$literalExpectation("offset:", false);
+
+	  var peg$c52 = function peg$c52(value, pluralType, offset, options) {
 	    return __assign({
 	      type: TYPE.plural,
 	      pluralType: pluralType === 'plural' ? 'cardinal' : 'ordinal',
@@ -525,10 +554,10 @@
 	    }, insertLocation());
 	  };
 
-	  var peg$c48 = "select";
-	  var peg$c49 = peg$literalExpectation("select", false);
+	  var peg$c53 = "select";
+	  var peg$c54 = peg$literalExpectation("select", false);
 
-	  var peg$c50 = function peg$c50(value, options) {
+	  var peg$c55 = function peg$c55(value, options) {
 	    return __assign({
 	      type: TYPE.select,
 	      value: value,
@@ -550,73 +579,91 @@
 	    }, insertLocation());
 	  };
 
-	  var peg$c51 = "=";
-	  var peg$c52 = peg$literalExpectation("=", false);
+	  var peg$c56 = "=";
+	  var peg$c57 = peg$literalExpectation("=", false);
+
+	  var peg$c58 = function peg$c58(id) {
+	    messageCtx.push('select');
+	    return true;
+	  };
 
-	  var peg$c53 = function peg$c53(id, value) {
+	  var peg$c59 = function peg$c59(id, value) {
+	    messageCtx.pop();
 	    return __assign({
 	      id: id,
 	      value: value
 	    }, insertLocation());
 	  };
 
-	  var peg$c54 = function peg$c54(id, value) {
+	  var peg$c60 = function peg$c60(id) {
+	    messageCtx.push('plural');
+	    return true;
+	  };
+
+	  var peg$c61 = function peg$c61(id, value) {
+	    messageCtx.pop();
 	    return __assign({
 	      id: id,
 	      value: value
 	    }, insertLocation());
 	  };
 
-	  var peg$c55 = peg$otherExpectation("whitespace pattern");
-	  var peg$c56 = /^[\t-\r \x85\u200E\u200F\u2028\u2029]/;
-	  var peg$c57 = peg$classExpectation([["\t", "\r"], " ", "\x85", "\u200E", "\u200F", "\u2028", "\u2029"], false, false);
-	  var peg$c58 = peg$otherExpectation("syntax pattern");
-	  var peg$c59 = /^[!-\/:-@[-\^`{-~\xA1-\xA7\xA9\xAB\xAC\xAE\xB0\xB1\xB6\xBB\xBF\xD7\xF7\u2010-\u2027\u2030-\u203E\u2041-\u2053\u2055-\u205E\u2190-\u245F\u2500-\u2775\u2794-\u2BFF\u2E00-\u2E7F\u3001-\u3003\u3008-\u3020\u3030\uFD3E\uFD3F\uFE45\uFE46]/;
-	  var peg$c60 = peg$classExpectation([["!", "/"], [":", "@"], ["[", "^"], "`", ["{", "~"], ["\xA1", "\xA7"], "\xA9", "\xAB", "\xAC", "\xAE", "\xB0", "\xB1", "\xB6", "\xBB", "\xBF", "\xD7", "\xF7", ["\u2010", "\u2027"], ["\u2030", "\u203E"], ["\u2041", "\u2053"], ["\u2055", "\u205E"], ["\u2190", "\u245F"], ["\u2500", "\u2775"], ["\u2794", "\u2BFF"], ["\u2E00", "\u2E7F"], ["\u3001", "\u3003"], ["\u3008", "\u3020"], "\u3030", "\uFD3E", "\uFD3F", "\uFE45", "\uFE46"], false, false);
-	  var peg$c61 = peg$otherExpectation("optional whitespace");
-	  var peg$c62 = peg$otherExpectation("number");
-	  var peg$c63 = "-";
-	  var peg$c64 = peg$literalExpectation("-", false);
-
-	  var peg$c65 = function peg$c65(negative, num) {
+	  var peg$c62 = peg$otherExpectation("whitespace pattern");
+	  var peg$c63 = /^[\t-\r \x85\u200E\u200F\u2028\u2029]/;
+	  var peg$c64 = peg$classExpectation([["\t", "\r"], " ", "\x85", "\u200E", "\u200F", "\u2028", "\u2029"], false, false);
+	  var peg$c65 = peg$otherExpectation("syntax pattern");
+	  var peg$c66 = /^[!-\/:-@[-\^`{-~\xA1-\xA7\xA9\xAB\xAC\xAE\xB0\xB1\xB6\xBB\xBF\xD7\xF7\u2010-\u2027\u2030-\u203E\u2041-\u2053\u2055-\u205E\u2190-\u245F\u2500-\u2775\u2794-\u2BFF\u2E00-\u2E7F\u3001-\u3003\u3008-\u3020\u3030\uFD3E\uFD3F\uFE45\uFE46]/;
+	  var peg$c67 = peg$classExpectation([["!", "/"], [":", "@"], ["[", "^"], "`", ["{", "~"], ["\xA1", "\xA7"], "\xA9", "\xAB", "\xAC", "\xAE", "\xB0", "\xB1", "\xB6", "\xBB", "\xBF", "\xD7", "\xF7", ["\u2010", "\u2027"], ["\u2030", "\u203E"], ["\u2041", "\u2053"], ["\u2055", "\u205E"], ["\u2190", "\u245F"], ["\u2500", "\u2775"], ["\u2794", "\u2BFF"], ["\u2E00", "\u2E7F"], ["\u3001", "\u3003"], ["\u3008", "\u3020"], "\u3030", "\uFD3E", "\uFD3F", "\uFE45", "\uFE46"], false, false);
+	  var peg$c68 = peg$otherExpectation("optional whitespace");
+	  var peg$c69 = peg$otherExpectation("number");
+	  var peg$c70 = "-";
+	  var peg$c71 = peg$literalExpectation("-", false);
+
+	  var peg$c72 = function peg$c72(negative, num) {
 	    return num ? negative ? -num : num : 0;
 	  };
-	  var peg$c67 = peg$otherExpectation("double apostrophes");
-	  var peg$c68 = "''";
-	  var peg$c69 = peg$literalExpectation("''", false);
+	  var peg$c74 = peg$otherExpectation("double apostrophes");
+	  var peg$c75 = "''";
+	  var peg$c76 = peg$literalExpectation("''", false);
 
-	  var peg$c70 = function peg$c70() {
+	  var peg$c77 = function peg$c77() {
 	    return "'";
 	  };
 
-	  var peg$c71 = /^[{}]/;
-	  var peg$c72 = peg$classExpectation(["{", "}"], false, false);
-
-	  var peg$c73 = function peg$c73(escapedChar, quotedChars) {
+	  var peg$c78 = function peg$c78(escapedChar, quotedChars) {
 	    return escapedChar + quotedChars.replace("''", "'");
 	  };
 
-	  var peg$c74 = /^[^{}]/;
-	  var peg$c75 = peg$classExpectation(["{", "}"], true, false);
-	  var peg$c76 = peg$otherExpectation("argNameOrNumber");
-	  var peg$c77 = peg$otherExpectation("argNumber");
-	  var peg$c78 = "0";
-	  var peg$c79 = peg$literalExpectation("0", false);
+	  var peg$c79 = function peg$c79(x) {
+	    return x !== '{' && !(isInPluralOption() && x === '#') && !(isNestedMessageText() && x === '}');
+	  };
+
+	  var peg$c80 = "\n";
+	  var peg$c81 = peg$literalExpectation("\n", false);
+
+	  var peg$c82 = function peg$c82(x) {
+	    return x === '{' || x === '}' || isInPluralOption() && x === '#';
+	  };
 
-	  var peg$c80 = function peg$c80() {
+	  var peg$c83 = peg$otherExpectation("argNameOrNumber");
+	  var peg$c84 = peg$otherExpectation("argNumber");
+	  var peg$c85 = "0";
+	  var peg$c86 = peg$literalExpectation("0", false);
+
+	  var peg$c87 = function peg$c87() {
 	    return 0;
 	  };
 
-	  var peg$c81 = /^[1-9]/;
-	  var peg$c82 = peg$classExpectation([["1", "9"]], false, false);
-	  var peg$c83 = /^[0-9]/;
-	  var peg$c84 = peg$classExpectation([["0", "9"]], false, false);
+	  var peg$c88 = /^[1-9]/;
+	  var peg$c89 = peg$classExpectation([["1", "9"]], false, false);
+	  var peg$c90 = /^[0-9]/;
+	  var peg$c91 = peg$classExpectation([["0", "9"]], false, false);
 
-	  var peg$c85 = function peg$c85(digits) {
+	  var peg$c92 = function peg$c92(digits) {
 	    return parseInt(digits.join(''), 10);
 	  };
 
-	  var peg$c86 = peg$otherExpectation("argName");
+	  var peg$c93 = peg$otherExpectation("argName");
 	  var peg$currPos = 0;
 	  var peg$savedPos = 0;
 	  var peg$posDetailsCache = [{
@@ -792,6 +839,10 @@
 
 	          if (s0 === peg$FAILED) {
 	            s0 = peg$parseselectElement();
+
+	            if (s0 === peg$FAILED) {
+	              s0 = peg$parsepoundElement();
+	            }
 	          }
 	        }
 	      }
@@ -854,19 +905,43 @@
 	    return s0;
 	  }
 
+	  function peg$parsepoundElement() {
+	    var s0, s1;
+	    s0 = peg$currPos;
+
+	    if (input.charCodeAt(peg$currPos) === 35) {
+	      s1 = peg$c2;
+	      peg$currPos++;
+	    } else {
+	      s1 = peg$FAILED;
+
+	      if (peg$silentFails === 0) {
+	        peg$fail(peg$c3);
+	      }
+	    }
+
+	    if (s1 !== peg$FAILED) {
+	      peg$savedPos = s0;
+	      s1 = peg$c4();
+	    }
+
+	    s0 = s1;
+	    return s0;
+	  }
+
 	  function peg$parseargumentElement() {
 	    var s0, s1, s2, s3, s4, s5;
 	    peg$silentFails++;
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 123) {
-	      s1 = peg$c3;
+	      s1 = peg$c6;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c4);
+	        peg$fail(peg$c7);
 	      }
 	    }
 
@@ -881,19 +956,19 @@
 
 	          if (s4 !== peg$FAILED) {
 	            if (input.charCodeAt(peg$currPos) === 125) {
-	              s5 = peg$c5;
+	              s5 = peg$c8;
 	              peg$currPos++;
 	            } else {
 	              s5 = peg$FAILED;
 
 	              if (peg$silentFails === 0) {
-	                peg$fail(peg$c6);
+	                peg$fail(peg$c9);
 	              }
 	            }
 
 	            if (s5 !== peg$FAILED) {
 	              peg$savedPos = s0;
-	              s1 = peg$c7(s3);
+	              s1 = peg$c10(s3);
 	              s0 = s1;
 	            } else {
 	              peg$currPos = s0;
@@ -922,7 +997,7 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c2);
+	        peg$fail(peg$c5);
 	      }
 	    }
 
@@ -940,14 +1015,14 @@
 	    s4 = peg$parsepatternWhiteSpace();
 
 	    if (s4 === peg$FAILED) {
-	      if (peg$c9.test(input.charAt(peg$currPos))) {
+	      if (peg$c12.test(input.charAt(peg$currPos))) {
 	        s4 = input.charAt(peg$currPos);
 	        peg$currPos++;
 	      } else {
 	        s4 = peg$FAILED;
 
 	        if (peg$silentFails === 0) {
-	          peg$fail(peg$c10);
+	          peg$fail(peg$c13);
 	        }
 	      }
 	    }
@@ -969,7 +1044,7 @@
 	        s4 = peg$FAILED;
 
 	        if (peg$silentFails === 0) {
-	          peg$fail(peg$c11);
+	          peg$fail(peg$c14);
 	        }
 	      }
 
@@ -994,14 +1069,14 @@
 	        s4 = peg$parsepatternWhiteSpace();
 
 	        if (s4 === peg$FAILED) {
-	          if (peg$c9.test(input.charAt(peg$currPos))) {
+	          if (peg$c12.test(input.charAt(peg$currPos))) {
 	            s4 = input.charAt(peg$currPos);
 	            peg$currPos++;
 	          } else {
 	            s4 = peg$FAILED;
 
 	            if (peg$silentFails === 0) {
-	              peg$fail(peg$c10);
+	              peg$fail(peg$c13);
 	            }
 	          }
 	        }
@@ -1023,7 +1098,7 @@
 	            s4 = peg$FAILED;
 
 	            if (peg$silentFails === 0) {
-	              peg$fail(peg$c11);
+	              peg$fail(peg$c14);
 	            }
 	          }
 
@@ -1055,7 +1130,7 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c8);
+	        peg$fail(peg$c11);
 	      }
 	    }
 
@@ -1068,13 +1143,13 @@
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 47) {
-	      s1 = peg$c13;
+	      s1 = peg$c16;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c14);
+	        peg$fail(peg$c17);
 	      }
 	    }
 
@@ -1083,7 +1158,7 @@
 
 	      if (s2 !== peg$FAILED) {
 	        peg$savedPos = s0;
-	        s1 = peg$c15(s2);
+	        s1 = peg$c18(s2);
 	        s0 = s1;
 	      } else {
 	        peg$currPos = s0;
@@ -1100,7 +1175,7 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c12);
+	        peg$fail(peg$c15);
 	      }
 	    }
 
@@ -1127,7 +1202,7 @@
 
 	        if (s3 !== peg$FAILED) {
 	          peg$savedPos = s0;
-	          s1 = peg$c17(s2, s3);
+	          s1 = peg$c20(s2, s3);
 	          s0 = s1;
 	        } else {
 	          peg$currPos = s0;
@@ -1148,7 +1223,7 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c16);
+	        peg$fail(peg$c19);
 	      }
 	    }
 
@@ -1172,7 +1247,7 @@
 
 	    if (s1 !== peg$FAILED) {
 	      peg$savedPos = s0;
-	      s1 = peg$c18(s1);
+	      s1 = peg$c21(s1);
 	    }
 
 	    s0 = s1;
@@ -1183,14 +1258,14 @@
 	    var s0, s1, s2;
 	    s0 = peg$currPos;
 
-	    if (input.substr(peg$currPos, 2) === peg$c19) {
-	      s1 = peg$c19;
+	    if (input.substr(peg$currPos, 2) === peg$c22) {
+	      s1 = peg$c22;
 	      peg$currPos += 2;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c20);
+	        peg$fail(peg$c23);
 	      }
 	    }
 
@@ -1199,7 +1274,7 @@
 
 	      if (s2 !== peg$FAILED) {
 	        peg$savedPos = s0;
-	        s1 = peg$c21(s2);
+	        s1 = peg$c24(s2);
 	        s0 = s1;
 	      } else {
 	        peg$currPos = s0;
@@ -1212,14 +1287,30 @@
 
 	    if (s0 === peg$FAILED) {
 	      s0 = peg$currPos;
-	      s1 = peg$parsemessageText();
+	      peg$savedPos = peg$currPos;
+	      s1 = peg$c25();
 
-	      if (s1 !== peg$FAILED) {
-	        peg$savedPos = s0;
-	        s1 = peg$c22(s1);
+	      if (s1) {
+	        s1 = undefined;
+	      } else {
+	        s1 = peg$FAILED;
 	      }
 
-	      s0 = s1;
+	      if (s1 !== peg$FAILED) {
+	        s2 = peg$parsemessageText();
+
+	        if (s2 !== peg$FAILED) {
+	          peg$savedPos = s0;
+	          s1 = peg$c26(s2);
+	          s0 = s1;
+	        } else {
+	          peg$currPos = s0;
+	          s0 = peg$FAILED;
+	        }
+	      } else {
+	        peg$currPos = s0;
+	        s0 = peg$FAILED;
+	      }
 	    }
 
 	    return s0;
@@ -1230,13 +1321,13 @@
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 123) {
-	      s1 = peg$c3;
+	      s1 = peg$c6;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c4);
+	        peg$fail(peg$c7);
 	      }
 	    }
 
@@ -1251,13 +1342,13 @@
 
 	          if (s4 !== peg$FAILED) {
 	            if (input.charCodeAt(peg$currPos) === 44) {
-	              s5 = peg$c23;
+	              s5 = peg$c27;
 	              peg$currPos++;
 	            } else {
 	              s5 = peg$FAILED;
 
 	              if (peg$silentFails === 0) {
-	                peg$fail(peg$c24);
+	                peg$fail(peg$c28);
 	              }
 	            }
 
@@ -1265,14 +1356,14 @@
 	              s6 = peg$parse_();
 
 	              if (s6 !== peg$FAILED) {
-	                if (input.substr(peg$currPos, 6) === peg$c25) {
-	                  s7 = peg$c25;
+	                if (input.substr(peg$currPos, 6) === peg$c29) {
+	                  s7 = peg$c29;
 	                  peg$currPos += 6;
 	                } else {
 	                  s7 = peg$FAILED;
 
 	                  if (peg$silentFails === 0) {
-	                    peg$fail(peg$c26);
+	                    peg$fail(peg$c30);
 	                  }
 	                }
 
@@ -1283,13 +1374,13 @@
 	                    s9 = peg$currPos;
 
 	                    if (input.charCodeAt(peg$currPos) === 44) {
-	                      s10 = peg$c23;
+	                      s10 = peg$c27;
 	                      peg$currPos++;
 	                    } else {
 	                      s10 = peg$FAILED;
 
 	                      if (peg$silentFails === 0) {
-	                        peg$fail(peg$c24);
+	                        peg$fail(peg$c28);
 	                      }
 	                    }
 
@@ -1324,19 +1415,19 @@
 
 	                      if (s10 !== peg$FAILED) {
 	                        if (input.charCodeAt(peg$currPos) === 125) {
-	                          s11 = peg$c5;
+	                          s11 = peg$c8;
 	                          peg$currPos++;
 	                        } else {
 	                          s11 = peg$FAILED;
 
 	                          if (peg$silentFails === 0) {
-	                            peg$fail(peg$c6);
+	                            peg$fail(peg$c9);
 	                          }
 	                        }
 
 	                        if (s11 !== peg$FAILED) {
 	                          peg$savedPos = s0;
-	                          s1 = peg$c27(s3, s7, s9);
+	                          s1 = peg$c31(s3, s7, s9);
 	                          s0 = s1;
 	                        } else {
 	                          peg$currPos = s0;
@@ -1391,13 +1482,13 @@
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 39) {
-	      s1 = peg$c28;
+	      s1 = peg$c32;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c29);
+	        peg$fail(peg$c33);
 	      }
 	    }
 
@@ -1406,14 +1497,14 @@
 	      s3 = peg$parsedoubleApostrophes();
 
 	      if (s3 === peg$FAILED) {
-	        if (peg$c30.test(input.charAt(peg$currPos))) {
+	        if (peg$c34.test(input.charAt(peg$currPos))) {
 	          s3 = input.charAt(peg$currPos);
 	          peg$currPos++;
 	        } else {
 	          s3 = peg$FAILED;
 
 	          if (peg$silentFails === 0) {
-	            peg$fail(peg$c31);
+	            peg$fail(peg$c35);
 	          }
 	        }
 	      }
@@ -1424,14 +1515,14 @@
 	          s3 = peg$parsedoubleApostrophes();
 
 	          if (s3 === peg$FAILED) {
-	            if (peg$c30.test(input.charAt(peg$currPos))) {
+	            if (peg$c34.test(input.charAt(peg$currPos))) {
 	              s3 = input.charAt(peg$currPos);
 	              peg$currPos++;
 	            } else {
 	              s3 = peg$FAILED;
 
 	              if (peg$silentFails === 0) {
-	                peg$fail(peg$c31);
+	                peg$fail(peg$c35);
 	              }
 	            }
 	          }
@@ -1442,13 +1533,13 @@
 
 	      if (s2 !== peg$FAILED) {
 	        if (input.charCodeAt(peg$currPos) === 39) {
-	          s3 = peg$c28;
+	          s3 = peg$c32;
 	          peg$currPos++;
 	        } else {
 	          s3 = peg$FAILED;
 
 	          if (peg$silentFails === 0) {
-	            peg$fail(peg$c29);
+	            peg$fail(peg$c33);
 	          }
 	        }
 
@@ -1473,14 +1564,14 @@
 	      s1 = peg$parsedoubleApostrophes();
 
 	      if (s1 === peg$FAILED) {
-	        if (peg$c32.test(input.charAt(peg$currPos))) {
+	        if (peg$c36.test(input.charAt(peg$currPos))) {
 	          s1 = input.charAt(peg$currPos);
 	          peg$currPos++;
 	        } else {
 	          s1 = peg$FAILED;
 
 	          if (peg$silentFails === 0) {
-	            peg$fail(peg$c33);
+	            peg$fail(peg$c37);
 	          }
 	        }
 	      }
@@ -1491,14 +1582,14 @@
 	          s1 = peg$parsedoubleApostrophes();
 
 	          if (s1 === peg$FAILED) {
-	            if (peg$c32.test(input.charAt(peg$currPos))) {
+	            if (peg$c36.test(input.charAt(peg$currPos))) {
 	              s1 = input.charAt(peg$currPos);
 	              peg$currPos++;
 	            } else {
 	              s1 = peg$FAILED;
 
 	              if (peg$silentFails === 0) {
-	                peg$fail(peg$c33);
+	                peg$fail(peg$c37);
 	              }
 	            }
 	          }
@@ -1515,14 +1606,14 @@
 	    var s0, s1;
 	    s0 = [];
 
-	    if (peg$c34.test(input.charAt(peg$currPos))) {
+	    if (peg$c38.test(input.charAt(peg$currPos))) {
 	      s1 = input.charAt(peg$currPos);
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c35);
+	        peg$fail(peg$c39);
 	      }
 	    }
 
@@ -1530,14 +1621,14 @@
 	      while (s1 !== peg$FAILED) {
 	        s0.push(s1);
 
-	        if (peg$c34.test(input.charAt(peg$currPos))) {
+	        if (peg$c38.test(input.charAt(peg$currPos))) {
 	          s1 = input.charAt(peg$currPos);
 	          peg$currPos++;
 	        } else {
 	          s1 = peg$FAILED;
 
 	          if (peg$silentFails === 0) {
-	            peg$fail(peg$c35);
+	            peg$fail(peg$c39);
 	          }
 	        }
 	      }
@@ -1580,7 +1671,7 @@
 
 	    if (s1 !== peg$FAILED) {
 	      peg$savedPos = s0;
-	      s1 = peg$c36(s1);
+	      s1 = peg$c40(s1);
 	    }
 
 	    s0 = s1;
@@ -1591,14 +1682,14 @@
 	    var s0, s1, s2;
 	    s0 = peg$currPos;
 
-	    if (input.substr(peg$currPos, 2) === peg$c19) {
-	      s1 = peg$c19;
+	    if (input.substr(peg$currPos, 2) === peg$c22) {
+	      s1 = peg$c22;
 	      peg$currPos += 2;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c20);
+	        peg$fail(peg$c23);
 	      }
 	    }
 
@@ -1607,7 +1698,7 @@
 
 	      if (s2 !== peg$FAILED) {
 	        peg$savedPos = s0;
-	        s1 = peg$c21(s2);
+	        s1 = peg$c24(s2);
 	        s0 = s1;
 	      } else {
 	        peg$currPos = s0;
@@ -1620,14 +1711,30 @@
 
 	    if (s0 === peg$FAILED) {
 	      s0 = peg$currPos;
-	      s1 = peg$parsemessageText();
+	      peg$savedPos = peg$currPos;
+	      s1 = peg$c41();
 
-	      if (s1 !== peg$FAILED) {
-	        peg$savedPos = s0;
-	        s1 = peg$c22(s1);
+	      if (s1) {
+	        s1 = undefined;
+	      } else {
+	        s1 = peg$FAILED;
 	      }
 
-	      s0 = s1;
+	      if (s1 !== peg$FAILED) {
+	        s2 = peg$parsemessageText();
+
+	        if (s2 !== peg$FAILED) {
+	          peg$savedPos = s0;
+	          s1 = peg$c26(s2);
+	          s0 = s1;
+	        } else {
+	          peg$currPos = s0;
+	          s0 = peg$FAILED;
+	        }
+	      } else {
+	        peg$currPos = s0;
+	        s0 = peg$FAILED;
+	      }
 	    }
 
 	    return s0;
@@ -1638,13 +1745,13 @@
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 123) {
-	      s1 = peg$c3;
+	      s1 = peg$c6;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c4);
+	        peg$fail(peg$c7);
 	      }
 	    }
 
@@ -1659,13 +1766,13 @@
 
 	          if (s4 !== peg$FAILED) {
 	            if (input.charCodeAt(peg$currPos) === 44) {
-	              s5 = peg$c23;
+	              s5 = peg$c27;
 	              peg$currPos++;
 	            } else {
 	              s5 = peg$FAILED;
 
 	              if (peg$silentFails === 0) {
-	                peg$fail(peg$c24);
+	                peg$fail(peg$c28);
 	              }
 	            }
 
@@ -1673,26 +1780,26 @@
 	              s6 = peg$parse_();
 
 	              if (s6 !== peg$FAILED) {
-	                if (input.substr(peg$currPos, 4) === peg$c37) {
-	                  s7 = peg$c37;
+	                if (input.substr(peg$currPos, 4) === peg$c42) {
+	                  s7 = peg$c42;
 	                  peg$currPos += 4;
 	                } else {
 	                  s7 = peg$FAILED;
 
 	                  if (peg$silentFails === 0) {
-	                    peg$fail(peg$c38);
+	                    peg$fail(peg$c43);
 	                  }
 	                }
 
 	                if (s7 === peg$FAILED) {
-	                  if (input.substr(peg$currPos, 4) === peg$c39) {
-	                    s7 = peg$c39;
+	                  if (input.substr(peg$currPos, 4) === peg$c44) {
+	                    s7 = peg$c44;
 	                    peg$currPos += 4;
 	                  } else {
 	                    s7 = peg$FAILED;
 
 	                    if (peg$silentFails === 0) {
-	                      peg$fail(peg$c40);
+	                      peg$fail(peg$c45);
 	                    }
 	                  }
 	                }
@@ -1704,13 +1811,13 @@
 	                    s9 = peg$currPos;
 
 	                    if (input.charCodeAt(peg$currPos) === 44) {
-	                      s10 = peg$c23;
+	                      s10 = peg$c27;
 	                      peg$currPos++;
 	                    } else {
 	                      s10 = peg$FAILED;
 
 	                      if (peg$silentFails === 0) {
-	                        peg$fail(peg$c24);
+	                        peg$fail(peg$c28);
 	                      }
 	                    }
 
@@ -1745,19 +1852,19 @@
 
 	                      if (s10 !== peg$FAILED) {
 	                        if (input.charCodeAt(peg$currPos) === 125) {
-	                          s11 = peg$c5;
+	                          s11 = peg$c8;
 	                          peg$currPos++;
 	                        } else {
 	                          s11 = peg$FAILED;
 
 	                          if (peg$silentFails === 0) {
-	                            peg$fail(peg$c6);
+	                            peg$fail(peg$c9);
 	                          }
 	                        }
 
 	                        if (s11 !== peg$FAILED) {
 	                          peg$savedPos = s0;
-	                          s1 = peg$c27(s3, s7, s9);
+	                          s1 = peg$c31(s3, s7, s9);
 	                          s0 = s1;
 	                        } else {
 	                          peg$currPos = s0;
@@ -1823,13 +1930,13 @@
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 123) {
-	      s1 = peg$c3;
+	      s1 = peg$c6;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c4);
+	        peg$fail(peg$c7);
 	      }
 	    }
 
@@ -1844,13 +1951,13 @@
 
 	          if (s4 !== peg$FAILED) {
 	            if (input.charCodeAt(peg$currPos) === 44) {
-	              s5 = peg$c23;
+	              s5 = peg$c27;
 	              peg$currPos++;
 	            } else {
 	              s5 = peg$FAILED;
 
 	              if (peg$silentFails === 0) {
-	                peg$fail(peg$c24);
+	                peg$fail(peg$c28);
 	              }
 	            }
 
@@ -1858,26 +1965,26 @@
 	              s6 = peg$parse_();
 
 	              if (s6 !== peg$FAILED) {
-	                if (input.substr(peg$currPos, 6) === peg$c41) {
-	                  s7 = peg$c41;
+	                if (input.substr(peg$currPos, 6) === peg$c46) {
+	                  s7 = peg$c46;
 	                  peg$currPos += 6;
 	                } else {
 	                  s7 = peg$FAILED;
 
 	                  if (peg$silentFails === 0) {
-	                    peg$fail(peg$c42);
+	                    peg$fail(peg$c47);
 	                  }
 	                }
 
 	                if (s7 === peg$FAILED) {
-	                  if (input.substr(peg$currPos, 13) === peg$c43) {
-	                    s7 = peg$c43;
+	                  if (input.substr(peg$currPos, 13) === peg$c48) {
+	                    s7 = peg$c48;
 	                    peg$currPos += 13;
 	                  } else {
 	                    s7 = peg$FAILED;
 
 	                    if (peg$silentFails === 0) {
-	                      peg$fail(peg$c44);
+	                      peg$fail(peg$c49);
 	                    }
 	                  }
 	                }
@@ -1887,13 +1994,13 @@
 
 	                  if (s8 !== peg$FAILED) {
 	                    if (input.charCodeAt(peg$currPos) === 44) {
-	                      s9 = peg$c23;
+	                      s9 = peg$c27;
 	                      peg$currPos++;
 	                    } else {
 	                      s9 = peg$FAILED;
 
 	                      if (peg$silentFails === 0) {
-	                        peg$fail(peg$c24);
+	                        peg$fail(peg$c28);
 	                      }
 	                    }
 
@@ -1903,14 +2010,14 @@
 	                      if (s10 !== peg$FAILED) {
 	                        s11 = peg$currPos;
 
-	                        if (input.substr(peg$currPos, 7) === peg$c45) {
-	                          s12 = peg$c45;
+	                        if (input.substr(peg$currPos, 7) === peg$c50) {
+	                          s12 = peg$c50;
 	                          peg$currPos += 7;
 	                        } else {
 	                          s12 = peg$FAILED;
 
 	                          if (peg$silentFails === 0) {
-	                            peg$fail(peg$c46);
+	                            peg$fail(peg$c51);
 	                          }
 	                        }
 
@@ -1961,19 +2068,19 @@
 
 	                              if (s14 !== peg$FAILED) {
 	                                if (input.charCodeAt(peg$currPos) === 125) {
-	                                  s15 = peg$c5;
+	                                  s15 = peg$c8;
 	                                  peg$currPos++;
 	                                } else {
 	                                  s15 = peg$FAILED;
 
 	                                  if (peg$silentFails === 0) {
-	                                    peg$fail(peg$c6);
+	                                    peg$fail(peg$c9);
 	                                  }
 	                                }
 
 	                                if (s15 !== peg$FAILED) {
 	                                  peg$savedPos = s0;
-	                                  s1 = peg$c47(s3, s7, s11, s13);
+	                                  s1 = peg$c52(s3, s7, s11, s13);
 	                                  s0 = s1;
 	                                } else {
 	                                  peg$currPos = s0;
@@ -2044,13 +2151,13 @@
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 123) {
-	      s1 = peg$c3;
+	      s1 = peg$c6;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c4);
+	        peg$fail(peg$c7);
 	      }
 	    }
 
@@ -2065,13 +2172,13 @@
 
 	          if (s4 !== peg$FAILED) {
 	            if (input.charCodeAt(peg$currPos) === 44) {
-	              s5 = peg$c23;
+	              s5 = peg$c27;
 	              peg$currPos++;
 	            } else {
 	              s5 = peg$FAILED;
 
 	              if (peg$silentFails === 0) {
-	                peg$fail(peg$c24);
+	                peg$fail(peg$c28);
 	              }
 	            }
 
@@ -2079,14 +2186,14 @@
 	              s6 = peg$parse_();
 
 	              if (s6 !== peg$FAILED) {
-	                if (input.substr(peg$currPos, 6) === peg$c48) {
-	                  s7 = peg$c48;
+	                if (input.substr(peg$currPos, 6) === peg$c53) {
+	                  s7 = peg$c53;
 	                  peg$currPos += 6;
 	                } else {
 	                  s7 = peg$FAILED;
 
 	                  if (peg$silentFails === 0) {
-	                    peg$fail(peg$c49);
+	                    peg$fail(peg$c54);
 	                  }
 	                }
 
@@ -2095,13 +2202,13 @@
 
 	                  if (s8 !== peg$FAILED) {
 	                    if (input.charCodeAt(peg$currPos) === 44) {
-	                      s9 = peg$c23;
+	                      s9 = peg$c27;
 	                      peg$currPos++;
 	                    } else {
 	                      s9 = peg$FAILED;
 
 	                      if (peg$silentFails === 0) {
-	                        peg$fail(peg$c24);
+	                        peg$fail(peg$c28);
 	                      }
 	                    }
 
@@ -2126,19 +2233,19 @@
 
 	                          if (s12 !== peg$FAILED) {
 	                            if (input.charCodeAt(peg$currPos) === 125) {
-	                              s13 = peg$c5;
+	                              s13 = peg$c8;
 	                              peg$currPos++;
 	                            } else {
 	                              s13 = peg$FAILED;
 
 	                              if (peg$silentFails === 0) {
-	                                peg$fail(peg$c6);
+	                                peg$fail(peg$c9);
 	                              }
 	                            }
 
 	                            if (s13 !== peg$FAILED) {
 	                              peg$savedPos = s0;
-	                              s1 = peg$c50(s3, s11);
+	                              s1 = peg$c55(s3, s11);
 	                              s0 = s1;
 	                            } else {
 	                              peg$currPos = s0;
@@ -2202,13 +2309,13 @@
 	    s1 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 61) {
-	      s2 = peg$c51;
+	      s2 = peg$c56;
 	      peg$currPos++;
 	    } else {
 	      s2 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c52);
+	        peg$fail(peg$c57);
 	      }
 	    }
 
@@ -2241,7 +2348,7 @@
 	  }
 
 	  function peg$parseselectOption() {
-	    var s0, s1, s2, s3, s4, s5, s6;
+	    var s0, s1, s2, s3, s4, s5, s6, s7;
 	    s0 = peg$currPos;
 	    s1 = peg$parse_();
 
@@ -2253,35 +2360,49 @@
 
 	        if (s3 !== peg$FAILED) {
 	          if (input.charCodeAt(peg$currPos) === 123) {
-	            s4 = peg$c3;
+	            s4 = peg$c6;
 	            peg$currPos++;
 	          } else {
 	            s4 = peg$FAILED;
 
 	            if (peg$silentFails === 0) {
-	              peg$fail(peg$c4);
+	              peg$fail(peg$c7);
 	            }
 	          }
 
 	          if (s4 !== peg$FAILED) {
-	            s5 = peg$parsemessage();
+	            peg$savedPos = peg$currPos;
+	            s5 = peg$c58();
+
+	            if (s5) {
+	              s5 = undefined;
+	            } else {
+	              s5 = peg$FAILED;
+	            }
 
 	            if (s5 !== peg$FAILED) {
-	              if (input.charCodeAt(peg$currPos) === 125) {
-	                s6 = peg$c5;
-	                peg$currPos++;
-	              } else {
-	                s6 = peg$FAILED;
+	              s6 = peg$parsemessage();
+
+	              if (s6 !== peg$FAILED) {
+	                if (input.charCodeAt(peg$currPos) === 125) {
+	                  s7 = peg$c8;
+	                  peg$currPos++;
+	                } else {
+	                  s7 = peg$FAILED;
 
-	                if (peg$silentFails === 0) {
-	                  peg$fail(peg$c6);
+	                  if (peg$silentFails === 0) {
+	                    peg$fail(peg$c9);
+	                  }
 	                }
-	              }
 
-	              if (s6 !== peg$FAILED) {
-	                peg$savedPos = s0;
-	                s1 = peg$c53(s2, s5);
-	                s0 = s1;
+	                if (s7 !== peg$FAILED) {
+	                  peg$savedPos = s0;
+	                  s1 = peg$c59(s2, s6);
+	                  s0 = s1;
+	                } else {
+	                  peg$currPos = s0;
+	                  s0 = peg$FAILED;
+	                }
 	              } else {
 	                peg$currPos = s0;
 	                s0 = peg$FAILED;
@@ -2311,7 +2432,7 @@
 	  }
 
 	  function peg$parsepluralOption() {
-	    var s0, s1, s2, s3, s4, s5, s6;
+	    var s0, s1, s2, s3, s4, s5, s6, s7;
 	    s0 = peg$currPos;
 	    s1 = peg$parse_();
 
@@ -2323,35 +2444,49 @@
 
 	        if (s3 !== peg$FAILED) {
 	          if (input.charCodeAt(peg$currPos) === 123) {
-	            s4 = peg$c3;
+	            s4 = peg$c6;
 	            peg$currPos++;
 	          } else {
 	            s4 = peg$FAILED;
 
 	            if (peg$silentFails === 0) {
-	              peg$fail(peg$c4);
+	              peg$fail(peg$c7);
 	            }
 	          }
 
 	          if (s4 !== peg$FAILED) {
-	            s5 = peg$parsemessage();
+	            peg$savedPos = peg$currPos;
+	            s5 = peg$c60();
+
+	            if (s5) {
+	              s5 = undefined;
+	            } else {
+	              s5 = peg$FAILED;
+	            }
 
 	            if (s5 !== peg$FAILED) {
-	              if (input.charCodeAt(peg$currPos) === 125) {
-	                s6 = peg$c5;
-	                peg$currPos++;
-	              } else {
-	                s6 = peg$FAILED;
+	              s6 = peg$parsemessage();
+
+	              if (s6 !== peg$FAILED) {
+	                if (input.charCodeAt(peg$currPos) === 125) {
+	                  s7 = peg$c8;
+	                  peg$currPos++;
+	                } else {
+	                  s7 = peg$FAILED;
 
-	                if (peg$silentFails === 0) {
-	                  peg$fail(peg$c6);
+	                  if (peg$silentFails === 0) {
+	                    peg$fail(peg$c9);
+	                  }
 	                }
-	              }
 
-	              if (s6 !== peg$FAILED) {
-	                peg$savedPos = s0;
-	                s1 = peg$c54(s2, s5);
-	                s0 = s1;
+	                if (s7 !== peg$FAILED) {
+	                  peg$savedPos = s0;
+	                  s1 = peg$c61(s2, s6);
+	                  s0 = s1;
+	                } else {
+	                  peg$currPos = s0;
+	                  s0 = peg$FAILED;
+	                }
 	              } else {
 	                peg$currPos = s0;
 	                s0 = peg$FAILED;
@@ -2384,14 +2519,14 @@
 	    var s0;
 	    peg$silentFails++;
 
-	    if (peg$c56.test(input.charAt(peg$currPos))) {
+	    if (peg$c63.test(input.charAt(peg$currPos))) {
 	      s0 = input.charAt(peg$currPos);
 	      peg$currPos++;
 	    } else {
 	      s0 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c57);
+	        peg$fail(peg$c64);
 	      }
 	    }
 
@@ -2400,7 +2535,7 @@
 	    if (s0 === peg$FAILED) {
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c55);
+	        peg$fail(peg$c62);
 	      }
 	    }
 
@@ -2411,14 +2546,14 @@
 	    var s0;
 	    peg$silentFails++;
 
-	    if (peg$c59.test(input.charAt(peg$currPos))) {
+	    if (peg$c66.test(input.charAt(peg$currPos))) {
 	      s0 = input.charAt(peg$currPos);
 	      peg$currPos++;
 	    } else {
 	      s0 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c60);
+	        peg$fail(peg$c67);
 	      }
 	    }
 
@@ -2427,7 +2562,7 @@
 	    if (s0 === peg$FAILED) {
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c58);
+	        peg$fail(peg$c65);
 	      }
 	    }
 
@@ -2458,7 +2593,7 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c61);
+	        peg$fail(peg$c68);
 	      }
 	    }
 
@@ -2471,13 +2606,13 @@
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 45) {
-	      s1 = peg$c63;
+	      s1 = peg$c70;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c64);
+	        peg$fail(peg$c71);
 	      }
 	    }
 
@@ -2490,7 +2625,7 @@
 
 	      if (s2 !== peg$FAILED) {
 	        peg$savedPos = s0;
-	        s1 = peg$c65(s1, s2);
+	        s1 = peg$c72(s1, s2);
 	        s0 = s1;
 	      } else {
 	        peg$currPos = s0;
@@ -2507,7 +2642,7 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c62);
+	        peg$fail(peg$c69);
 	      }
 	    }
 
@@ -2519,20 +2654,20 @@
 	    peg$silentFails++;
 	    s0 = peg$currPos;
 
-	    if (input.substr(peg$currPos, 2) === peg$c68) {
-	      s1 = peg$c68;
+	    if (input.substr(peg$currPos, 2) === peg$c75) {
+	      s1 = peg$c75;
 	      peg$currPos += 2;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c69);
+	        peg$fail(peg$c76);
 	      }
 	    }
 
 	    if (s1 !== peg$FAILED) {
 	      peg$savedPos = s0;
-	      s1 = peg$c70();
+	      s1 = peg$c77();
 	    }
 
 	    s0 = s1;
@@ -2542,7 +2677,7 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c67);
+	        peg$fail(peg$c74);
 	      }
 	    }
 
@@ -2554,52 +2689,43 @@
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 39) {
-	      s1 = peg$c28;
+	      s1 = peg$c32;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c29);
+	        peg$fail(peg$c33);
 	      }
 	    }
 
 	    if (s1 !== peg$FAILED) {
-	      if (peg$c71.test(input.charAt(peg$currPos))) {
-	        s2 = input.charAt(peg$currPos);
-	        peg$currPos++;
-	      } else {
-	        s2 = peg$FAILED;
-
-	        if (peg$silentFails === 0) {
-	          peg$fail(peg$c72);
-	        }
-	      }
+	      s2 = peg$parseescapedChar();
 
 	      if (s2 !== peg$FAILED) {
 	        s3 = peg$currPos;
 	        s4 = [];
 
-	        if (input.substr(peg$currPos, 2) === peg$c68) {
-	          s5 = peg$c68;
+	        if (input.substr(peg$currPos, 2) === peg$c75) {
+	          s5 = peg$c75;
 	          peg$currPos += 2;
 	        } else {
 	          s5 = peg$FAILED;
 
 	          if (peg$silentFails === 0) {
-	            peg$fail(peg$c69);
+	            peg$fail(peg$c76);
 	          }
 	        }
 
 	        if (s5 === peg$FAILED) {
-	          if (peg$c30.test(input.charAt(peg$currPos))) {
+	          if (peg$c34.test(input.charAt(peg$currPos))) {
 	            s5 = input.charAt(peg$currPos);
 	            peg$currPos++;
 	          } else {
 	            s5 = peg$FAILED;
 
 	            if (peg$silentFails === 0) {
-	              peg$fail(peg$c31);
+	              peg$fail(peg$c35);
 	            }
 	          }
 	        }
@@ -2607,26 +2733,26 @@
 	        while (s5 !== peg$FAILED) {
 	          s4.push(s5);
 
-	          if (input.substr(peg$currPos, 2) === peg$c68) {
-	            s5 = peg$c68;
+	          if (input.substr(peg$currPos, 2) === peg$c75) {
+	            s5 = peg$c75;
 	            peg$currPos += 2;
 	          } else {
 	            s5 = peg$FAILED;
 
 	            if (peg$silentFails === 0) {
-	              peg$fail(peg$c69);
+	              peg$fail(peg$c76);
 	            }
 	          }
 
 	          if (s5 === peg$FAILED) {
-	            if (peg$c30.test(input.charAt(peg$currPos))) {
+	            if (peg$c34.test(input.charAt(peg$currPos))) {
 	              s5 = input.charAt(peg$currPos);
 	              peg$currPos++;
 	            } else {
 	              s5 = peg$FAILED;
 
 	              if (peg$silentFails === 0) {
-	                peg$fail(peg$c31);
+	                peg$fail(peg$c35);
 	              }
 	            }
 	          }
@@ -2640,19 +2766,23 @@
 
 	        if (s3 !== peg$FAILED) {
 	          if (input.charCodeAt(peg$currPos) === 39) {
-	            s4 = peg$c28;
+	            s4 = peg$c32;
 	            peg$currPos++;
 	          } else {
 	            s4 = peg$FAILED;
 
 	            if (peg$silentFails === 0) {
-	              peg$fail(peg$c29);
+	              peg$fail(peg$c33);
 	            }
 	          }
 
+	          if (s4 === peg$FAILED) {
+	            s4 = null;
+	          }
+
 	          if (s4 !== peg$FAILED) {
 	            peg$savedPos = s0;
-	            s1 = peg$c73(s2, s3);
+	            s1 = peg$c78(s2, s3);
 	            s0 = s1;
 	          } else {
 	            peg$currPos = s0;
@@ -2675,18 +2805,101 @@
 	  }
 
 	  function peg$parseunquotedString() {
-	    var s0, s1;
+	    var s0, s1, s2, s3;
 	    s0 = peg$currPos;
+	    s1 = peg$currPos;
 
-	    if (peg$c74.test(input.charAt(peg$currPos))) {
-	      s1 = input.charAt(peg$currPos);
+	    if (input.length > peg$currPos) {
+	      s2 = input.charAt(peg$currPos);
 	      peg$currPos++;
 	    } else {
+	      s2 = peg$FAILED;
+
+	      if (peg$silentFails === 0) {
+	        peg$fail(peg$c14);
+	      }
+	    }
+
+	    if (s2 !== peg$FAILED) {
+	      peg$savedPos = peg$currPos;
+	      s3 = peg$c79(s2);
+
+	      if (s3) {
+	        s3 = undefined;
+	      } else {
+	        s3 = peg$FAILED;
+	      }
+
+	      if (s3 !== peg$FAILED) {
+	        s2 = [s2, s3];
+	        s1 = s2;
+	      } else {
+	        peg$currPos = s1;
+	        s1 = peg$FAILED;
+	      }
+	    } else {
+	      peg$currPos = s1;
 	      s1 = peg$FAILED;
+	    }
+
+	    if (s1 === peg$FAILED) {
+	      if (input.charCodeAt(peg$currPos) === 10) {
+	        s1 = peg$c80;
+	        peg$currPos++;
+	      } else {
+	        s1 = peg$FAILED;
+
+	        if (peg$silentFails === 0) {
+	          peg$fail(peg$c81);
+	        }
+	      }
+	    }
+
+	    if (s1 !== peg$FAILED) {
+	      s0 = input.substring(s0, peg$currPos);
+	    } else {
+	      s0 = s1;
+	    }
+
+	    return s0;
+	  }
+
+	  function peg$parseescapedChar() {
+	    var s0, s1, s2, s3;
+	    s0 = peg$currPos;
+	    s1 = peg$currPos;
+
+	    if (input.length > peg$currPos) {
+	      s2 = input.charAt(peg$currPos);
+	      peg$currPos++;
+	    } else {
+	      s2 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c75);
+	        peg$fail(peg$c14);
+	      }
+	    }
+
+	    if (s2 !== peg$FAILED) {
+	      peg$savedPos = peg$currPos;
+	      s3 = peg$c82(s2);
+
+	      if (s3) {
+	        s3 = undefined;
+	      } else {
+	        s3 = peg$FAILED;
 	      }
+
+	      if (s3 !== peg$FAILED) {
+	        s2 = [s2, s3];
+	        s1 = s2;
+	      } else {
+	        peg$currPos = s1;
+	        s1 = peg$FAILED;
+	      }
+	    } else {
+	      peg$currPos = s1;
+	      s1 = peg$FAILED;
 	    }
 
 	    if (s1 !== peg$FAILED) {
@@ -2720,7 +2933,7 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c76);
+	        peg$fail(peg$c83);
 	      }
 	    }
 
@@ -2733,19 +2946,19 @@
 	    s0 = peg$currPos;
 
 	    if (input.charCodeAt(peg$currPos) === 48) {
-	      s1 = peg$c78;
+	      s1 = peg$c85;
 	      peg$currPos++;
 	    } else {
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c79);
+	        peg$fail(peg$c86);
 	      }
 	    }
 
 	    if (s1 !== peg$FAILED) {
 	      peg$savedPos = s0;
-	      s1 = peg$c80();
+	      s1 = peg$c87();
 	    }
 
 	    s0 = s1;
@@ -2754,42 +2967,42 @@
 	      s0 = peg$currPos;
 	      s1 = peg$currPos;
 
-	      if (peg$c81.test(input.charAt(peg$currPos))) {
+	      if (peg$c88.test(input.charAt(peg$currPos))) {
 	        s2 = input.charAt(peg$currPos);
 	        peg$currPos++;
 	      } else {
 	        s2 = peg$FAILED;
 
 	        if (peg$silentFails === 0) {
-	          peg$fail(peg$c82);
+	          peg$fail(peg$c89);
 	        }
 	      }
 
 	      if (s2 !== peg$FAILED) {
 	        s3 = [];
 
-	        if (peg$c83.test(input.charAt(peg$currPos))) {
+	        if (peg$c90.test(input.charAt(peg$currPos))) {
 	          s4 = input.charAt(peg$currPos);
 	          peg$currPos++;
 	        } else {
 	          s4 = peg$FAILED;
 
 	          if (peg$silentFails === 0) {
-	            peg$fail(peg$c84);
+	            peg$fail(peg$c91);
 	          }
 	        }
 
 	        while (s4 !== peg$FAILED) {
 	          s3.push(s4);
 
-	          if (peg$c83.test(input.charAt(peg$currPos))) {
+	          if (peg$c90.test(input.charAt(peg$currPos))) {
 	            s4 = input.charAt(peg$currPos);
 	            peg$currPos++;
 	          } else {
 	            s4 = peg$FAILED;
 
 	            if (peg$silentFails === 0) {
-	              peg$fail(peg$c84);
+	              peg$fail(peg$c91);
 	            }
 	          }
 	        }
@@ -2808,7 +3021,7 @@
 
 	      if (s1 !== peg$FAILED) {
 	        peg$savedPos = s0;
-	        s1 = peg$c85(s1);
+	        s1 = peg$c92(s1);
 	      }
 
 	      s0 = s1;
@@ -2820,7 +3033,7 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c77);
+	        peg$fail(peg$c84);
 	      }
 	    }
 
@@ -2858,7 +3071,7 @@
 	        s4 = peg$FAILED;
 
 	        if (peg$silentFails === 0) {
-	          peg$fail(peg$c11);
+	          peg$fail(peg$c14);
 	        }
 	      }
 
@@ -2903,7 +3116,7 @@
 	            s4 = peg$FAILED;
 
 	            if (peg$silentFails === 0) {
-	              peg$fail(peg$c11);
+	              peg$fail(peg$c14);
 	            }
 	          }
 
@@ -2935,13 +3148,23 @@
 	      s1 = peg$FAILED;
 
 	      if (peg$silentFails === 0) {
-	        peg$fail(peg$c86);
+	        peg$fail(peg$c93);
 	      }
 	    }
 
 	    return s0;
 	  }
 
+	  var messageCtx = ['root'];
+
+	  function isNestedMessageText() {
+	    return messageCtx.length > 1;
+	  }
+
+	  function isInPluralOption() {
+	    return messageCtx[messageCtx.length - 1] === 'plural';
+	  }
+
 	  function insertLocation() {
 	    return options && options.captureLocation ? {
 	      location: location()
@@ -3526,8 +3749,6 @@
 
 	  return r;
 	};
-	var ESCAPE_HASH_REGEX = /\\#/g;
-	var PLURAL_HASH = /(^|[^\\])#/g;
 
 	var FormatError =
 	/** @class */
@@ -3571,17 +3792,11 @@
 	originalMessage) {
 	  // Hot path for straight simple msg translations
 	  if (els.length === 1 && isLiteralElement(els[0])) {
-	    var value = els[0].value;
-
-	    if (typeof currentPluralValue === 'number') {
-	      value = value.replace(PLURAL_HASH, '$1' + formatters.getNumberFormat(locales).format(currentPluralValue));
-	    }
-
 	    return [{
 	      type: 0
 	      /* literal */
 	      ,
-	      value: value.replace(ESCAPE_HASH_REGEX, '#')
+	      value: els[0].value
 	    }];
 	  }
 
@@ -3591,18 +3806,27 @@
 	    var el = els_1[_i]; // Exit early for string parts.
 
 	    if (isLiteralElement(el)) {
-	      var value_1 = el.value;
-
-	      if (typeof currentPluralValue === 'number') {
-	        value_1 = value_1.replace(PLURAL_HASH, '$1' + formatters.getNumberFormat(locales).format(currentPluralValue));
-	      }
-
 	      result.push({
 	        type: 0
 	        /* literal */
 	        ,
-	        value: value_1.replace(ESCAPE_HASH_REGEX, '#')
+	        value: el.value
 	      });
+	      continue;
+	    } // TODO: should this part be literal type?
+	    // Replace `#` in plural rules with the actual numeric value.
+
+
+	    if (isPoundElement(el)) {
+	      if (typeof currentPluralValue === 'number') {
+	        result.push({
+	          type: 0
+	          /* literal */
+	          ,
+	          value: formatters.getNumberFormat(locales).format(currentPluralValue)
+	        });
+	      }
+
 	      continue;
 	    }
 
@@ -4038,47 +4262,15 @@
 	See the accompanying LICENSE file for terms.
 	*/
 
-	/**
-	 * Copyright (c) 2013-present, Facebook, Inc.
-	 *
-	 * This source code is licensed under the MIT license found in the
-	 * LICENSE file in the root directory of this source tree.
-	 */
-
-	var invariant = function invariant(condition, format, a, b, c, d, e, f) {
-	  {
-	    if (format === undefined) {
-	      throw new Error('invariant requires an error message argument');
-	    }
+	function invariant(condition, message, Err) {
+	  if (Err === void 0) {
+	    Err = Error;
 	  }
 
 	  if (!condition) {
-	    var error;
-
-	    if (format === undefined) {
-	      error = new Error('Minified exception occurred; use the non-minified dev environment ' + 'for the full error message and additional helpful warnings.');
-	    } else {
-	      var args = [a, b, c, d, e, f];
-	      var argIndex = 0;
-	      error = new Error(format.replace(/%s/g, function () {
-	        return args[argIndex++];
-	      }));
-	      error.name = 'Invariant Violation';
-	    }
-
-	    error.framesToPop = 1; // we don't care about invariant's own frame
-
-	    throw error;
+	    throw new Err(message);
 	  }
-	};
-
-	var invariant_1 = invariant;
-
-	var invariant_ = /*#__PURE__*/Object.freeze({
-		__proto__: null,
-		'default': invariant_1,
-		__moduleExports: invariant_1
-	});
+	}
 
 	/*
 	HTML escaping is the same as React's
@@ -4090,7 +4282,6 @@
 	This source code is licensed under the BSD-style license found in the LICENSE
 	file in the root directory of React's source tree.
 	*/
-	var invariant$1 = invariant_1 || invariant_;
 	var ESCAPED_CHARS = {
 	  38: '&',
 	  62: '>',
@@ -4117,7 +4308,7 @@
 	  }, {});
 	}
 	function invariantIntlContext(intl) {
-	  invariant$1(intl, '[React Intl] Could not find required `intl` object. ' + '<IntlProvider> needs to exist in the component ancestry.');
+	  invariant(intl, '[React Intl] Could not find required `intl` object. ' + '<IntlProvider> needs to exist in the component ancestry.');
 	}
 	function createError(message, exception) {
 	  var eMsg = exception ? "\n".concat(exception.stack) : '';
@@ -4614,7 +4805,7 @@
 	  }
 
 	  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-	    if (e.indexOf(p[i]) < 0) t[p[i]] = s[p[i]];
+	    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
 	  }
 	  return t;
 	};
@@ -4810,14 +5001,14 @@
 	      timeZone = _ref.timeZone;
 	  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
 	  var format = options.format;
-	  var defaults = Object.assign({}, timeZone && {
+	  var defaults = Object.assign(Object.assign({}, timeZone && {
 	    timeZone: timeZone
-	  }, format && getNamedFormat(formats, type, format, onError));
+	  }), format && getNamedFormat(formats, type, format, onError));
 	  var filteredOptions = filterProps(options, DATE_TIME_FORMAT_OPTIONS, defaults);
 
 	  if (type === 'time' && !filteredOptions.hour && !filteredOptions.minute && !filteredOptions.second) {
 	    // Add default formatting options if hour, minute, or second isn't defined.
-	    filteredOptions = Object.assign({}, filteredOptions, {
+	    filteredOptions = Object.assign(Object.assign({}, filteredOptions), {
 	      hour: 'numeric',
 	      minute: 'numeric'
 	    });
@@ -4895,13 +5086,6 @@
 	  return 'other';
 	}
 
-	/*
-	 * Copyright 2015, Yahoo Inc.
-	 * Copyrights licensed under the New BSD License.
-	 * See the accompanying LICENSE file for terms.
-	 */
-	var invariant$2 = invariant_1 || invariant_;
-
 	function setTimeZoneInOptions(opts, timeZone) {
 	  return Object.keys(opts).reduce(function (all, k) {
 	    all[k] = Object.assign({
@@ -4912,9 +5096,9 @@
 	}
 
 	function deepMergeOptions(opts1, opts2) {
-	  var keys = Object.keys(Object.assign({}, opts1, opts2));
+	  var keys = Object.keys(Object.assign(Object.assign({}, opts1), opts2));
 	  return keys.reduce(function (all, k) {
-	    all[k] = Object.assign({}, opts1[k] || {}, opts2[k] || {});
+	    all[k] = Object.assign(Object.assign({}, opts1[k] || {}), opts2[k] || {});
 	    return all;
 	  }, {});
 	}
@@ -4925,12 +5109,15 @@
 	  }
 
 	  var mfFormats = IntlMessageFormat.formats;
-	  return Object.assign({}, mfFormats, f1, {
+	  return Object.assign(Object.assign(Object.assign({}, mfFormats), f1), {
 	    date: deepMergeOptions(setTimeZoneInOptions(mfFormats.date, timeZone), setTimeZoneInOptions(f1.date || {}, timeZone)),
 	    time: deepMergeOptions(setTimeZoneInOptions(mfFormats.time, timeZone), setTimeZoneInOptions(f1.time || {}, timeZone))
 	  });
 	}
 
+	var prepareIntlMessageFormatHtmlOutput = function prepareIntlMessageFormatHtmlOutput(chunks) {
+	  return React.createElement.apply(React, [React.Fragment, null].concat(_toConsumableArray(chunks)));
+	};
 	function formatMessage(_ref, state) {
 	  var locale = _ref.locale,
 	      formats = _ref.formats,
@@ -4946,13 +5133,8 @@
 	  var id = messageDescriptor.id,
 	      defaultMessage = messageDescriptor.defaultMessage; // `id` is a required field of a Message Descriptor.
 
-	  invariant$2(id, '[React Intl] An `id` must be provided to format a message.');
-
-	  if (!id) {
-	    throw new Error('[React Intl] An `id` must be provided to format a message.');
-	  }
-
-	  var message = messages && messages[id];
+	  invariant(!!id, '[React Intl] An `id` must be provided to format a message.');
+	  var message = messages && messages[String(id)];
 	  formats = deepMergeFormatsAndSetTimeZone(formats, timeZone);
 	  defaultFormats = deepMergeFormatsAndSetTimeZone(defaultFormats, timeZone);
 	  var formattedMessageParts = [];
@@ -4989,17 +5171,17 @@
 	    onError(createError("Cannot format message: \"".concat(id, "\", ") + "using message ".concat(message || defaultMessage ? 'source' : 'id', " as fallback.")));
 
 	    if (typeof message === 'string') {
-	      return message || defaultMessage || id;
+	      return message || defaultMessage || String(id);
 	    }
 
-	    return defaultMessage || id;
+	    return defaultMessage || String(id);
 	  }
 
 	  if (formattedMessageParts.length === 1 && typeof formattedMessageParts[0] === 'string') {
-	    return formattedMessageParts[0] || defaultMessage || id;
+	    return formattedMessageParts[0] || defaultMessage || String(id);
 	  }
 
-	  return formattedMessageParts;
+	  return prepareIntlMessageFormatHtmlOutput(formattedMessageParts);
 	}
 	function formatHTMLMessage$1(config, state) {
 	  var messageDescriptor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
@@ -5037,7 +5219,7 @@
 	  for (var i = 0; i < len; i++) {
 	    var key = aKeys[i];
 
-	    if (objA[key] !== objB[key]) {
+	    if (objA[key] !== objB[key] || !Object.prototype.hasOwnProperty.call(objB, key)) {
 	      return false;
 	    }
 	  }
@@ -5132,7 +5314,7 @@
 
 	function createIntl(config, cache) {
 	  var formatters = createFormatters(cache);
-	  var resolvedConfig = Object.assign({}, DEFAULT_INTL_CONFIG, config);
+	  var resolvedConfig = Object.assign(Object.assign({}, DEFAULT_INTL_CONFIG), config);
 
 	  if (!resolvedConfig.locale || !areIntlLocalesSupported(resolvedConfig.locale)) {
 	    var locale = resolvedConfig.locale,
@@ -5151,7 +5333,7 @@
 	    resolvedConfig.locale = resolvedConfig.defaultLocale || 'en';
 	  }
 
-	  return Object.assign({}, resolvedConfig, {
+	  return Object.assign(Object.assign({}, resolvedConfig), {
 	    formatters: formatters,
 	    formatNumber: formatNumber.bind(null, resolvedConfig, formatters.getNumberFormat),
 	    formatNumberToParts: formatNumberToParts.bind(null, resolvedConfig, formatters.getNumberFormat),
@@ -5218,7 +5400,6 @@
 	IntlProvider$1.displayName = 'IntlProvider';
 	IntlProvider$1.defaultProps = DEFAULT_INTL_CONFIG;
 
-	var invariant$3 = invariant_1 || invariant_;
 	var MINUTE = 60;
 	var HOUR = 60 * 60;
 	var DAY = 60 * 60 * 24;
@@ -5281,10 +5462,6 @@
 	  return INCREMENTABLE_UNITS.includes(unit);
 	}
 
-	function verifyProps(updateIntervalInSeconds, unit) {
-	  invariant$3(!updateIntervalInSeconds || updateIntervalInSeconds && canIncrement(unit), 'Cannot schedule update with unit longer than hour');
-	}
-
 	var FormattedRelativeTime =
 	/*#__PURE__*/
 	function (_React$PureComponent) {
@@ -5303,7 +5480,7 @@
 	      prevValue: _this.props.value,
 	      currentValueInSeconds: canIncrement(_this.props.unit) ? valueToSeconds(_this.props.value, _this.props.unit) : 0
 	    };
-	    verifyProps(props.updateIntervalInSeconds, props.unit);
+	    invariant(!props.updateIntervalInSeconds || !!(props.updateIntervalInSeconds && canIncrement(props.unit)), 'Cannot schedule update with unit longer than hour');
 	    return _this;
 	  }
 
@@ -5464,7 +5641,7 @@
 	  }
 
 	  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-	    if (e.indexOf(p[i]) < 0) t[p[i]] = s[p[i]];
+	    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
 	  }
 	  return t;
 	};
@@ -5475,7 +5652,7 @@
 	    console.error('[React Intl] Could not find required `intl` object. <IntlProvider> needs to exist in the component ancestry. Using default message as fallback.');
 	  }
 
-	  return formatMessage(Object.assign({}, DEFAULT_INTL_CONFIG, {
+	  return formatMessage(Object.assign(Object.assign({}, DEFAULT_INTL_CONFIG), {
 	    locale: 'en'
 	  }), createFormatters(), descriptor, values);
 	};
@@ -5629,7 +5806,7 @@
 	}(FormattedMessage);
 
 	FormattedHTMLMessage.displayName = 'FormattedHTMLMessage';
-	FormattedHTMLMessage.defaultProps = Object.assign({}, FormattedMessage.defaultProps, {
+	FormattedHTMLMessage.defaultProps = Object.assign(Object.assign({}, FormattedMessage.defaultProps), {
 	  tagName: 'span'
 	});