Update i18n to be accurate when choosing languages

Author: AlexFlipnote

build.js

@@ -13,7 +13,7 @@ async function cleanUp() {
   console.log("🧹 Cleaning up build files...")
   const foldersDelete = ["out", "dist"]
   foldersDelete.forEach(folder => {
-    fs.rmdir(path.join(__dirname, folder), { recursive: true }, (err) => {
+    fs.rm(path.join(__dirname, folder), { recursive: true, force: true }, (err) => {
       if (err) {
         // Ignore errors
       }

src/index.html

@@ -69,7 +69,7 @@ <h2 class="no-margin text-center">Demo settings</h2>
       <label class="default">
         Change language
         <select id="language">
-          <option value="">Default: Local language</option>
+          <option value="">Default: English (United Kingdom)</option>
         </select>
       </label>
       <label class="default">

src/js/index.js

@@ -217,7 +217,7 @@ if (isExtension) {
   })
 
   // Load all languages
-  for (const [k, v] of Object.entries(availableLanguages())) {
+  for (const [k, v] of Object.entries(availableLanguages({ hideDefault: true }))) {
     const option = document.createElement("option")
     option.text = v
     option.value = k

src/js/options.js

@@ -184,7 +184,7 @@ function restoreOptions() {
 
 document.addEventListener("DOMContentLoaded", () => {
   const languages = document.getElementById("language")
-  for (const [k, v] of Object.entries(availableLanguages())) {
+  for (const [k, v] of Object.entries(availableLanguages({hideDefault: true}))) {
     const option = document.createElement("option")
     option.text = v
     option.value = k

src/js/utils/i18n.js

@@ -50,11 +50,13 @@ export function translate(lang, key, args = {}) {
 
 /**
  * Get a list of available languages with their native names
+ * @param {boolean} hideDefault - Whether to hide the default language from the list
  * @returns {Object} Object with language codes as keys and native names as values
  */
-export function availableLanguages() {
+export function availableLanguages({ hideDefault = false } = {}) {
   const langs = {}
   for (const code in translations) {
+    if (hideDefault && code === DEFAULT_LANG) continue
     langs[code] = translations[code]["language.name"] || code
   }
   return langs

src/js/utils/weather.js

@@ -1,5 +1,5 @@
 import { http } from "./http.js"
-import { translate, availableLanguages } from "./i18n.js"
+import { translate } from "./i18n.js"
 import { reverseGeocode } from "./openstreetmap.js"
 import { Cache } from "./cache.js"
 
@@ -65,5 +65,3 @@ export async function getWeather(items, position, lang) {
     cache.set(cacheKey, wname.innerText)
   })
 }
-
-export const languages = availableLanguages()

src/options.html

@@ -19,7 +19,7 @@ <h1 class="no-margin">General settings</h1>
         <label class="column secondary-bg">
           Language:
           <select id="language">
-            <option value="">Default: Local language</option>
+            <option value="">Default: English (United Kingdom)</option>
           </select>
         </label>
         <label><input type="checkbox" id="show-settings"> Show settings button</label>