Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-13 17:22:08 -04:00
Code Packages Releases Activity

locale: fix locale override persisting even when not explicitly set

Browse Source
This commit is contained in:
bbedward
2026-02-26 16:15:06 -05:00
parent 1fe72e1a66
commit fbc1ff62c7
6 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
quickshell/Common/I18n.qml
View File

@@ -8,7 +8,9 @@ import Quickshell.Io
Singleton {
id: root
readonly property string _rawLocale: SettingsData.locale === "" ? Qt.locale().name : SettingsData.locale
property string _resolvedLocale: "en"
readonly property string _rawLocale: SessionData.locale === "" ? Qt.locale().name : SessionData.locale
readonly property string _lang: _rawLocale.split(/[_-]/)[0]
readonly property var _candidates: {
const fullUnderscore = _rawLocale;
@@ -49,22 +51,21 @@ Singleton {
try {
root.translations = JSON.parse(text());
root.translationsLoaded = true;
console.info(`I18n: Loaded translations for '${SettingsData.locale}' (${Object.keys(root.translations).length} contexts)`);
console.info(`I18n: Loaded translations for '${root._resolvedLocale}' (${Object.keys(root.translations).length} contexts)`);
} catch (e) {
console.warn(`I18n: Error parsing '${SettingsData.locale}':`, e, "- falling back to English");
console.warn(`I18n: Error parsing '${root._resolvedLocale}':`, e, "- falling back to English");
root._fallbackToEnglish();
}
}
onLoadFailed: error => {
console.warn(`I18n: Failed to load '${SettingsData.locale}' (${error}), ` + "falling back to English");
console.warn(`I18n: Failed to load '${root._resolvedLocale}' (${error}), ` + "falling back to English");
root._fallbackToEnglish();
}
}
// for replacing Qt.locale()
function locale() {
return presentLocales[SettingsData.locale] ?? presentLocales["en"];
return presentLocales[_resolvedLocale] ?? presentLocales["en"];
}
function _loadPresentLocales() {
@@ -83,16 +84,18 @@ Singleton {
function _pickTranslation() {
for (let i = 0; i < _candidates.length; i++) {
const cand = _candidates[i];
if (presentLocales[cand] !== undefined) {
SettingsData.set("locale", cand);
return;
}
if (presentLocales[cand] === undefined) continue;
_resolvedLocale = cand;
useLocale(cand, cand.startsWith("en") ? "" : translationsFolder + "/" + cand + ".json");
return;
}
_resolvedLocale = "en";
_fallbackToEnglish();
}
function useLocale(localeTag, fileUrl) {
_resolvedLocale = localeTag || "en";
_selectedPath = fileUrl;
translationsLoaded = false;
translations = ({});