From 03888816ca9bdca4977265fb14575dfa752a9282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ustek?= <sustmidown@centrum.cz>
Date: Fri, 19 Nov 2021 11:15:01 +0100
Subject: [PATCH] Fix using HTML tags in ICU messages (#310) (#325)

The `ignoreTag` option was added specifically for this use case.
See also:
- https://formatjs.io/docs/intl-messageformat/#intlmessageformat-constructor
- https://github.com/formatjs/formatjs/pull/1699
---
 Resources/js/translator.js            | 2 +-
 Resources/public/js/translator.min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/js/translator.js b/Resources/js/translator.js
index 0bb2a772..2d43a538 100644
--- a/Resources/js/translator.js
+++ b/Resources/js/translator.js
@@ -133,7 +133,7 @@
                     throw new Error('The dependency "IntlMessageFormat" is required to use ICU MessageFormat but it has not been found. Please read https://github.com/willdurand/BazingaJsTranslationBundle/blob/master/Resources/doc/index.md#using-icu-messageformat')
                 }
 
-                var mf = new IntlMessageFormat.IntlMessageFormat(_message);
+                var mf = new IntlMessageFormat.IntlMessageFormat(_message, undefined, undefined, {ignoreTag: true});
 
                 return mf.format(parameters || {});
             }
diff --git a/Resources/public/js/translator.min.js b/Resources/public/js/translator.min.js
index 82a95eca..e126ccda 100644
--- a/Resources/public/js/translator.min.js
+++ b/Resources/public/js/translator.min.js
@@ -2,4 +2,4 @@
  * @author William DURAND <william.durand1@gmail.com>
  * @license MIT Licensed
  */
-!function(e,a){"object"==typeof module&&module.exports?module.exports=a(require("intl-messageformat")):"function"==typeof define&&define.amd?define(["intl-messageformat"],a):e.Translator=a(e.IntlMessageFormat)}(this,function(e){"use strict";function a(e,a){var s,t=g.placeHolderPrefix,n=g.placeHolderSuffix;for(s in a){var r=new RegExp(t+s+n,"g");if(r.test(e)){var c=String(a[s]).replace(new RegExp("\\$","g"),"$$$$");e=e.replace(r,c)}}return e}function s(e,a,s,n,r,c){var i=s||n||r,l=a,u=c||{},d=i.split("_")[0];if(u.isICU=!1,!(i in o))if(d in o)i=d;else{if(!(r in o))return e;i=r}if(void 0===l||null===l)for(var h=0;h<f.length;h++)if(t(i,f[h],e)||t(d,f[h],e)||t(r,f[h],e)){l=f[h];break}if(t(i,l+p,e))return u.isICU=!0,o[i][l+p][e];if(t(i,l,e))return o[i][l][e];for(var m,g,b,v;i.length>2&&(m=i.length,g=i.split(/[\s_]+/),b=g[g.length-1],v=b.length,1!==g.length);)if(i=i.substring(0,m-(v+1)),t(i,l,e))return o[i][l][e];return t(r,l,e)?o[r][l][e]:e}function t(e,a,s){return e in o&&(a in o[e]&&s in o[e][a])}function n(e,a,s){var t,n,i=[],l=[],o=e.split(g.pluralSeparator),u=[];for(t=0;t<o.length;t++){var f=o[t];h.test(f)?(u=f.match(h),i[u[0]]=u[u.length-1]):d.test(f)?(u=f.match(d),l.push(u[1])):l.push(f)}for(n in i)if(m.test(n))if(u=n.match(m),u[1]){var p,b=u[2].split(",");for(p in b)if(a==b[p])return i[n]}else{var v=r(u[4]),I=r(u[5]);if(("["===u[3]?a>=v:a>v)&&("]"===u[6]?a<=I:a<I))return i[n]}return l[c(a,s)]||l[0]||void 0}function r(e){return"-Inf"===e?Number.NEGATIVE_INFINITY:"+Inf"===e||"Inf"===e?Number.POSITIVE_INFINITY:parseInt(e,10)}function c(e,a){var s=a;switch("pt_BR"===s&&(s="xbr"),s.length>3&&(s=s.split("_")[0]),s){case"bo":case"dz":case"id":case"ja":case"jv":case"ka":case"km":case"kn":case"ko":case"ms":case"th":case"tr":case"vi":case"zh":return 0;case"af":case"az":case"bn":case"bg":case"ca":case"da":case"de":case"el":case"en":case"eo":case"es":case"et":case"eu":case"fa":case"fi":case"fo":case"fur":case"fy":case"gl":case"gu":case"ha":case"he":case"hu":case"is":case"it":case"ku":case"lb":case"ml":case"mn":case"mr":case"nah":case"nb":case"ne":case"nl":case"nn":case"no":case"om":case"or":case"pa":case"pap":case"ps":case"pt":case"so":case"sq":case"sv":case"sw":case"ta":case"te":case"tk":case"ur":case"zu":return 1==e?0:1;case"am":case"bh":case"fil":case"fr":case"gun":case"hi":case"ln":case"mg":case"nso":case"xbr":case"ti":case"wa":return 0===e||1==e?0:1;case"be":case"bs":case"hr":case"ru":case"sr":case"uk":return e%10==1&&e%100!=11?0:e%10>=2&&e%10<=4&&(e%100<10||e%100>=20)?1:2;case"cs":case"sk":return 1==e?0:e>=2&&e<=4?1:2;case"ga":return 1==e?0:2==e?1:2;case"lt":return e%10==1&&e%100!=11?0:e%10>=2&&(e%100<10||e%100>=20)?1:2;case"sl":return e%100==1?0:e%100==2?1:e%100==3||e%100==4?2:3;case"mk":return e%10==1?0:1;case"mt":return 1==e?0:0===e||e%100>1&&e%100<11?1:e%100>10&&e%100<20?2:3;case"lv":return 0===e?0:e%10==1&&e%100!=11?1:2;case"pl":return 1==e?0:e%10>=2&&e%10<=4&&(e%100<12||e%100>14)?1:2;case"cy":return 1==e?0:2==e?1:8==e||11==e?2:3;case"ro":return 1==e?0:0===e||e%100>0&&e%100<20?1:2;case"ar":return 0===e?0:1==e?1:2==e?2:e>=3&&e<=10?3:e>=11&&e<=99?4:5;default:return 0}}function i(e,a){for(var s=0;s<e.length;s++)if(a===e[s])return!0;return!1}function l(){return"undefined"!=typeof document?document.documentElement.lang.replace("-","_"):u}var o={},u="en",f=[],d=new RegExp(/^\w+\: +(.+)$/),h=new RegExp(/^\s*((\{\s*(\-?\d+[\s*,\s*\-?\d+]*)\s*\})|([\[\]])\s*(-Inf|\-?\d+)\s*,\s*(\+?Inf|\-?\d+)\s*([\[\]]))\s?(.+?)$/),m=new RegExp(/^\s*(\{\s*(\-?\d+[\s*,\s*\-?\d+]*)\s*\})|([\[\]])\s*(-Inf|\-?\d+)\s*,\s*(\+?Inf|\-?\d+)\s*([\[\]])/),p="+intl-icu",g={locale:l(),fallback:u,placeHolderPrefix:"%",placeHolderSuffix:"%",defaultDomain:"messages",pluralSeparator:"|",add:function(e,a,s,t){var n=t||this.locale||this.fallback,r=s||this.defaultDomain;return o[n]||(o[n]={}),o[n][r]||(o[n][r]={}),o[n][r][e]=a,!1===i(f,r)&&f.push(r),this},trans:function(t,n,r,c){var i={},l=s(t,r,c,this.locale,this.fallback,i);if(i.isICU){if(void 0===e)throw new Error('The dependency "IntlMessageFormat" is required to use ICU MessageFormat but it has not been found. Please read https://github.com/willdurand/BazingaJsTranslationBundle/blob/master/Resources/doc/index.md#using-icu-messageformat');return new e.IntlMessageFormat(l).format(n||{})}return a(l,n||{})},transChoice:function(e,t,r,c,i){var l=s(e,c,i,this.locale,this.fallback),o=parseInt(t,10);return r=r||{},void 0===r.count&&(r.count=t),void 0===l||isNaN(o)||(l=n(l,o,i||this.locale||this.fallback)),a(l,r)},fromJSON:function(e){if("string"==typeof e&&(e=JSON.parse(e)),e.locale&&(this.locale=e.locale),e.fallback&&(this.fallback=e.fallback),e.defaultDomain&&(this.defaultDomain=e.defaultDomain),e.translations)for(var a in e.translations)for(var s in e.translations[a])for(var t in e.translations[a][s])this.add(t,e.translations[a][s][t],s,a);return this},reset:function(){o={},f=[],this.locale=l()}};return g});
\ No newline at end of file
+!function(e,a){"object"==typeof module&&module.exports?module.exports=a(require("intl-messageformat")):"function"==typeof define&&define.amd?define(["intl-messageformat"],a):e.Translator=a(e.IntlMessageFormat)}(this,function(e){"use strict";function a(e,a){var s,r=g.placeHolderPrefix,n=g.placeHolderSuffix;for(s in a){var t=new RegExp(r+s+n,"g");if(t.test(e)){var c=String(a[s]).replace(new RegExp("\\$","g"),"$$$$");e=e.replace(t,c)}}return e}function s(e,a,s,n,t,c){var i=s||n||t,l=a,u=c||{},d=i.split("_")[0];if(u.isICU=!1,!(i in o))if(d in o)i=d;else{if(!(t in o))return e;i=t}if(void 0===l||null===l)for(var h=0;h<f.length;h++)if(r(i,f[h],e)||r(d,f[h],e)||r(t,f[h],e)){l=f[h].replace(p,"");break}if(r(i,l+p,e))return u.isICU=!0,o[i][l+p][e];if(r(i,l,e))return o[i][l][e];for(var m,g,v,b;i.length>2&&(m=i.length,g=i.split(/[\s_]+/),v=g[g.length-1],b=v.length,1!==g.length);)if(i=i.substring(0,m-(b+1)),r(i,l,e))return o[i][l][e];return r(t,l,e)?o[t][l][e]:e}function r(e,a,s){return e in o&&(a in o[e]&&s in o[e][a])}function n(e,a,s){var r,n,i=[],l=[],o=e.split(g.pluralSeparator),u=[];for(r=0;r<o.length;r++){var f=o[r];h.test(f)?(u=f.match(h),i[u[0]]=u[u.length-1]):d.test(f)?(u=f.match(d),l.push(u[1])):l.push(f)}for(n in i)if(m.test(n))if(u=n.match(m),u[1]){var p,v=u[2].split(",");for(p in v)if(a==v[p])return i[n]}else{var b=t(u[4]),I=t(u[5]);if(("["===u[3]?a>=b:a>b)&&("]"===u[6]?a<=I:a<I))return i[n]}return l[c(a,s)]||l[0]||void 0}function t(e){return"-Inf"===e?Number.NEGATIVE_INFINITY:"+Inf"===e||"Inf"===e?Number.POSITIVE_INFINITY:parseInt(e,10)}function c(e,a){var s=a;switch("pt_BR"===s&&(s="xbr"),s.length>3&&(s=s.split("_")[0]),s){case"bo":case"dz":case"id":case"ja":case"jv":case"ka":case"km":case"kn":case"ko":case"ms":case"th":case"tr":case"vi":case"zh":return 0;case"af":case"az":case"bn":case"bg":case"ca":case"da":case"de":case"el":case"en":case"eo":case"es":case"et":case"eu":case"fa":case"fi":case"fo":case"fur":case"fy":case"gl":case"gu":case"ha":case"he":case"hu":case"is":case"it":case"ku":case"lb":case"ml":case"mn":case"mr":case"nah":case"nb":case"ne":case"nl":case"nn":case"no":case"om":case"or":case"pa":case"pap":case"ps":case"pt":case"so":case"sq":case"sv":case"sw":case"ta":case"te":case"tk":case"ur":case"zu":return 1==e?0:1;case"am":case"bh":case"fil":case"fr":case"gun":case"hi":case"ln":case"mg":case"nso":case"xbr":case"ti":case"wa":return 0===e||1==e?0:1;case"be":case"bs":case"hr":case"ru":case"sr":case"uk":return e%10==1&&e%100!=11?0:e%10>=2&&e%10<=4&&(e%100<10||e%100>=20)?1:2;case"cs":case"sk":return 1==e?0:e>=2&&e<=4?1:2;case"ga":return 1==e?0:2==e?1:2;case"lt":return e%10==1&&e%100!=11?0:e%10>=2&&(e%100<10||e%100>=20)?1:2;case"sl":return e%100==1?0:e%100==2?1:e%100==3||e%100==4?2:3;case"mk":return e%10==1?0:1;case"mt":return 1==e?0:0===e||e%100>1&&e%100<11?1:e%100>10&&e%100<20?2:3;case"lv":return 0===e?0:e%10==1&&e%100!=11?1:2;case"pl":return 1==e?0:e%10>=2&&e%10<=4&&(e%100<12||e%100>14)?1:2;case"cy":return 1==e?0:2==e?1:8==e||11==e?2:3;case"ro":return 1==e?0:0===e||e%100>0&&e%100<20?1:2;case"ar":return 0===e?0:1==e?1:2==e?2:e>=3&&e<=10?3:e>=11&&e<=99?4:5;default:return 0}}function i(e,a){for(var s=0;s<e.length;s++)if(a===e[s])return!0;return!1}function l(){return"undefined"!=typeof document?document.documentElement.lang.replace("-","_"):u}var o={},u="en",f=[],d=new RegExp(/^\w+\: +(.+)$/),h=new RegExp(/^\s*((\{\s*(\-?\d+[\s*,\s*\-?\d+]*)\s*\})|([\[\]])\s*(-Inf|\-?\d+)\s*,\s*(\+?Inf|\-?\d+)\s*([\[\]]))\s?(.+?)$/),m=new RegExp(/^\s*(\{\s*(\-?\d+[\s*,\s*\-?\d+]*)\s*\})|([\[\]])\s*(-Inf|\-?\d+)\s*,\s*(\+?Inf|\-?\d+)\s*([\[\]])/),p="+intl-icu",g={locale:l(),fallback:u,placeHolderPrefix:"%",placeHolderSuffix:"%",defaultDomain:"messages",pluralSeparator:"|",add:function(e,a,s,r){var n=r||this.locale||this.fallback,t=s||this.defaultDomain;return o[n]||(o[n]={}),o[n][t]||(o[n][t]={}),o[n][t][e]=a,!1===i(f,t)&&f.push(t),this},trans:function(r,n,t,c){var i={},l=s(r,t,c,this.locale,this.fallback,i);if(i.isICU){if(void 0===e)throw new Error('The dependency "IntlMessageFormat" is required to use ICU MessageFormat but it has not been found. Please read https://github.com/willdurand/BazingaJsTranslationBundle/blob/master/Resources/doc/index.md#using-icu-messageformat');return new e.IntlMessageFormat(l,void 0,void 0,{ignoreTag:!0}).format(n||{})}return a(l,n||{})},transChoice:function(e,r,t,c,i){var l=s(e,c,i,this.locale,this.fallback),o=parseInt(r,10);return t=t||{},void 0===t.count&&(t.count=r),void 0===l||isNaN(o)||(l=n(l,o,i||this.locale||this.fallback)),a(l,t)},fromJSON:function(e){if("string"==typeof e&&(e=JSON.parse(e)),e.locale&&(this.locale=e.locale),e.fallback&&(this.fallback=e.fallback),e.defaultDomain&&(this.defaultDomain=e.defaultDomain),e.translations)for(var a in e.translations)for(var s in e.translations[a])for(var r in e.translations[a][s])this.add(r,e.translations[a][s][r],s,a);return this},reset:function(){o={},f=[],this.locale=l()}};return g});
\ No newline at end of file