mirror of
https://github.com/antokeinanen/obsidian-advanced-merger.git
synced 2026-07-22 07:40:24 +00:00
[*] Safer translation fallback.
This commit is contained in:
parent
c20bed71fc
commit
5f2436bd82
1 changed files with 4 additions and 5 deletions
9
main.ts
9
main.ts
|
|
@ -143,10 +143,9 @@ export default class AdvancedMerge extends Plugin {
|
||||||
public settings: AdvancedMergePluginSettings;
|
public settings: AdvancedMergePluginSettings;
|
||||||
|
|
||||||
public async onload(): Promise<void> {
|
public async onload(): Promise<void> {
|
||||||
this.language =
|
this.language = !Object.keys(TRANSLATIONS).contains(navigator.language)
|
||||||
TRANSLATIONS[navigator.language] == null
|
? DEFAULT_LANGUAGE
|
||||||
? DEFAULT_LANGUAGE
|
: navigator.language;
|
||||||
: navigator.language;
|
|
||||||
|
|
||||||
await this.loadSettings();
|
await this.loadSettings();
|
||||||
|
|
||||||
|
|
@ -270,7 +269,7 @@ export default class AdvancedMerge extends Plugin {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
})
|
})
|
||||||
: files.reverse();
|
: files.reverse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue