Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initialize locale earlier to avoid races

Browse Source
This commit is contained in:
Fedor Indutny
2021-11-29 19:04:14 +01:00
committed by GitHub
parent 29b4148889
commit 599c7afe8b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/main.ts
View File

@@ -1371,6 +1371,12 @@ app.on('ready', async () => {
logger = await logging.initialize(getMainWindow);
if (!locale) {
const appLocale =
getEnvironment() === Environment.Test ? 'en' : app.getLocale();
locale = loadLocale({ appLocale, logger });
}
sqlInitPromise = initializeSQL(userDataPath);
const startTime = Date.now();
@@ -1448,12 +1454,6 @@ app.on('ready', async () => {
);
}
if (!locale) {
const appLocale =
getEnvironment() === Environment.Test ? 'en' : app.getLocale();
locale = loadLocale({ appLocale, logger });
}
GlobalErrors.updateLocale(locale.messages);
// If the sql initialization takes more than three seconds to complete, we