CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-31 05:29:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #60 from vector-im/t3chguy/fix_spellcheck

Browse Source 
Fix spellcheck language fallback algorithm
This commit is contained in:
Michael Telatynski 2020-04-01 17:47:29 +01:00 committed by GitHub
commit 8996c308dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/electron-main.js
View File

@ -303,24 +303,39 @@ ipcMain.on('ipcCall', async function(ev, payload) {
caseMap[lang.toLowerCase()] = lang; caseMap[lang.toLowerCase()] = lang;
}); });
const languages = args[0].map(lang => { if (!caseMap["en"]) {
// default special-case for `en` as in Riot is actually implies `en-GB`. `en-US` is distinct.
// this way if `en` is requested and not available and `en-GB` is available it'll be used.
caseMap["en"] = caseMap["en-gb"];
}
const languages = new Set();
args[0].forEach(lang => {
const lcLang = lang.toLowerCase(); const lcLang = lang.toLowerCase();
if (caseMap[lcLang]) { if (caseMap[lcLang]) {
return caseMap[lcLang]; languages.add(caseMap[lcLang]);
return;
} }
// as a fallback if the language is unknown check if the language group is known, e.g en for en-AU // as a fallback if the language is unknown check if the language group is known, e.g en for en-AU
const langGroup = lcLang.substr(0, lcLang.indexOf("-")); const langGroup = lcLang.split("-")[0];
if (caseMap[langGroup]) { if (caseMap[langGroup]) {
return caseMap[langGroup]; languages.add(caseMap[langGroup]);
return;
} }
// as a further fallback, pick another variant from the same language group // as a further fallback, pick all other matching variants from the same language group
return availableLanguages.find(availableLang => availableLang.startsWith(langGroup)); // this means that if we cannot find `ar-dz` or `ar` for example, we will pick `ar-*` to
}).filter(Boolean); // offer a spellcheck which is least likely to wrongly red underline something.
availableLanguages.forEach(availableLang => {
if (availableLang.startsWith(langGroup)) {
languages.add(availableLang);
}
});
});
if (languages.length) { if (languages.size > 0) {
mainWindow.webContents.session.setSpellCheckerLanguages(languages); mainWindow.webContents.session.setSpellCheckerLanguages([...languages]);
} }
break; break;
} }