From 515a8cc3b1ebc1a9f7ebefbe06a3f3818bac9364 Mon Sep 17 00:00:00 2001 From: zombieFox Date: Fri, 14 Jun 2024 00:46:00 +0100 Subject: [PATCH] change default form labels --- src/component/bookmarkForm/index.js | 20 +- src/component/control/checkbox/index.js | 2 +- src/component/control/color/index.js | 2 +- src/component/control/colorMixer/index.js | 2 +- src/component/control/helperText/index.js | 2 +- src/component/control/inputButton/index.js | 2 +- src/component/control/label/index.js | 2 +- src/component/control/radio/index.js | 2 +- src/component/control/radioGrid/index.js | 2 +- src/component/control/select/index.js | 2 +- src/component/control/slider/index.js | 2 +- src/component/control/sliderDouble/index.js | 6 +- src/component/control/sliderSlim/index.js | 2 +- src/component/control/text/index.js | 2 +- src/component/control/textReset/index.js | 2 +- src/component/control/textarea/index.js | 2 +- src/component/data/index.js | 2 +- src/component/dropFile/index.js | 2 +- src/component/form/feedback/index.js | 2 +- src/component/form/helper/index.js | 2 +- src/component/form/label/index.js | 6 +- src/component/groupForm/index.js | 12 +- src/component/link/index.js | 4 + src/component/menuContent/appSetting/index.js | 4 +- .../menuContent/dataSetting/index.js | 2 +- src/component/menuContent/index.js | 2 +- .../menuContent/supportSetting/index.js | 2 +- src/component/menuNav/index.js | 13 +- src/component/message/index.js | 245 ++++++++++-------- src/manifest.json | 2 +- 30 files changed, 195 insertions(+), 159 deletions(-) diff --git a/src/component/bookmarkForm/index.js b/src/component/bookmarkForm/index.js index 53f18343..52103c27 100644 --- a/src/component/bookmarkForm/index.js +++ b/src/component/bookmarkForm/index.js @@ -771,8 +771,8 @@ export const BookmarkForm = function({ form.wrap({ children: [ node('div|class:bookmark-form-description', [ - node(`h2:${message.get('bookmarkFormSectionVisualHeading')}`), - node(`p:${message.get('bookmarkFormSectionVisualDescription')}`) + node(`h2:${message.get('bookmarkFormSectionVisualHeading') || 'Content'}`), + node(`p:${message.get('bookmarkFormSectionVisualDescription') || 'Text'}`) ]) ] }), @@ -801,8 +801,8 @@ export const BookmarkForm = function({ form.wrap({ children: [ node('div|class:bookmark-form-description', [ - node(`h2:${message.get('bookmarkFormSectionAddressHeading')}`), - complexNode({ tag: 'p', text: message.get('bookmarkFormSectionAddressDescription'), complexText: true }) + node(`h2:${message.get('bookmarkFormSectionAddressHeading') || 'Content'}`), + complexNode({ tag: 'p', text: message.get('bookmarkFormSectionAddressDescription') || 'Text', complexText: true }) ]) ] }), @@ -825,8 +825,8 @@ export const BookmarkForm = function({ form.wrap({ children: [ node('div|class:bookmark-form-description', [ - node(`h2:${message.get('bookmarkFormSectionPositionHeading')}`), - node(`p:${message.get('bookmarkFormSectionPositionDescription')}`) + node(`h2:${message.get('bookmarkFormSectionPositionHeading') || 'Content'}`), + node(`p:${message.get('bookmarkFormSectionPositionDescription') || 'Text'}`) ]) ] }), @@ -870,8 +870,8 @@ export const BookmarkForm = function({ form.wrap({ children: [ node('div|class:bookmark-form-description', [ - node(`h2:${message.get('bookmarkFormSectionLayoutHeading')}`), - node(`p:${message.get('bookmarkFormSectionLayoutDescription')}`) + node(`h2:${message.get('bookmarkFormSectionLayoutHeading') || 'Content'}`), + node(`p:${message.get('bookmarkFormSectionLayoutDescription') || 'Text'}`) ]) ] }), @@ -917,8 +917,8 @@ export const BookmarkForm = function({ form.wrap({ children: [ node('div|class:bookmark-form-description', [ - node(`h2:${message.get('bookmarkFormSectionThemeHeading')}`), - node(`p:${message.get('bookmarkFormSectionThemeDescription')}`) + node(`h2:${message.get('bookmarkFormSectionThemeHeading') || 'Content'}`), + node(`p:${message.get('bookmarkFormSectionThemeDescription') || 'Text'}`) ]) ] }), diff --git a/src/component/control/checkbox/index.js b/src/component/control/checkbox/index.js index 2f941b87..0d517517 100644 --- a/src/component/control/checkbox/index.js +++ b/src/component/control/checkbox/index.js @@ -7,7 +7,7 @@ export const Control_checkbox = function ({ object = {}, id = 'name', path = false, - labelText = 'name', + labelText = 'Label', description = false, action = false, //FIXME deprecated properties diff --git a/src/component/control/color/index.js b/src/component/control/color/index.js index 43641f01..af1c69e3 100644 --- a/src/component/control/color/index.js +++ b/src/component/control/color/index.js @@ -13,7 +13,7 @@ export const Control_color = function ({ object = {}, path = false, id = 'name', - labelText = 'Name', + labelText = 'Label', srOnly = false, //FIXME deprecated property value = '#000000', //eslint-disable-line diff --git a/src/component/control/colorMixer/index.js b/src/component/control/colorMixer/index.js index f2d254cc..e3a1f1a9 100644 --- a/src/component/control/colorMixer/index.js +++ b/src/component/control/colorMixer/index.js @@ -19,7 +19,7 @@ export const Control_colorMixer = function ({ defaultValue = false, minMaxObject = false, id = 'name', - labelText = 'name', + labelText = 'Label', srOnly = false, randomColor = false, action = false diff --git a/src/component/control/helperText/index.js b/src/component/control/helperText/index.js index d2edb870..298323aa 100644 --- a/src/component/control/helperText/index.js +++ b/src/component/control/helperText/index.js @@ -10,7 +10,7 @@ export const Control_helperText = function ({ text.forEach((item) => { this.para.push(form.helper({ tag: 'p', - text: item, + text: item || 'Text', complexText: complexText })); }); diff --git a/src/component/control/inputButton/index.js b/src/component/control/inputButton/index.js index f5773089..a1e1c070 100644 --- a/src/component/control/inputButton/index.js +++ b/src/component/control/inputButton/index.js @@ -12,7 +12,7 @@ export const Control_inputButton = function ({ inputButtonClassList = [], type = false, inputHide = false, - labelText = 'Name', + labelText = 'Label', srOnly = false, inputButtonStyle = [], action = false diff --git a/src/component/control/label/index.js b/src/component/control/label/index.js index 4bc8fa0b..ab6553f0 100644 --- a/src/component/control/label/index.js +++ b/src/component/control/label/index.js @@ -1,7 +1,7 @@ import * as form from '../../form'; export const Control_label = function({ - text = 'label', + text = 'Label', description = false, srOnly = false, icon = false, diff --git a/src/component/control/radio/index.js b/src/component/control/radio/index.js index 914cf827..76f73ba6 100644 --- a/src/component/control/radio/index.js +++ b/src/component/control/radio/index.js @@ -7,7 +7,7 @@ export const Control_radio = function ({ radioGroup = [], object = {}, label = false, - groupName = 'group', + groupName = 'Group', path = false, action = false, inputButton = false, diff --git a/src/component/control/radioGrid/index.js b/src/component/control/radioGrid/index.js index 082cef0d..38e33273 100644 --- a/src/component/control/radioGrid/index.js +++ b/src/component/control/radioGrid/index.js @@ -5,7 +5,7 @@ import { set } from '../../../utility/set'; export const Control_radioGrid = function ({ radioGroup = [], - label = false, + label = 'Label', object = {}, groupName = 'group', path = false, diff --git a/src/component/control/select/index.js b/src/component/control/select/index.js index 1fd87468..1bccb4e5 100644 --- a/src/component/control/select/index.js +++ b/src/component/control/select/index.js @@ -12,7 +12,7 @@ export const Control_select = function({ object = {}, id = 'name', path = false, - labelText = 'name', + labelText = 'Label', srOnly = false, description = false, action = false diff --git a/src/component/control/slider/index.js b/src/component/control/slider/index.js index 6519b549..5e54f831 100644 --- a/src/component/control/slider/index.js +++ b/src/component/control/slider/index.js @@ -12,7 +12,7 @@ export const Control_slider = function({ object = {}, path = false, id = 'name', - labelText = 'Name', + labelText = 'Label', value = 0, defaultValue = false, min = 0, diff --git a/src/component/control/sliderDouble/index.js b/src/component/control/sliderDouble/index.js index e8084636..a738cbc6 100644 --- a/src/component/control/sliderDouble/index.js +++ b/src/component/control/sliderDouble/index.js @@ -10,12 +10,12 @@ import { set } from '../../../utility/set'; export const Control_sliderDouble = function ({ object = {}, - labelText = 'Name', + labelText = 'Label', style = false, left = { path: false, id: 'name', - labelText: 'Name', + labelText: 'Label', hue: false, value: 0, defaultValue: false, @@ -34,7 +34,7 @@ export const Control_sliderDouble = function ({ right = { path: false, id: 'name', - labelText: 'Name', + labelText: 'Label', hue: false, value: 0, defaultValue: false, diff --git a/src/component/control/sliderSlim/index.js b/src/component/control/sliderSlim/index.js index 048965ec..073abd15 100644 --- a/src/component/control/sliderSlim/index.js +++ b/src/component/control/sliderSlim/index.js @@ -12,7 +12,7 @@ export const Control_sliderSlim = function({ object = {}, path = false, id = 'name', - labelText = 'Name', + labelText = 'Label', hue = false, value = 0, defaultValue = false, diff --git a/src/component/control/text/index.js b/src/component/control/text/index.js index 0a68c651..be4ea5e0 100644 --- a/src/component/control/text/index.js +++ b/src/component/control/text/index.js @@ -12,7 +12,7 @@ export const Control_text = function ({ max = false, placeholder = false, classList = [], - labelText = 'Name', + labelText = 'Label', srOnly = false, action = false } = {}) { diff --git a/src/component/control/textReset/index.js b/src/component/control/textReset/index.js index f06c7ec5..a4b25e43 100644 --- a/src/component/control/textReset/index.js +++ b/src/component/control/textReset/index.js @@ -17,7 +17,7 @@ export const Control_textReset = function({ max = false, placeholder = false, classList = [], - labelText = 'Name', + labelText = 'Label', srOnly = false, action = false } = {}) { diff --git a/src/component/control/textarea/index.js b/src/component/control/textarea/index.js index 3ce69276..6d2853f5 100644 --- a/src/component/control/textarea/index.js +++ b/src/component/control/textarea/index.js @@ -12,7 +12,7 @@ export const Control_textarea = function ({ max = false, placeholder = false, classList = [], - labelText = 'Name', + labelText = 'Label', srOnly = false, action = false } = {}) { diff --git a/src/component/data/index.js b/src/component/data/index.js index 760e485e..2b4d2fb3 100644 --- a/src/component/data/index.js +++ b/src/component/data/index.js @@ -384,7 +384,7 @@ data.feedback = {}; data.feedback.empty = { render: (feedback) => { - feedback.appendChild(node(`p:${message.get('dataFeedbackEmpty')}|class:muted small`)); + feedback.appendChild(node(`p:${message.get('dataFeedbackEmpty') || 'Text'}|class:muted small`)); } }; diff --git a/src/component/dropFile/index.js b/src/component/dropFile/index.js index f80715ac..cbb26cc6 100644 --- a/src/component/dropFile/index.js +++ b/src/component/dropFile/index.js @@ -6,7 +6,7 @@ import { node } from '../../utility/node'; import './index.css'; export const DropFile = function ({ - heading = 'Drop file here', + heading = 'Text', dropAaction = false, enterAction = false, leaveAction = false, diff --git a/src/component/form/feedback/index.js b/src/component/form/feedback/index.js index fa3329c2..313ab71a 100644 --- a/src/component/form/feedback/index.js +++ b/src/component/form/feedback/index.js @@ -4,7 +4,7 @@ import { complexNode } from '../../../utility/complexNode'; import './index.css'; export const feedback = ({ - text = false + text = 'Text' } = {}) => { const feedback = node('div|class:form-feedback'); diff --git a/src/component/form/helper/index.js b/src/component/form/helper/index.js index bccc5a4b..4e8297f9 100644 --- a/src/component/form/helper/index.js +++ b/src/component/form/helper/index.js @@ -3,7 +3,7 @@ import { node } from '../../../utility/node'; import './index.css'; export const helper = function ({ - text = 'text', + text = 'Text', complexText = false, classList = [] } = {}) { diff --git a/src/component/form/label/index.js b/src/component/form/label/index.js index 993a9b67..17b2e0b2 100644 --- a/src/component/form/label/index.js +++ b/src/component/form/label/index.js @@ -4,7 +4,7 @@ import './index.css'; export const label = ({ forInput = false, - text = 'label', + text = 'Label', description = false, srOnly = false, icon = false, @@ -42,12 +42,12 @@ export const label = ({ if (Array.isArray(description)) { description.forEach((item) => { - labelBlock.appendChild(node('span:' + item + '|class:label-block-item small muted')); + labelBlock.appendChild(node('span:' + (item || 'Description') + '|class:label-block-item small muted')); }); } else if (typeof description === 'string') { - labelBlock.appendChild(node('span:' + description + '|class:label-block-item small muted')); + labelBlock.appendChild(node('span:' + (description || 'Description') + '|class:label-block-item small muted')); } } diff --git a/src/component/groupForm/index.js b/src/component/groupForm/index.js index 97865e25..521769fe 100644 --- a/src/component/groupForm/index.js +++ b/src/component/groupForm/index.js @@ -141,8 +141,8 @@ export const GroupForm = function({ form.wrap({ children: [ node('div|class:group-form-description', [ - node(`h2:${message.get('groupFormSectionNameHeading')}`), - node(`p:${message.get('groupFormSectionNameDescription')}`) + node(`h2:${message.get('groupFormSectionNameHeading') || 'Content'}`), + node(`p:${message.get('groupFormSectionNameDescription') || 'Text'}`) ]) ] }), @@ -179,8 +179,8 @@ export const GroupForm = function({ form.wrap({ children: [ node('div|class:group-form-description', [ - node(`h2:${message.get('groupFormSectionToolbarHeading')}`), - node(`p:${message.get('groupFormSectionToolbarDescription')}`) + node(`h2:${message.get('groupFormSectionToolbarHeading') || 'Content'}`), + node(`p:${message.get('groupFormSectionToolbarDescription') || 'Text'}`) ]) ] }), @@ -208,8 +208,8 @@ export const GroupForm = function({ form.wrap({ children: [ node('div|class:group-form-description', [ - node(`h2:${message.get('groupFormSectionOrderingHeading')}`), - node(`p:${message.get('groupFormSectionOrderingDescription')}`) + node(`h2:${message.get('groupFormSectionOrderingHeading') || 'Content'}`), + node(`p:${message.get('groupFormSectionOrderingDescription') || 'Text'}`) ]) ] }), diff --git a/src/component/link/index.js b/src/component/link/index.js index a1d0e493..bdf68762 100644 --- a/src/component/link/index.js +++ b/src/component/link/index.js @@ -46,6 +46,10 @@ export const Link = function ({ this.element.link.classList.add('button-ring'); break; + case 'small': + this.element.link.classList.add('button-small'); + break; + } }); diff --git a/src/component/menuContent/appSetting/index.js b/src/component/menuContent/appSetting/index.js index a65ef934..f3c0c54f 100644 --- a/src/component/menuContent/appSetting/index.js +++ b/src/component/menuContent/appSetting/index.js @@ -13,7 +13,7 @@ const appSetting = {}; appSetting.app = (parent) => { - appSetting.app.para1 = node(`p:${message.get('menuContentAppPara1')}`); + appSetting.app.para1 = node(`p:${message.get('menuContentAppPara1') || 'Text'}`); appSetting.app.link1 = new Link({ text: message.get('menuContentAppLink1'), @@ -21,7 +21,7 @@ appSetting.app = (parent) => { openNew: true }); - appSetting.app.para2 = node(`p:${message.get('menuContentAppPara2')}`); + appSetting.app.para2 = node(`p:${message.get('menuContentAppPara2') || 'Text'}`); appSetting.app.link2 = new Link({ text: message.get('menuContentAppLink2'), diff --git a/src/component/menuContent/dataSetting/index.js b/src/component/menuContent/dataSetting/index.js index 5f3d0b89..0ee54fe4 100644 --- a/src/component/menuContent/dataSetting/index.js +++ b/src/component/menuContent/dataSetting/index.js @@ -160,7 +160,7 @@ dataSetting.clear = (parent) => { dataSetting.control.clear.alert = new Alert({ iconName: 'warning', children: [ - node(`p:${message.get('menuContentDataClearAlertPara')}|class:small`), + node(`p:${message.get('menuContentDataClearAlertPara') || 'Text'}|class:small`), node('p|class:small', dataSetting.control.clear.link.link()) ] }); diff --git a/src/component/menuContent/index.js b/src/component/menuContent/index.js index 494e5cf6..6e1f1a37 100644 --- a/src/component/menuContent/index.js +++ b/src/component/menuContent/index.js @@ -29,7 +29,7 @@ export const MenuContent = function({ }, header: (name) => { return node('div|class:menu-item-header', [ - node('h1:' + name + '|class:menu-item-header-text') + node('h1:' + (name || 'Content') + '|class:menu-item-header-text') ]); }, form: ({ indent = false } = {}) => { diff --git a/src/component/menuContent/supportSetting/index.js b/src/component/menuContent/supportSetting/index.js index 303c0c78..e57a2c4c 100644 --- a/src/component/menuContent/supportSetting/index.js +++ b/src/component/menuContent/supportSetting/index.js @@ -99,7 +99,7 @@ supportSetting.support = (parent) => { supportSetting.support.para = node('p'); - supportSetting.support.para.innerHTML = message.get('menuContentSupportPara'); + supportSetting.support.para.innerHTML = message.get('menuContentSupportPara') || 'Text'; supportSetting.support.linkIssue = new Link({ text: message.get('menuContentSupportLink1'), diff --git a/src/component/menuNav/index.js b/src/component/menuNav/index.js index 17959c41..7bd17087 100644 --- a/src/component/menuNav/index.js +++ b/src/component/menuNav/index.js @@ -1,6 +1,7 @@ import { message } from '../message'; import { Button } from '../button'; +import { Link } from '../link'; import { node } from '../../utility/node'; import { uppercaseFirstLetter } from '../../utility/uppercaseFirstLetter'; @@ -153,11 +154,17 @@ export const MenuNav = function({ item.sub.forEach((item) => { - const subLevelLink = node('a:' + message.get(`menuNav${uppercaseFirstLetter(navTop)}SubNav${uppercaseFirstLetter(item)}`) + '|href:#menu-content-item-' + this.makeId(item) + ',class:menu-nav-sub button button-link button-small,tabindex:1'); + const subLevelLink = new Link({ + text: message.get(`menuNav${uppercaseFirstLetter(navTop)}SubNav${uppercaseFirstLetter(item)}`), + href: '#menu-content-item-' + this.makeId(item), + linkButton: true, + style: ['link', 'small'], + classList: ['menu-nav-sub'] + }); - subNav.appendChild(subLevelLink); + subNav.appendChild(subLevelLink.link()); - navItem.subLevelItem.push(subLevelLink); + navItem.subLevelItem.push(subLevelLink.link()); }); diff --git a/src/component/message/index.js b/src/component/message/index.js index f8f570bb..aa81b4e4 100644 --- a/src/component/message/index.js +++ b/src/component/message/index.js @@ -1,141 +1,166 @@ import { APP_NAME } from '../../constant'; -import { state } from '../state'; import { browserDetect } from '../browserDetect'; -import { default as bn } from '../../locale/bn/messages.json'; -import { default as de } from '../../locale/de/messages.json'; -import { default as en_GB } from '../../locale/en_GB/messages.json'; -import { default as en_US } from '../../locale/en_US/messages.json'; -import { default as es } from '../../locale/es/messages.json'; -import { default as fil } from '../../locale/fil/messages.json'; -import { default as fr } from '../../locale/fr/messages.json'; -import { default as gu } from '../../locale/gu/messages.json'; -import { default as hi } from '../../locale/hi/messages.json'; -import { default as id } from '../../locale/id/messages.json'; -import { default as it } from '../../locale/it/messages.json'; -import { default as ja } from '../../locale/ja/messages.json'; -import { default as ms } from '../../locale/ms/messages.json'; -import { default as pt } from '../../locale/pt/messages.json'; -import { default as ru } from '../../locale/ru/messages.json'; -import { default as uk } from '../../locale/uk/messages.json'; -import { default as vi } from '../../locale/vi/messages.json'; +// import { default as bn } from '../../locale/bn/messages.json'; +// import { default as de } from '../../locale/de/messages.json'; +// import { default as en_GB } from '../../locale/en_GB/messages.json'; +// import { default as en_US } from '../../locale/en_US/messages.json'; +// import { default as es } from '../../locale/es/messages.json'; +// import { default as fil } from '../../locale/fil/messages.json'; +// import { default as fr } from '../../locale/fr/messages.json'; +// import { default as gu } from '../../locale/gu/messages.json'; +// import { default as hi } from '../../locale/hi/messages.json'; +// import { default as id } from '../../locale/id/messages.json'; +// import { default as it } from '../../locale/it/messages.json'; +// import { default as ja } from '../../locale/ja/messages.json'; +// import { default as ms } from '../../locale/ms/messages.json'; +// import { default as pt } from '../../locale/pt/messages.json'; +// import { default as ru } from '../../locale/ru/messages.json'; +// import { default as uk } from '../../locale/uk/messages.json'; +// import { default as vi } from '../../locale/vi/messages.json'; const message = {}; message.language = { - pack: { bn, de, en_GB, en_US, es, fil, fr, gu, hi, id, it, ja, ms, pt, ru, uk, vi } + // pack: { bn, de, en_GB, en_US, es, fil, fr, gu, hi, id, it, ja, ms, pt, ru, uk, vi } }; -message.language.list = () => { +// message.language.list = () => { +// +// const list = [ +// { code: 'bn', name: 'বাংলা' }, // Bengali +// { code: 'de', name: 'Deutsch' }, // German +// { code: 'en_GB', name: 'English' }, // English GB +// { code: 'en_US', name: 'English' }, // English USA +// { code: 'es', name: 'Español' }, // Spanish +// { code: 'fil', name: 'Filipino' }, // Filipino +// { code: 'fr', name: 'Français' }, // French +// { code: 'gu', name: 'ગુજરાતી' }, // Gujarati +// { code: 'hi', name: 'हिंदी' }, // Hindi +// { code: 'id', name: 'Indonesia' }, // Indonesian +// { code: 'it', name: 'Italiano' }, // Italian +// { code: 'ja', name: '日本語' }, // Japanese +// { code: 'ms', name: 'Melayu' }, // Malay +// { code: 'pt', name: 'Português' }, // Portuguese +// { code: 'ru', name: 'Pусский' }, // Russian +// { code: 'uk', name: 'український' }, // Ukrainian +// { code: 'vi', name: 'англійська' } // Vietnamese +// ]; +// +// list.forEach((item) => { +// +// if (item.code.indexOf('_') > -1) { +// item.name = `${item.name} — ${(item.code.substring(0, item.code.indexOf('_'))).toUpperCase()} (${item.code.substring(item.code.indexOf('_') + 1, item.code.length)})`; +// } else { +// item.name = `${item.name} — ${(item.code).toUpperCase()}`; +// } +// +// }); +// +// list.unshift({ name: '—', disabled: true }); +// +// list.unshift({ code: 'system', name: message.get('menuContentLanguageSystem') }); +// +// return list; +// +// }; - const list = [ - { code: 'bn', name: 'বাংলা' }, // Bengali - { code: 'de', name: 'Deutsch' }, // German - { code: 'en_GB', name: 'English' }, // English GB - { code: 'en_US', name: 'English' }, // English USA - { code: 'es', name: 'Español' }, // Spanish - { code: 'fil', name: 'Filipino' }, // Filipino - { code: 'fr', name: 'Français' }, // French - { code: 'gu', name: 'ગુજરાતી' }, // Gujarati - { code: 'hi', name: 'हिंदी' }, // Hindi - { code: 'id', name: 'Indonesia' }, // Indonesian - { code: 'it', name: 'Italiano' }, // Italian - { code: 'ja', name: '日本語' }, // Japanese - { code: 'ms', name: 'Melayu' }, // Malay - { code: 'pt', name: 'Português' }, // Portuguese - { code: 'ru', name: 'Pусский' }, // Russian - { code: 'uk', name: 'український' }, // Ukrainian - { code: 'vi', name: 'англійська' } // Vietnamese - ]; +// message.language.name = () => message.language.list().map(item => item.name); - list.forEach((item) => { - - if (item.code.indexOf('_') > -1) { - item.name = `${item.name} — ${(item.code.substring(0, item.code.indexOf('_'))).toUpperCase()} (${item.code.substring(item.code.indexOf('_') + 1, item.code.length)})`; - } else { - item.name = `${item.name} — ${(item.code).toUpperCase()}`; - } - - }); - - list.unshift({ name: '—', disabled: true }); - - list.unshift({ code: 'system', name: message.get('menuContentLanguageSystem') }); - - return list; - -}; - -message.language.name = () => message.language.list().map(item => item.name); - -message.language.code = () => message.language.list().map(item => item.code); +// message.language.code = () => message.language.list().map(item => item.code); message.get = (stringId) => { let string; - switch (state.get.current().language) { + if (browserDetect().chrome && typeof chrome != 'undefined') { + // if browser is chrome - // use system language - case 'system': + if ('i18n' in chrome) { + // if installed as extension - if (browserDetect().chrome && typeof chrome != 'undefined') { - // if browser is chrome + string = chrome.i18n.getMessage(stringId); - if ('i18n' in chrome) { - // if installed as extension + } - string = chrome.i18n.getMessage(stringId); + } else if (browserDetect().firefox && typeof browser != 'undefined') { + // if browser is firefox - } else { + if ('i18n' in browser) { + // if installed as addon - string = message.language.pack.en_GB[stringId].message; + string = browser.i18n.getMessage(stringId); - } + } - } else if (browserDetect().firefox && typeof browser != 'undefined') { - // if browser is firefox + } else { - if ('i18n' in browser) { - // if installed as addon - - string = browser.i18n.getMessage(stringId); - - } else { - - string = message.language.pack.en_GB[stringId].message; - - } - - } else { - - string = message.language.pack.en_GB[stringId].message; - - } - - break; - - // use manually selected language - default: - - if (stringId in message.language.pack[state.get.current().language]) { - - // string found in chosen language - string = message.language.pack[state.get.current().language][stringId].message; - - } else { - - // or use default language - string = message.language.pack.en_GB[stringId].message; - - } - - break; + string = message.language.pack.en_GB[stringId].message; } - if (string.indexOf('{appName}') > -1) { + // switch (state.get.current().language) { + // + // // use system language + // case 'system': + // + // if (browserDetect().chrome && typeof chrome != 'undefined') { + // // if browser is chrome + // + // if ('i18n' in chrome) { + // // if installed as extension + // + // string = chrome.i18n.getMessage(stringId); + // + // } else { + // + // string = message.language.pack.en_GB[stringId].message; + // + // } + // + // } else if (browserDetect().firefox && typeof browser != 'undefined') { + // // if browser is firefox + // + // if ('i18n' in browser) { + // // if installed as addon + // + // string = browser.i18n.getMessage(stringId); + // + // } else { + // + // string = message.language.pack.en_GB[stringId].message; + // + // } + // + // } else { + // + // string = message.language.pack.en_GB[stringId].message; + // + // } + // + // break; + // + // // use manually selected language + // default: + // + // if (stringId in message.language.pack[state.get.current().language]) { + // + // // string found in chosen language + // string = message.language.pack[state.get.current().language][stringId].message; + // + // } else { + // + // // or use default language + // string = message.language.pack.en_GB[stringId].message; + // + // } + // + // break; + // + // } + + if (string && string.indexOf('{appName}') > -1) { string = string.replaceAll('{appName}', APP_NAME); @@ -145,4 +170,4 @@ message.get = (stringId) => { }; -export { message }; +export { message }; \ No newline at end of file diff --git a/src/manifest.json b/src/manifest.json index 302de7f0..3f7040a7 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "short_name": "__MSG_appShortName__", "description": "__MSG_appDescription__", "version": "7.5.0", - "manifest_version": 2, + "manifest_version": 3, "default_locale": "en_GB", "chrome_url_overrides": { "newtab": "index.html"