Updated JS translations to be inserted from back-end

[bookstack] / resources / assets / js / services / translations.js

diff --git a/resources/assets/js/services/translations.js b/resources/assets/js/services/translations.js
index 06b44a58010ffe264174669f79e239a3a5982e19..645286c08b9238ef8842846a80594cce7733ff51 100644 (file)
--- a/resources/assets/js/services/translations.js
+++ b/resources/assets/js/services/translations.js
@@ -10,7 +10,20 @@ class Translator {
      * @param translations
      */
     constructor(translations) {
      * @param translations
      */
     constructor(translations) {

-        this.store = translations;
+        this.store = new Map();
+        this.parseTranslations();
+    }
+
+    /**
+     * Parse translations out of the page and place into the store.
+     */
+    parseTranslations() {
+        const translationMetaTags = document.querySelectorAll('meta[name="translation"]');
+        for (let tag of translationMetaTags) {
+            const key = tag.getAttribute('key');
+            const value = tag.getAttribute('value');
+            this.store.set(key, value);
+        }

     }
 
     /**
     }
 
     /**


@@ -20,7 +33,7 @@ class Translator {
      * @returns {*}
      */
     get(key, replacements) {
      * @returns {*}
      */
     get(key, replacements) {

-        let text = this.getTransText(key);
+        const text = this.getTransText(key);

         return this.performReplacements(text, replacements);
     }
 
         return this.performReplacements(text, replacements);
     }
 


@@ -33,26 +46,26 @@ class Translator {
      * @returns {*}
      */
     getPlural(key, count, replacements) {
      * @returns {*}
      */
     getPlural(key, count, replacements) {

-        let text = this.getTransText(key);
-        let splitText = text.split('|');
+        const text = this.getTransText(key);
+        const splitText = text.split('|');
+        const exactCountRegex = /^{([0-9]+)}/;
+        const rangeRegex = /^\[([0-9]+),([0-9*]+)]/;

         let result = null;
         let result = null;

-        let exactCountRegex = /^{([0-9]+)}/;
-        let rangeRegex = /^\[([0-9]+),([0-9*]+)]/;

 
 

-        for (let i = 0, len = splitText.length; i < len; i++) {
-            let t = splitText[i];
+        for (const i = 0, len = splitText.length; i < len; i++) {
+            const t = splitText[i];

 
             // Parse exact matches
 
             // Parse exact matches

-            let exactMatches = t.match(exactCountRegex);
+            const exactMatches = t.match(exactCountRegex);

             if (exactMatches !== null && Number(exactMatches[1]) === count) {
                 result = t.replace(exactCountRegex, '').trim();
                 break;
             }
 
             // Parse range matches
             if (exactMatches !== null && Number(exactMatches[1]) === count) {
                 result = t.replace(exactCountRegex, '').trim();
                 break;
             }
 
             // Parse range matches

-            let rangeMatches = t.match(rangeRegex);
+            const rangeMatches = t.match(rangeRegex);

             if (rangeMatches !== null) {
             if (rangeMatches !== null) {

-                let rangeStart = Number(rangeMatches[1]);
+                const rangeStart = Number(rangeMatches[1]);

                 if (rangeStart <= count && (rangeMatches[2] === '*' || Number(rangeMatches[2]) >= count)) {
                     result = t.replace(rangeRegex, '').trim();
                     break;
                 if (rangeStart <= count && (rangeMatches[2] === '*' || Number(rangeMatches[2]) >= count)) {
                     result = t.replace(rangeRegex, '').trim();
                     break;


@@ -74,14 +87,10 @@ class Translator {
      * @returns {String|Object}
      */
     getTransText(key) {
      * @returns {String|Object}
      */
     getTransText(key) {

-        let splitKey = key.split('.');
-        let value = splitKey.reduce((a, b) => {
-            return a !== undefined ? a[b] : a;
-        }, this.store);
+        const value = this.store.get(key);

 
         if (value === undefined) {
 
         if (value === undefined) {

-            console.log(`Translation with key "${key}" does not exist`);
-            value = key;
+            console.warn(`Translation with key "${key}" does not exist`);

         }
 
         return value;
         }
 
         return value;


@@ -95,10 +104,10 @@ class Translator {
      */
     performReplacements(string, replacements) {
         if (!replacements) return string;
      */
     performReplacements(string, replacements) {
         if (!replacements) return string;

-        let replaceMatches = string.match(/:([\S]+)/g);
+        const replaceMatches = string.match(/:([\S]+)/g);

         if (replaceMatches === null) return string;
         replaceMatches.forEach(match => {
         if (replaceMatches === null) return string;
         replaceMatches.forEach(match => {

-            let key = match.substring(1);
+            const key = match.substring(1);

             if (typeof replacements[key] === 'undefined') return;
             string = string.replace(match, replacements[key]);
         });
             if (typeof replacements[key] === 'undefined') return;
             string = string.replace(match, replacements[key]);
         });