Merge pull request #181 from jeevatkm/v3.3.0-development

for v3.3.0
jeevatkm · Oct 24, 2024 · 7c503e5 · 7c503e5
2 parents cffbed9 + a99e13d
commit 7c503e5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
  <p align="center">Outlook style headers and few goodies for Thunderbird</p>
 </p>
 <p align="center">
- <a href="https://github.com/jeevatkm/ReplyWithHeaderMozilla/releases/latest" alt="Version"><img src="https://img.shields.io/badge/version-3.2.0-blue.svg" alt="Version" /></a> <a href="LICENSE" alt="LICENSE"><img src="https://img.shields.io/github/license/jeevatkm/ReplyWithHeaderMozilla.svg" alt="LICENSE" /></a> <a href="http://myjeeva.com/replywithheader-mozilla" alt"Home page"><img src="https://img.shields.io/badge/Homepage-blue" alt"Home page" /> </a>
+ <a href="https://github.com/jeevatkm/ReplyWithHeaderMozilla/releases/latest" alt="Version"><img src="https://img.shields.io/badge/version-3.3.0-blue.svg" alt="Version" /></a> <a href="LICENSE" alt="LICENSE"><img src="https://img.shields.io/github/license/jeevatkm/ReplyWithHeaderMozilla.svg" alt="LICENSE" /></a> <a href="http://myjeeva.com/replywithheader-mozilla" alt"Home page"><img src="https://img.shields.io/badge/Homepage-blue" alt"Home page" /> </a>
 </p>
 
 ## Download

diff --git a/background.js b/background.js
@@ -41,10 +41,17 @@ async function detectLocaleAndSetAsDefault() {
     }
 
     let uiLocale = messenger.i18n.getUILanguage();
-    let selected = rwhI18n.i18n.lang[uiLocale] ?? 'en-US';
+    let selected = rwhI18n.i18n.lang[uiLocale];
+    rwhLogger.debug('uiLocale:', uiLocale, 'selected:', selected);
+    if (typeof selected === 'undefined') {
+        rwhLogger.info(`Currently does not have support for locale '${uiLocale}', fallback to 'en-US'`);
+        await rwhSettings.set('header.locale', 'en-US');
+        return;
+    }
+
     let currentLocale = await rwhSettings.getHeaderLocale();
-    rwhLogger.debug('currentLocale:', currentLocale, 'uiLocale:', uiLocale, 'selected:', selected);
-    if (selected !== 'undefined' && currentLocale !== uiLocale) {
+    rwhLogger.debug('currentLocale:', currentLocale);
+    if (currentLocale !== uiLocale) {
         await rwhSettings.set('header.locale', uiLocale);
     }
 }

diff --git a/images/rwh-features.png b/images/rwh-features.png
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "ReplyWithHeader",
     "description": "Outlook style headers and few goodies for Thunderbird",
-    "version": "3.2.0",
+    "version": "3.3.0",
     "author": "Jeevanandam M.",
     "homepage_url": "https://myjeeva.com/replywithheader-mozilla",
     "browser_specific_settings": {

diff --git a/options/options.html b/options/options.html
@@ -25,7 +25,7 @@
         <img id="identitySelectImg" src='/images/mail-identities.svg' width='21' height='21' title="Mail Account Identities" />
         <div id="multiselectIdentity" class="multiselect">
             <div id="selectBox" class="selectBox">
-                <select><option>Select an Identities</option></select>
+                <select><option>Select Identities</option></select>
                 <div class="overSelect"></div>
             </div>
             <div id="multiselectCheckboxes"></div>