Use rich library

flarum · Apr 18, 2021 · 9d5d950 · 9d5d950
1 parent e837986
commit 9d5d950
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/js/package.json b/js/package.json
@@ -2,7 +2,8 @@
   "private": true,
   "name": "@flarum/core",
   "dependencies": {
-    "@ultraq/icu-message-formatter": "git+https://github.com/askvortsov1/icu-message-formatter.git",
+    "@askvortsov/rich-icu-message-formatter": "^0.1.0",
+    "@ultraq/icu-message-formatter": "^0.10.0",
     "bootstrap": "^3.4.1",
     "clsx": "^1.1.1",
     "color-thief-browser": "^2.0.2",

diff --git a/js/src/common/Translator.js b/js/src/common/Translator.js
@@ -1,16 +1,8 @@
-import { MessageFormatter, pluralTypeHandler, selectTypeHandler } from '@ultraq/icu-message-formatter';
+import { RichMessageFormatter } from '@askvortsov/rich-icu-message-formatter';
+import { pluralTypeHandler, selectTypeHandler } from '@ultraq/icu-message-formatter';
 import username from './helpers/username';
 import extract from './utils/extract';
 
-const fillTags = (tag, tags, children) => {
-  if (tag in tags) {
-    tags[tag].children = m.fragment(children).children;
-    return tags[tag];
-  }
-
-  return children;
-};
-
 export default class Translator {
   constructor() {
     /**
@@ -21,7 +13,7 @@ export default class Translator {
      */
     this.translations = {};
 
-    this.formatter = new MessageFormatter(null, this.formatterTypeHandlers(), fillTags);
+    this.formatter = new RichMessageFormatter(null, this.formatterTypeHandlers(), fillTags);
   }
 
   formatterTypeHandlers() {