if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-11-22 08:57:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: ELECTRON-1465 (Persist locale changes to the user config file) (#761)

Browse Source 
* ELECTRON-1465 - Persist locale changes to the user config file

* ELECTRON-1465 - Add safety check
This commit is contained in:
Kiran Niranjan 2019-08-07 15:12:29 +05:30 committed by Vishwas Shashidhar
parent cebada1b99
commit 1038e192d7
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/config-handler.ts
View File

@ -40,6 +40,7 @@ export interface IConfig {
permissions: IPermission;
customFlags: ICustomFlag;
mainWinPos?: ICustomRectangle;
locale?: string;
}
export interface IPermission {

6
src/app/window-handler.ts
View File

@ -6,7 +6,7 @@ import { format, parse } from 'url';
import { apiName, WindowTypes } from '../common/api-interface';
import { isDevEnv, isMac, isWindowsOS } from '../common/env';
import { i18n } from '../common/i18n';
import { i18n, LocaleType } from '../common/i18n';
import { logger } from '../common/logger';
import { getCommandLineArgs, getGuid } from '../common/utils';
import { notification } from '../renderer/notification';
@ -88,7 +88,7 @@ export class WindowHandler {
constructor(opts?: Electron.BrowserViewConstructorOptions) {
// Use these variables only on initial setup
this.config = config.getConfigFields(['isCustomTitleBar', 'mainWinPos', 'minimizeOnClose', 'notificationSettings', 'alwaysOnTop']);
this.config = config.getConfigFields([ 'isCustomTitleBar', 'mainWinPos', 'minimizeOnClose', 'notificationSettings', 'alwaysOnTop', 'locale' ]);
this.globalConfig = config.getGlobalConfigFields(['url', 'contextIsolation', 'customFlags']);
const {url, contextIsolation, customFlags}: IConfig = this.globalConfig;
@ -112,6 +112,8 @@ export class WindowHandler {
this.isOnline = true;
this.appMenu = null;
const locale: LocaleType = (this.config.locale || app.getLocale()) as LocaleType;
i18n.setLocale(locale);
try {
const extra = {podUrl: url, process: 'main'};

7
src/app/window-utils.ts
View File

@ -235,7 +235,7 @@ export const isValidWindow = (browserWin: Electron.BrowserWindow): boolean => {
*
* @param locale {LocaleType}
*/
export const updateLocale = (locale: LocaleType): void => {
export const updateLocale = async (locale: LocaleType): Promise<void> => {
logger.info(`window-utils: updating locale to ${locale}!`);
// sets the new locale
i18n.setLocale(locale);
@ -244,6 +244,11 @@ export const updateLocale = (locale: LocaleType): void => {
logger.info(`window-utils: updating app menu with locale ${locale}!`);
appMenu.update(locale);
}
if (i18n.isValidLocale(locale)) {
// Update user config file with latest locale changes
await config.updateUserConfig({ locale });
}
};
/**

16
src/common/i18n.ts
View File

@ -30,8 +30,7 @@ class Translation {
* @param locale
*/
public setLocale(locale: LocaleType): void {
const localeMatch: string[] | null = locale.match(localeCodeRegex);
if (!locale && (!localeMatch || localeMatch.length < 1)) {
if (!this.isValidLocale(locale)) {
return;
}
@ -47,6 +46,19 @@ class Translation {
return this.locale;
}
/**
* Validates the locale using Regex
*
* @param locale {LocaleType}
*/
public isValidLocale(locale: LocaleType): boolean {
if (!locale) {
return false;
}
const localeMatch: string[] | null = locale.match(localeCodeRegex);
return !(!locale && (!localeMatch || localeMatch.length < 1));
}
/**
* fetches and returns the translated value
*