From ce81fdc91e3e37ca2fa05ee6cbe356defd457123 Mon Sep 17 00:00:00 2001
From: N-Pex <npexdev@gmail.com>
Date: Fri, 9 May 2025 14:42:37 +0200
Subject: [PATCH] Move "toLocalNumber" to utils.

---
 .../channel/QuickReactionsChannel.vue         |  5 +-
 src/components/messages/messageMixin.js       | 29 +-----
 src/main.js                                   |  2 +
 src/plugins/lang.js                           | 31 ------
 src/plugins/utils.js                          | 99 +++++++++++++------
 5 files changed, 75 insertions(+), 91 deletions(-)

diff --git a/src/components/messages/channel/QuickReactionsChannel.vue b/src/components/messages/channel/QuickReactionsChannel.vue
index 8e2e422..5e83ca6 100644
--- a/src/components/messages/channel/QuickReactionsChannel.vue
+++ b/src/components/messages/channel/QuickReactionsChannel.vue
@@ -12,13 +12,14 @@
         </template>
         <span>{{ $t("global.click_to_remove") }}</span>
       </v-tooltip>
-      <v-icon v-else class="ma-1 ml-0 clickable" @click="onClickEmoji(name)">$vuetify.icons.ic_like</v-icon> {{ $i18n.toLocalNumbers(value.length.toFixed()) }}
+      <v-icon v-else class="ma-1 ml-0 clickable" @click="onClickEmoji(name)">$vuetify.icons.ic_like</v-icon> {{ utils.toLocalNumbers(value.length.toFixed()) }}
     </div>
   </div>
 </template>
 
 <script>
 import messageOperationsMixin from "../messageOperationsMixin";
+import utils from "@/plugins/utils"
 
 export default {
   mixins: [messageOperationsMixin],
@@ -38,6 +39,7 @@ export default {
   },
   data() {
     return {
+      utils,
       reactionMap: {"❤️": []},
       reactions: null,
       REACTION_LIMIT: 5,
@@ -45,7 +47,6 @@ export default {
     }
   },
   mounted() {
-    console.log("I18", this.$i18n.toLocalNumbers);
     this.reactions = this.timelineSet.relations.getChildEventsForEvent(this.event.getId(), 'm.annotation', 'm.reaction');
     this.event.on("Event.relationsCreated", this.onRelationsCreated);
   },
diff --git a/src/components/messages/messageMixin.js b/src/components/messages/messageMixin.js
index eb7b40a..f8f214f 100644
--- a/src/components/messages/messageMixin.js
+++ b/src/components/messages/messageMixin.js
@@ -1,8 +1,7 @@
 import QuickReactions from "./QuickReactions.vue";
 import * as linkify from 'linkifyjs';
 import linkifyHtml from 'linkify-html';
-import utils from "../../plugins/utils"
-import util from "../../plugins/utils";
+import utils from "../../plugins/utils";
 import Hammer from "hammerjs";
 
 linkify.options.defaults.className = "link";
@@ -140,7 +139,7 @@ export default {
         if (this.inReplyToEvent && (this.inReplyToEvent.isThreadRoot || this.inReplyToEvent.isMxThread)) {
           const children = this.timelineSet.relations
             .getAllChildEventsForEvent(this.inReplyToEvent.getId())
-            .filter((e) => util.downloadableTypes().includes(e.getContent().msgtype));
+            .filter((e) => utils.downloadableTypes().includes(e.getContent().msgtype));
           return this.$t("message.sent_media", { count: children.length });
         }
         const content = this.event.getContent();
@@ -311,29 +310,7 @@ export default {
       } else {
         s = this.$t("global.time.days", Math.round(ti / 60 / 60 / 24));
       }
-      return this.toLocalNumbers(s);
-    },
-
-    /**
-     * Possibly convert numerals to local representation (currently only for "bo" locale)
-     * @param str String in which to convert numerals [0-9]
-     * @returns converted string
-     */
-    toLocalNumbers(str) {
-      if (this.$i18n.locale == "bo") {
-        // Translate to tibetan numerals
-        let result = "";
-        for (let i = 0; i < str.length; i++) {
-          let c = str.charCodeAt(i);
-          if (c >= 48 && c <= 57) {
-            result += String.fromCharCode(c + 0x0f20 - 48);
-          } else {
-            result += String.fromCharCode(c);
-          }
-        }
-        return result;
-      }
-      return str;
+      return utils.toLocalNumbers(s);
     },
 
     linkify(text) {
diff --git a/src/main.js b/src/main.js
index 673e320..d8632fe 100644
--- a/src/main.js
+++ b/src/main.js
@@ -179,6 +179,8 @@ router.app = app;
 app.use(navigation, router);
 app.use(vuetify);
 app.use(i18n);
+app.$i18n = i18n;
+app.config.globalProperties.$i18n = i18n;
 
 app.use(matrix, { store: store, i18n: i18n });
 
diff --git a/src/plugins/lang.js b/src/plugins/lang.js
index 5a3f05f..d305bf2 100644
--- a/src/plugins/lang.js
+++ b/src/plugins/lang.js
@@ -48,35 +48,4 @@ const vue18n = new createI18n({
   }
 })
 
-vue18n.toLocalNumbers = (str) => {
-  if (vue18n.locale == "my") {
-    // Translate to burmese numerals
-    var result = "";
-    for (var i = 0; i < str.length; i++) {
-      var c = str.charCodeAt(i);
-      if (c >= 48 && c <= 57) {
-        result += String.fromCharCode(c + 0x1040 - 48);
-      } else {
-        result += String.fromCharCode(c);
-      }
-    }
-    return result;
-  } else if (vue18n.locale == "bo") {
-    // Translate to tibetan numerals
-    result = "";
-    for (i = 0; i < str.length; i++) {
-      c = str.charCodeAt(i);
-      if (c >= 48 && c <= 57) {
-        result += String.fromCharCode(c + 0x0f20 - 48);
-      } else {
-        result += String.fromCharCode(c);
-      }
-    }
-    return result;
-  }
-
-  return str;
-};
-
-
 export default vue18n;
\ No newline at end of file
diff --git a/src/plugins/utils.js b/src/plugins/utils.js
index bfd1a8e..3cf846d 100644
--- a/src/plugins/utils.js
+++ b/src/plugins/utils.js
@@ -1,16 +1,17 @@
-import axios from 'axios';
+import axios from "axios";
 import * as ContentHelpers from "matrix-js-sdk/lib/content-helpers";
 import imageResize from "image-resize";
-import { AutoDiscovery } from 'matrix-js-sdk';
-import User from '../models/user';
+import { AutoDiscovery } from "matrix-js-sdk";
+import User from "../models/user";
 import prettyBytes from "pretty-bytes";
 import Hammer from "hammerjs";
-import { Thread } from 'matrix-js-sdk/lib/models/thread';
+import { Thread } from "matrix-js-sdk/lib/models/thread";
 import { imageSize } from "image-size";
 import dayjs from "dayjs";
 import aesjs from "aes-js";
-import localizedFormat from 'dayjs/plugin/localizedFormat';
-import duration from 'dayjs/plugin/duration';
+import localizedFormat from "dayjs/plugin/localizedFormat";
+import duration from "dayjs/plugin/duration";
+import i18n from "./lang";
 
 export const STATE_EVENT_ROOM_DELETION_NOTICE = "im.keanu.room_deletion_notice";
 export const STATE_EVENT_ROOM_DELETED = "im.keanu.room_deleted";
@@ -23,43 +24,43 @@ export const ROOM_TYPE_CHANNEL = "im.keanu.room_type_channel";
 export const STATE_EVENT_ROOM_TYPE = "im.keanu.room_type";
 
 // Install extended localized format
-dayjs.extend(localizedFormat)
+dayjs.extend(localizedFormat);
 dayjs.extend(duration);
 
 // Store info about getUserMedia BEFORE we aply polyfill(s)!
 var _browserCanRecordAudioF = function () {
-    var legacyGetUserMedia = (navigator.getUserMedia ||
-        navigator.webkitGetUserMedia ||
-        navigator.mozGetUserMedia ||
-        navigator.msGetUserMedia);
-    return legacyGetUserMedia !== undefined || (navigator.mediaDevices && navigator.mediaDevices.getUserMedia !== undefined);
-}
+  var legacyGetUserMedia =
+    navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
+  return (
+    legacyGetUserMedia !== undefined || (navigator.mediaDevices && navigator.mediaDevices.getUserMedia !== undefined)
+  );
+};
 var _browserCanRecordAudio = _browserCanRecordAudioF();
 
 class UploadPromise {
-    aborted = false;
-    onAbort = undefined;
+  aborted = false;
+  onAbort = undefined;
 
-    constructor(wrappedPromise) {
-        this.wrappedPromise = wrappedPromise;
-    }
+  constructor(wrappedPromise) {
+    this.wrappedPromise = wrappedPromise;
+  }
 
-    abort() {
-        this.aborted = true;
-        if (this.onAbort) {
-            this.onAbort();
-        }
+  abort() {
+    this.aborted = true;
+    if (this.onAbort) {
+      this.onAbort();
     }
+  }
 
-    then(resolve, reject) {
-        this.wrappedPromise = this.wrappedPromise.then(resolve, reject);
-        return this;
-    }
+  then(resolve, reject) {
+    this.wrappedPromise = this.wrappedPromise.then(resolve, reject);
+    return this;
+  }
 
-    catch(handler) {
-        this.wrappedPromise = this.wrappedPromise.catch(handler);
-        return this;
-    }
+  catch(handler) {
+    this.wrappedPromise = this.wrappedPromise.catch(handler);
+    return this;
+  }
 }
 
 class Util {
@@ -1169,6 +1170,40 @@ class Util {
     hm.get("singletap").requireFailure("doubletap");
     return hm;
   }
+
+  /**
+   * Possibly convert numerals to local representation (currently only for "bo" locale)
+   * @param str String in which to convert numerals [0-9]
+   * @returns converted string
+  */
+  toLocalNumbers = (str) => {
+    if (i18n.locale == "my") {
+      // Translate to burmese numerals
+      var result = "";
+      for (var i = 0; i < str.length; i++) {
+        var c = str.charCodeAt(i);
+        if (c >= 48 && c <= 57) {
+          result += String.fromCharCode(c + 0x1040 - 48);
+        } else {
+          result += String.fromCharCode(c);
+        }
+      }
+      return result;
+    } else if (i18n.locale == "bo") {
+      // Translate to tibetan numerals
+      result = "";
+      for (i = 0; i < str.length; i++) {
+        c = str.charCodeAt(i);
+        if (c >= 48 && c <= 57) {
+          result += String.fromCharCode(c + 0x0f20 - 48);
+        } else {
+          result += String.fromCharCode(c);
+        }
+      }
+      return result;
+    }
+
+    return str;
+  };
 }
 export default new Util();
-