Merge pull request lingua-libre#96 from kabir-afk/chore/i18n

refactor : i18n now working in FF
kabir-afk · Jun 17, 2024 · 328cbef · 328cbef
2 parents ca4b7be + c46538c
commit 328cbef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/SignItCoreContent.js b/SignItCoreContent.js
@@ -68,19 +68,19 @@ var SignItCoreContent = function () {
           banana.i18n("si-panel-definitions-wikt-pointer"),
           banana.i18n("si-panel-definitions-empty") // May need a different key for error message
         ]);
-        const [videosPanelNoVideoTitle, videosPanelNoVideoEmpty, definitionsPanelTitle, contributeButtonLabel, wiktIso, wiktPointer, definitionsEmpty] = translations;
+        const [panelVideosTitle, panelVideosEmpty, panelDefinitionsTitle, panelVideosContributeLabel, wiktIso, wiktPointer, panelDefinitionsEmpty] = translations;
 
-        this.$container.find(".signit-panel-videos .signit-novideo h2").text(videosPanelNoVideoTitle); 
-        this.$container.find(".signit-panel-videos .signit-novideo p").html(videosPanelNoVideoEmpty); // -- needs additional css
-        this.$container.find(".signit-panel-definitions .signit-definitions h2").text(definitionsPanelTitle); 
-        this.contributeButton.$label.text(contributeButtonLabel);
+        this.$container.find(".signit-panel-videos .signit-novideo h2").text(panelVideosTitle); 
+        this.$container.find(".signit-panel-videos .signit-novideo p").html(panelVideosEmpty); // -- needs additional css
+        this.$container.find(".signit-panel-definitions .signit-definitions h2").text(panelDefinitionsTitle); 
+        this.contributeButton.$label.text(panelVideosContributeLabel);
         const definitionsSourceLink = `https://${wiktIso}.wiktionary.org`;
         this.$container
           .find(".signit-definitions-source a")
           .attr("href", definitionsSourceLink)
           .text(wiktPointer);
 
-        this.$container.find(".signit-panel-definitions .signit-error").text(definitionsEmpty);
+        this.$container.find(".signit-panel-definitions .signit-error").text(panelDefinitionsEmpty);
 
       } catch (error) {
         console.error("Error fetching translations:", error);

diff --git a/background-script.js b/background-script.js
@@ -164,8 +164,6 @@ async function loadI18nLocalization( uiLanguageQid ) {
 
 	// Declare localisation
 	banana.setLocale(locale); // Change to new locale
-	storeParam('bananaInStore',banana)
-    storeParam("sourceMap", Array.from(banana.messageStore.sourceMap));
 
 	state = 'ready';
 
@@ -413,21 +411,19 @@ else if (message.command === "storeParam") {
 	const [name,value] = message.argument;
 	storeParam(name,value);
 	return;
+}
+else if (message.command === 'bananai18n') {
+	let [msg,placeholderValue] = message.arg;
+	const i18nMessage = banana.i18n(msg,...placeholderValue);
+	return i18nMessage;
 }
 	message = normalizeMessage(message);
 
 	// When message 'signit.getfiles' is heard, returns relevant extract of records[]
 	if ( message.command === 'signit.getfiles' ) {
 		console.log('bg>signit.getfiles')
 		return records[ message.text ] || records[ message.text.toLowerCase() ] || [];
-	}
-	 // When message 'signit.i18nCode' is heard, returns banada object
-	 else if (message.command === 'bananai18n') {
-		let [msg,placeholderValue] = message.arg;
-		const i18nMessage = banana.i18n(msg,placeholderValue);
-		return i18nMessage;
-	}
-
+	}	
 	// Start modal
 	// When right click's menu "Lingua Libre SignIt" clicked, send message 'signit.sign' to the content script => opens Signit modal
 	else if ( message.command === 'signit.hinticon' ) {