Merge Yezichak - other languages

.eslintrc.json

@@ -654,6 +654,21 @@
                 "test/**/*.js",
                 "dev/**/*.js"
             ],
+            "env": {
+                "browser": false,
+                "es2020": true,
+                "node": true,
+                "webextensions": false
+            }
+        },
+        {
+            "files": [
+                "dict/**/*.js"
+            ],
+            "parserOptions": {
+                "ecmaVersion": 2022,
+                "sourceType": "module"
+            },
             "env": {
                 "browser": false,
                 "node": true,
@@ -713,9 +728,9 @@
                 "ext/js/general/regex-util.js",
                 "ext/js/general/text-source-map.js",
                 "ext/js/language/deinflector.js",
-                "ext/js/language/dictionary-database.js",
-                "ext/js/language/sandbox/dictionary-data-util.js",
-                "ext/js/language/sandbox/japanese-util.js",
+                "ext/js/dictionary/dictionary-database.js",
+                "ext/js/dictionary/dictionary-data-util.js",
+                "ext/js/language/languages/ja/japanese-util.js",
                 "ext/js/language/translator.js",
                 "ext/js/media/audio-downloader.js",
                 "ext/js/media/media-util.js",
@@ -741,10 +756,10 @@
                 "ext/js/data/database.js",
                 "ext/js/data/json-schema.js",
                 "ext/js/general/cache-map.js",
-                "ext/js/language/dictionary-database.js",
-                "ext/js/language/dictionary-importer.js",
-                "ext/js/language/dictionary-worker-handler.js",
-                "ext/js/language/dictionary-worker-media-loader.js",
+                "ext/js/dictionary/dictionary-database.js",
+                "ext/js/dictionary/dictionary-importer.js",
+                "ext/js/dictionary/dictionary-worker-handler.js",
+                "ext/js/dictionary/dictionary-worker-media-loader.js",
                 "ext/js/media/media-util.js"
             ],
             "env": {

.gitignore

@@ -5,6 +5,7 @@ node_modules/
 builds/
 
 dictionaries/
+dict/
 
 /test-results/
 /playwright-report/

dev/dictionary-validate.js

@@ -97,11 +97,11 @@ export async function validateDictionary(mode, archive, schemas) {
         throw e2;
     }
 
-    await validateDictionaryBanks(mode, archive, 'term_bank_?.json', version === 1 ? schemas.termBankV1 : schemas.termBankV3);
-    await validateDictionaryBanks(mode, archive, 'term_meta_bank_?.json', schemas.termMetaBankV3);
+    await validateDictionaryBanks(mode, archive, 'term_bank_?.json', schemas[`termBankV${version}`]);
+    await validateDictionaryBanks(mode, archive, 'term_meta_bank_?.json', schemas[`termMetaBankV${version}`]);
     await validateDictionaryBanks(mode, archive, 'kanji_bank_?.json', version === 1 ? schemas.kanjiBankV1 : schemas.kanjiBankV3);
     await validateDictionaryBanks(mode, archive, 'kanji_meta_bank_?.json', schemas.kanjiMetaBankV3);
-    await validateDictionaryBanks(mode, archive, 'tag_bank_?.json', schemas.tagBankV3);
+    await validateDictionaryBanks(mode, archive, 'tag_bank_?.json', schemas[`tagBankV${version}`]);
 }
 
 /**
@@ -117,7 +117,9 @@ export function getSchemas() {
         tagBankV3: readSchema('../ext/data/schemas/dictionary-tag-bank-v3-schema.json'),
         termBankV1: readSchema('../ext/data/schemas/dictionary-term-bank-v1-schema.json'),
         termBankV3: readSchema('../ext/data/schemas/dictionary-term-bank-v3-schema.json'),
-        termMetaBankV3: readSchema('../ext/data/schemas/dictionary-term-meta-bank-v3-schema.json')
+        termBankV4: readSchema('../ext/data/schemas/dictionary-term-bank-v4-schema.json'),
+        termMetaBankV3: readSchema('../ext/data/schemas/dictionary-term-meta-bank-v3-schema.json'),
+        termMetaBankV4: readSchema('../ext/data/schemas/dictionary-term-meta-bank-v4-schema.json')
     };
 }
 

dev/jsconfig.json

@@ -64,10 +64,10 @@
         "../ext/js/general/regex-util.js",
         "../ext/js/general/text-source-map.js",
         "../ext/js/language/deinflector.js",
-        "../ext/js/language/dictionary-importer.js",
-        "../ext/js/language/dictionary-database.js",
+        "../ext/js/dictionary/dictionary-importer.js",
+        "../ext/js/dictionary/dictionary-database.js",
         "../ext/js/language/sandbox/dictionary-data-util.js",
-        "../ext/js/language/sandbox/japanese-util.js",
+        "../ext/js/language/languages/ja/japanese-util.js",
         "../ext/js/language/translator.js",
         "../ext/js/media/media-util.js",
         "../types/dev/**/*.ts",

ext/action-popup.html

@@ -19,36 +19,36 @@
     <label class="toggle">
         <input type="checkbox" id="enable-search">
         <div class="toggle-group">
-            <span class="toggle-on">On</span>
-            <span class="toggle-off">Off</span>
+            <span class="toggle-on" i18n="actionPopup.on">On</span>
+            <span class="toggle-off" i18n="actionPopup.off">Off</span>
             <span class="toggle-handle"></span>
         </div>
     </label>
     <div class="nav-button-container">
-        <button type="button" class="nav-button action-select-profile" title="Change primary profile" hidden>
+        <button type="button" class="nav-button action-select-profile" i18n-title="actionPopup.changeProfile" title="Change primary profile" hidden>
             <span class="icon" data-icon="profile"></span>
             <span class="profile-select-container"><select class="profile-select" id="profile-select">
                 <optgroup label="Primary Profile" id="profile-select-option-group"></optgroup>
             </select></span>
         </button>
-        <a tabindex="0" class="nav-button action-open-settings" title="Settings" data-hotkey='["global:openSettingsPage","title","Settings ({0})"]'>
+        <a tabindex="0" class="nav-button action-open-settings" i18n-title="pages.Settings" title="Settings" data-hotkey='["global:openSettingsPage","title","Settings ({0})"]'>
             <span class="icon" data-icon="cog"></span>
             <div class="nav-button-warning-badge no-dictionaries-enabled-warning" hidden>
                 <div class="nav-button-warning-badge-outer"></div>
                 <div class="nav-button-warning-badge-inner"></div>
             </div>
         </a>
-        <a tabindex="0" class="nav-button action-open-permissions" title="Permissions" hidden>
+        <a tabindex="0" class="nav-button action-open-permissions" i18n-title="pages.Permissions" title="Permissions" hidden>
             <span class="icon" data-icon="key"></span>
             <div class="nav-button-warning-badge permissions-required-warning" hidden>
                 <div class="nav-button-warning-badge-outer"></div>
                 <div class="nav-button-warning-badge-inner"></div>
             </div>
         </a>
-        <a tabindex="0" class="nav-button action-open-search" title="Search" data-hotkey='["global:openSearchPage","title","Search ({0})\nShift+click to open here"]'>
+        <a tabindex="0" class="nav-button action-open-search" i18n-title="pages.Search" title="Search" data-hotkey='["global:openSearchPage","title","Search ({0})\nShift+click to open here"]'>
             <span class="icon" data-icon="magnifying-glass"></span>
         </a>
-        <a tabindex="0" class="nav-button action-open-info" title="Information" data-hotkey='["global:openInfoPage","title","Information ({0})"]'>
+        <a tabindex="0" class="nav-button action-open-info" i18n-title="pages.Information" title="Information" data-hotkey='["global:openInfoPage","title","Information ({0})"]'>
             <span class="icon" data-icon="question-mark-circle"></span>
         </a>
     </div>
@@ -57,27 +57,27 @@
 <div id="full">
     <h3 id="extension-info">Yomitan</h3>
     <label class="link-group">
-        <span class="link-group-icon"><input type="checkbox" id="enable-search2"></span><span class="link-group-label">Enable content scanning</span>
+        <span class="link-group-icon"><input type="checkbox" id="enable-search2"></span><span class="link-group-label" i18n="settings.general.enableScanning">Enable content scanning</span>
     </label>
     <a tabindex="0" class="link-group action-open-settings">
         <span class="link-group-icon" data-icon="chevron"></span>
-        <span class="link-group-label">Settings</span>
+        <span class="link-group-label" i18n="pages.Settings">Settings</span>
         <span class="link-group-badge">
             <div class="flex-margin-left warning-badge no-dictionaries-enabled-warning" hidden><span class="icon" data-icon="exclamation-point-short"></span></div>
         </span>
     </a>
     <a tabindex="0" class="link-group action-open-permissions" hidden>
         <span class="link-group-icon" data-icon="chevron"></span>
-        <span class="link-group-label">Permissions</span>
+        <span class="link-group-label" i18n="pages.Permissions">Permissions</span>
         <span class="link-group-badge">
             <div class="flex-margin-left warning-badge permissions-required-warning" hidden><span class="icon" data-icon="exclamation-point-short"></span></div>
         </span>
     </a>
     <a tabindex="0" class="link-group action-open-search">
-        <span class="link-group-icon" data-icon="chevron"></span><span class="link-group-label">Search</span>
+        <span class="link-group-icon" data-icon="chevron"></span><span class="link-group-label" i18n="pages.Search">Search</span>
     </a>
     <a tabindex="0" class="link-group action-open-info">
-        <span class="link-group-icon" data-icon="chevron"></span><span class="link-group-label">Information</span>
+        <span class="link-group-icon" data-icon="chevron"></span><span class="link-group-label" i18n="pages.Information">Information</span>
     </a>
 </div>
 

ext/css/display.css

@@ -809,6 +809,10 @@ button.action-button:active {
 
 
 /* Inflections */
+.inflection-hypotheses-list {
+    padding-inline-start: 0px;
+    list-style-type: none;
+}
 .inflection-list {
     display: inline-block;
     color: var(--reason-text-color);