if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Typescript - Fix i18n locale setting issue

Browse Source
This commit is contained in:
Kiran Niranjan 2019-01-03 14:30:35 +05:30
parent c58678eeb2
commit eeb1ff295e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser/window-handler.ts
View File

@ -199,7 +199,7 @@ export class WindowHandler {
this.mainWindow.webContents.insertCSS( this.mainWindow.webContents.insertCSS(
fs.readFileSync(path.join(__dirname, '..', '/renderer/styles/snack-bar.css'), 'utf8').toString(), fs.readFileSync(path.join(__dirname, '..', '/renderer/styles/snack-bar.css'), 'utf8').toString(),
); );
this.mainWindow.webContents.send('page-load', { isWindowsOS, resources: i18n.loadedResources }); this.mainWindow.webContents.send('page-load', { isWindowsOS, locale: i18n.getLocale(), resources: i18n.loadedResources });
this.appMenu = new AppMenu(); this.appMenu = new AppMenu();
this.monitorWindowActions(); this.monitorWindowActions();
// Ready to show the window // Ready to show the window

6
src/common/i18n-preload.ts
View File

@ -64,9 +64,11 @@ class Translation {
/** /**
* Keeps ref of loaded resources from the main process * Keeps ref of loaded resources from the main process
* *
* @param resource * @param locale {LocaleType}
* @param resource {JSON}
*/ */
public setResource(resource: JSON): void { public setResource(locale: LocaleType, resource: JSON): void {
this.locale = locale;
this.loadedResources = resource; this.loadedResources = resource;
} }

4
src/renderer/preload-main.ts
View File

@ -38,9 +38,9 @@ const createAPI = () => {
createAPI(); createAPI();
// When the window is completely loaded // When the window is completely loaded
ipcRenderer.on('page-load', (_event, { isWindowsOS, resources }) => { ipcRenderer.on('page-load', (_event, { isWindowsOS, locale, resources }) => {
i18n.setResource(resources); i18n.setResource(locale, resources);
if (isWindowsOS) { if (isWindowsOS) {
// injects custom window title bar // injects custom window title bar