From 6bc7b9197a0f5e88053f7588963d7e73e398b885 Mon Sep 17 00:00:00 2001 From: kabir-afk Date: Mon, 10 Jun 2024 17:03:26 +0530 Subject: [PATCH] testing `browser.i18n` API --- SignItCoreContent.js | 16 +++++++------ SignItVideosGallery.js | 2 +- popup/popup.js | 53 +++++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/SignItCoreContent.js b/SignItCoreContent.js index d4ef7a2..72c4e38 100644 --- a/SignItCoreContent.js +++ b/SignItCoreContent.js @@ -3,6 +3,8 @@ var SignItCoreContent = function (locale,mapi18n) { banana = { i18n: (msg) => sourceMap.get(locale)[msg] }; console.log("Passed trough ! :", locale); console.log("SignItCoreContent.js",banana ); + // let hlwa = browser.i18n.getMessage("si-panel-videos-title"); + // console.log("hlwa = ",hlwa); this.$container = $(`

@@ -10,8 +12,8 @@ var SignItCoreContent = function (locale,mapi18n) {

- ${ banana.i18n("si-panel-videos-title") }

- ${ banana.i18n("si-panel-videos-empty") }

+ ${ browser.i18n.getMessage("si_panel_videos_title") } + ${ browser.i18n.getMessage("si_panel_videos_empty") }

@@ -19,11 +21,11 @@ var SignItCoreContent = function (locale,mapi18n) {

- ${ banana.i18n("si-panel-definitions-title") }

+ ${ browser.i18n.getMessage("si_panel_definitions_title") }
- - ${ banana.i18n("si-panel-definitions-wikt-pointer") } + + ${ browser.i18n.getMessage("si_panel_definitions_wikt_pointer") }
@@ -32,7 +34,7 @@ var SignItCoreContent = function (locale,mapi18n) { )}" width="40" height="40">
- ${ banana.i18n("si-panel-definitions-empty") }
+ ${ browser.i18n.getMessage("si_panel_definitions_empty") }
@@ -41,7 +43,7 @@ var SignItCoreContent = function (locale,mapi18n) { // Button contribute var optionsContribute = { flags: ["primary", "progressive"], - label: banana.i18n("si-panel-videos-contribute-label") , + label: browser.i18n.getMessage("si_panel_videos_contribute_label") , href: "https://lingualibre.org/wiki/Special:RecordWizard", }; this.contributeButton = new OO.ui.ButtonWidget(optionsContribute); diff --git a/SignItVideosGallery.js b/SignItVideosGallery.js index fd626bf..7042893 100644 --- a/SignItVideosGallery.js +++ b/SignItVideosGallery.js @@ -52,7 +52,7 @@ SignItVideosGallery.prototype.refresh = async function ( files ) { this.$videos.push( $( `
- ${banana.i18n("si-panel-videos-gallery-attribution", url, speaker, i+1, total)} + ${browser.i18n.getMessage("si_panel_videos_gallery_attribution",[ url, speaker, i+1, total])}
` ) ); diff --git a/popup/popup.js b/popup/popup.js index 44511cf..3b4102a 100644 --- a/popup/popup.js +++ b/popup/popup.js @@ -50,12 +50,12 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') /* *********************************************************** */ // Master var UI = function () { - document.querySelector('#fetchVideosList').innerHTML = banana.i18n('si-addon-preload'); + document.querySelector('#fetchVideosList').innerHTML = browser.i18n.getMessage('si_addon_preload'); // Setup the main tabs - this.viewTab = new OO.ui.TabPanelLayout( 'view', { label: banana.i18n('si-popup-browse-title') } ); - this.historyTab = new OO.ui.TabPanelLayout( 'history', { label: banana.i18n('si-popup-history-title'), classes: [ 'signit-popup-tab-history' ] } ); - this.paramTab = new OO.ui.TabPanelLayout( 'param', { label: banana.i18n('si-popup-settings-title'), classes: [ 'signit-popup-tab-settings' ] } ); + this.viewTab = new OO.ui.TabPanelLayout( 'view', { label: browser.i18n.getMessage('si_popup_browse_title') } ); + this.historyTab = new OO.ui.TabPanelLayout( 'history', { label: browser.i18n.getMessage('si_popup_history_title'), classes: [ 'signit-popup-tab-history' ] } ); + this.paramTab = new OO.ui.TabPanelLayout( 'param', { label: browser.i18n.getMessage('si_popup_settings_title'), classes: [ 'signit-popup-tab-settings' ] } ); // Set up the popup page layout this.indexLayout = new OO.ui.IndexLayout( { autoFocus: false, classes: [ 'signit-popup-tabs' ] } ); @@ -83,18 +83,19 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') // Browse tab UI.prototype.initView = async function () { // Word input 2 : text field - this.searchWidget = new SearchWidget( { placeholder: banana.i18n("si-popup-browse-placeholder", Object.keys( _backgroundPage.records ).length ) } ); + // browser.i18n.getMessage accepts string value as substitutes for placeholders, hence JSON.stringify + this.searchWidget = new SearchWidget( { placeholder: browser.i18n.getMessage("si_popup_browse_placeholder", JSON.stringify(Object.keys( _backgroundPage.records ).length) ) } ); this.searchWidget.setRecords( _backgroundPage.records ); var searchButton = new OO.ui.ButtonWidget( { icon:"search", - label: banana.i18n("si-popup-browse-label"), + label: browser.i18n.getMessage("si_popup_browse_label"), invisibleLabel: true, - title: banana.i18n("si-popup-browse-icon") + title: browser.i18n.getMessage("si_popup_browse_icon") } ); var searchLayout = new OO.ui.ActionFieldLayout( this.searchWidget, searchButton, { align: 'top', - label: banana.i18n("si-popup-browse-label"), + label: browser.i18n.getMessage("si_popup_browse_label"), invisibleLabel: true, classes: [ 'signit-popup-tab-browse' ] } ); @@ -115,7 +116,7 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') var tabs = await browser.tabs.query({active: true, currentWindow: true}); // optimizing message passing for the functions that are present in - // sw.js as well background-script.js + // sw.js as well background_script.js await sendMessageUp("checkActiveTabInjections",tabs[0].id); var selection = await browser.tabs.sendMessage( tabs[ 0 ].id, { @@ -147,7 +148,7 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') // History tab // .initHistory calls .addHistory which calls .cleanHistory UI.prototype.initHistory = function () { - this.$noHistory = $( `
${banana.i18n("si-popup-history-empty")}
` ); + this.$noHistory = $( `
${browser.i18n.getMessage("si_popup_history_empty")}
` ); this.history = []; this.$history = []; this.historyTab.$element.append( this.$noHistory ); @@ -212,14 +213,14 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') } // Layout signLanguageDropdown = new OO.ui.DropdownWidget( { - label: banana.i18n("si-popup-settings-signlanguage-dropdown"), + label: browser.i18n.getMessage("si_popup_settings_signlanguage-dropdown"), menu: { items: items }, $overlay: $( 'body' ) } ); signLanguageLayout = new OO.ui.FieldLayout( signLanguageDropdown, { - label: banana.i18n("si-popup-settings-signlanguage"), + label: browser.i18n.getMessage("si_popup_settings_signlanguage"), align: 'top', - help: banana.i18n("si-popup-settings-signlanguage-help"), + help: browser.i18n.getMessage("si_popup_settings_signlanguage-help"), //helpInline: true } ); @@ -239,14 +240,14 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') } // Layout uiLanguageDropdown = new OO.ui.DropdownWidget({ - label: banana.i18n("si-popup-settings-signlanguage"), + label: browser.i18n.getMessage("si_popup-settings_signlanguage"), menu: { items: items }, $overlay: $( 'body' ) } ); uiLanguageLayout = new OO.ui.FieldLayout( uiLanguageDropdown, { - label: banana.i18n("si-popup-settings-uilanguage"), + label: browser.i18n.getMessage("si_popup_settings_uilanguage"), align: 'top', - help: banana.i18n("si-popup-settings-uilanguage-help"), + help: browser.i18n.getMessage("si_popup_settings_uilanguage-help"), //helpInline: true } ); @@ -256,9 +257,9 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') min: 0 } ); historyLayout = new OO.ui.FieldLayout( historyWidget, { - label: banana.i18n("si-popup-settings-history"), + label: browser.i18n.getMessage("si_popup_settings_history"), align: 'top', - help: banana.i18n("si-popup-settings-history-help"), + help: browser.i18n.getMessage("si_popup_settings_history_help"), } ); @@ -268,7 +269,7 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') selected: _backgroundPage.params.wpintegration, } ); wpintegrationLayout = new OO.ui.FieldLayout( wpintegrationWidget, { - label: banana.i18n("si-popup-settings-wpintegration"), + label: browser.i18n.getMessage("si_popup_settings_wpintegration"), align: 'inline', } ); @@ -277,7 +278,7 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') selected: _backgroundPage.params.twospeed, } ); twospeedLayout = new OO.ui.FieldLayout( twospeedWidget, { - label: banana.i18n("si-popup-settings-twospeed"), + label: browser.i18n.getMessage("si_popup_settings_twospeed"), align: 'inline', } ); // Hint icon shortcut @@ -285,7 +286,7 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') selected: _backgroundPage.params.hinticon, }); hinticonLayout = new OO.ui.FieldLayout(hinticonWidget, { - label: banana.i18n('si-popup-settings-hint-icon'), + label: browser.i18n.getMessage('si_popup_settings_hint-icon'), align: 'inline', }); // Colored text @@ -293,29 +294,29 @@ var browser = (browserType === 'firefox') ? browser : (browserType === 'chrome') selected: _backgroundPage.params.coloredwords, }); coloredwordsLayout = new OO.ui.FieldLayout(coloredwordsWidget, { - label: banana.i18n('si-popup-settings-enlighten'), + label: browser.i18n.getMessage('si_popup_settings_enlighten'), align: 'inline', }); // Choose panels : both, definition, video var panelsOption0 = new OO.ui.ButtonOptionWidget( { data: 'definition', - label: banana.i18n("si-popup-settings-choosepanels-definition") + label: browser.i18n.getMessage("si_popup_settings_choosepanels_definition") } ), panelsOption1 = new OO.ui.ButtonOptionWidget( { data: 'both', - label: banana.i18n("si-popup-settings-choosepanels-both") + label: browser.i18n.getMessage("si_popup_settings_choosepanels_both") } ); panelsOption2 = new OO.ui.ButtonOptionWidget( { data: 'video', - label: banana.i18n("si-popup-settings-choosepanels-video") + label: browser.i18n.getMessage("si_popup_settings_choosepanels_video") } ); choosepanelsWidget = new OO.ui.ButtonSelectWidget( { items: [ panelsOption0, panelsOption1, panelsOption2 ] } ); // Layout choosepanelsLayout = new OO.ui.FieldLayout( choosepanelsWidget, { - label: banana.i18n("si-popup-settings-choosepanels"), + label: browser.i18n.getMessage("si_popup_settings_choosepanels"), align: 'top', } );