zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-06-07 04:15:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

i18n: grab full locale

Browse Source
This commit is contained in:
Ly-sec
2025-10-01 16:17:35 +02:00
parent 74270e9478
commit 1c1cb8e026
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Commons/I18n.qml
+14 -6
View File
@@ -13,6 +13,7 @@ Singleton {
property bool isLoaded: false property bool isLoaded: false
property string langCode: "" property string langCode: ""
property string locale: ""
property var availableLanguages: [] property var availableLanguages: []
property var translations: ({}) property var translations: ({})
property var fallbackTranslations: ({}) property var fallbackTranslations: ({})
@@ -162,7 +163,7 @@ Singleton {
if (debug && debugForceLanguage !== "") { if (debug && debugForceLanguage !== "") {
Logger.log("I18n", `Debug mode: forcing language to "${debugForceLanguage}"`) Logger.log("I18n", `Debug mode: forcing language to "${debugForceLanguage}"`)
if (availableLanguages.includes(debugForceLanguage)) { if (availableLanguages.includes(debugForceLanguage)) {
setLanguage(debugForceLanguage) setLanguage(debugForceLanguage, debugForceLanguage)
return return
} else { } else {
Logger.warn("I18n", `Debug language "${debugForceLanguage}" not available in [${availableLanguages.join(', ')}]`) Logger.warn("I18n", `Debug language "${debugForceLanguage}" not available in [${availableLanguages.join(', ')}]`)
@@ -176,7 +177,7 @@ Singleton {
// Try full code match (such as zh CN, en US) // Try full code match (such as zh CN, en US)
if (availableLanguages.includes(fullUserLang)) { if (availableLanguages.includes(fullUserLang)) {
Logger.log("I18n", `Exact match found: "${fullUserLang}"`) Logger.log("I18n", `Exact match found: "${fullUserLang}"`)
setLanguage(fullUserLang) setLanguage(fullUserLang, fullUserLang)
return return
} }
@@ -184,7 +185,7 @@ Singleton {
const shortUserLang = fullUserLang.substring(0, 2) const shortUserLang = fullUserLang.substring(0, 2)
if (availableLanguages.includes(shortUserLang)) { if (availableLanguages.includes(shortUserLang)) {
Logger.log("I18n", `Short code match found: "${shortUserLang}" from "${fullUserLang}"`) Logger.log("I18n", `Short code match found: "${shortUserLang}" from "${fullUserLang}"`)
setLanguage(shortUserLang) setLanguage(shortUserLang, fullUserLang)
return return
} }
@@ -193,14 +194,21 @@ Singleton {
// Fallback to first available language (preferably "en" if available) // Fallback to first available language (preferably "en" if available)
const fallbackLang = availableLanguages.includes("en") ? "en" : availableLanguages[0] const fallbackLang = availableLanguages.includes("en") ? "en" : availableLanguages[0]
setLanguage(fallbackLang) setLanguage(fallbackLang, fallbackLang)
} }
// ------------------------------------------- // -------------------------------------------
function setLanguage(newLangCode) { function setLanguage(newLangCode, fullLocale) {
if (newLangCode !== langCode && availableLanguages.includes(newLangCode)) { if (newLangCode !== langCode && availableLanguages.includes(newLangCode)) {
langCode = newLangCode langCode = newLangCode
Logger.log("I18n", `Language set to "${langCode}"`) if (fullLocale) {
locale = fullLocale.replace(/-/g, '_')
} else {
locale = newLangCode
}
Logger.log("I18n", `langCode: ${langCode}`)
Logger.log("I18n", `locale: ${locale}`)
Logger.log("I18n", `Language set to "${langCode}" (locale: "${locale}")`)
languageChanged(langCode) languageChanged(langCode)
loadTranslations() loadTranslations()
} else if (!availableLanguages.includes(newLangCode)) { } else if (!availableLanguages.includes(newLangCode)) {