support unescaping forward slash #1548

i18next · Aug 26, 2022 · 47230e8 · 47230e8
1 parent 052784d
commit 47230e8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 11.18.5
+
+- support unescaping forward slash [1548](https://github.com/i18next/react-i18next/pull/1548)
+
 ### 11.18.4
 
 - fix: reset t when keyPrefix is updated [1544](https://github.com/i18next/react-i18next/pull/1544)

diff --git a/react-i18next.js b/react-i18next.js
@@ -318,7 +318,7 @@
     }
   };
 
-  var matchHtmlEntity = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230);/g;
+  var matchHtmlEntity = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g;
   var htmlEntities = {
     '&amp;': '&',
     '&#38;': '&',
@@ -337,7 +337,9 @@
     '&reg;': '®',
     '&#174;': '®',
     '&hellip;': '…',
-    '&#8230;': '…'
+    '&#8230;': '…',
+    '&#x2F;': '/',
+    '&#47;': '/'
   };
 
   var unescapeHtmlEntity = function unescapeHtmlEntity(m) {

diff --git a/react-i18next.min.js b/react-i18next.min.js
diff --git a/src/unescape.js b/src/unescape.js
@@ -1,6 +1,6 @@
 // unescape common html entities
 
-const matchHtmlEntity = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F);/g;
+const matchHtmlEntity = /&(?:amp|#38|lt|#60|gt|#62|apos|#39|quot|#34|nbsp|#160|copy|#169|reg|#174|hellip|#8230|#x2F|#47);/g;
 
 const htmlEntities = {
   '&amp;': '&',
@@ -22,6 +22,7 @@ const htmlEntities = {
   '&hellip;': '…',
   '&#8230;': '…',
   '&#x2F;': '/',
+  '&#47;': '/',
 };
 
 const unescapeHtmlEntity = (m) => htmlEntities[m];

diff --git a/test/unescape.spec.js b/test/unescape.spec.js
@@ -3,9 +3,9 @@ import { unescape } from '../src/unescape';
 describe('unescape', () => {
   it('should correctly unescape', () => {
     const unescaped = unescape(
-      '&amp; &#38; &lt; &#60; &gt; &#62; &apos; &#39; &quot; &#34; &nbsp; &#160; &copy; &#169; &reg; &#174; &hellip; &#8230; &#x2F;',
+      '&amp; &#38; &lt; &#60; &gt; &#62; &apos; &#39; &quot; &#34; &nbsp; &#160; &copy; &#169; &reg; &#174; &hellip; &#8230; &#x2F; &#47;',
     );
 
-    expect(unescaped).toEqual('& & < < > > \' \' " "     © © ® ® … … /');
+    expect(unescaped).toEqual('& & < < > > \' \' " "     © © ® ® … … / /');
   });
 });