Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

desktop: fix spell check issue for non-latin languages #9423 (#9443)

Asad Ali4237d2eb4ad8
diff --git a/apps/desktop/src/api/spell-checker.ts b/apps/desktop/src/api/spell-checker.ts
index 54e79c291..2559effe9 100644
--- a/apps/desktop/src/api/spell-checker.ts
+++ b/apps/desktop/src/api/spell-checker.ts
@@ -84,35 +84,55 @@ const LANGUAGES: Record<string, string> = {
type Language = { code: string; name: string };
+const LANGUAGE_REDIRECT_MAP: Record<string, string> = {
+ es: "es-MX",
+ "es-419": "es-MX",
+ "es-ES": "es-AR"
+};
+
export const spellCheckerRouter = t.router({
isEnabled: t.procedure.query(() => config.isSpellCheckerEnabled),
- languages: t.procedure.query(
- () =>
- <Language[]>(
- globalThis.window?.webContents.session.availableSpellCheckerLanguages.map(
- (code) => ({
- code,
- name: LANGUAGES[code]
- })
- )
- )
- ),
- enabledLanguages: t.procedure.query(
- () =>
- <Language[]>(
- globalThis.window?.webContents.session
- .getSpellCheckerLanguages()
- .map((code) => ({
- code,
- name: LANGUAGES[code]
- }))
- )
- ),
- setLanguages: t.procedure
- .input(z.array(z.string()))
- .mutation(({ input: languages }) =>
- globalThis.window?.webContents.session.setSpellCheckerLanguages(languages)
- ),
+ languages: t.procedure.query(() => {
+ const available =
+ globalThis.window?.webContents.session.availableSpellCheckerLanguages ||
+ [];
+
+ return <Language[]>available
+ .map((code) => ({
+ code,
+ name: LANGUAGES[code] || code
+ }))
+ .sort((a, b) => a.name.localeCompare(b.name));
+ }),
+
+ enabledLanguages: t.procedure.query(() => {
+ const enabled =
+ globalThis.window?.webContents.session.getSpellCheckerLanguages() || [];
+ const available =
+ globalThis.window?.webContents.session.availableSpellCheckerLanguages ||
+ [];
+
+ const resolved = enabled
+ .map((code) => resolveLanguage(code, available))
+ .filter(Boolean) as string[];
+
+ return <Language[]>resolved.map((code) => ({
+ code,
+ name: LANGUAGES[code] || code
+ }));
+ }),
+
+ setLanguages: t.procedure.input(z.array(z.string())).mutation(({ input }) => {
+ const available =
+ globalThis.window?.webContents.session.availableSpellCheckerLanguages ||
+ [];
+
+ const resolved = input
+ .map((code) => resolveLanguage(code, available))
+ .filter(Boolean) as string[];
+
+ globalThis.window?.webContents.session.setSpellCheckerLanguages(resolved);
+ }),
toggle: t.procedure
.input(z.object({ enabled: z.boolean() }))
.mutation(({ input: { enabled } }) => {
@@ -128,3 +148,16 @@ export const spellCheckerRouter = t.router({
);
})
});
+
+function resolveLanguage(code: string, available: string[]) {
+ if (LANGUAGE_REDIRECT_MAP[code]) {
+ const working = LANGUAGE_REDIRECT_MAP[code];
+ return available.includes(working) ? working : code;
+ }
+ const fallback = code.split("-")[0];
+ return available.includes(code)
+ ? code
+ : available.includes(fallback)
+ ? fallback
+ : undefined;
+}