Skip to content

Fixed desktop translation on update dialog #63221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roryabraham merged 1 commit into from
Jun 2, 2025
Merged

Fixed desktop translation on update dialog #63221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 11 additions & 28 deletions desktop/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import ELECTRON_EVENTS from './ELECTRON_EVENTS';
const createDownloadQueue = require<CreateDownloadQueueModule>('./createDownloadQueue').default;

const port = process.env.PORT ?? 8082;
const {DESKTOP_SHORTCUT_ACCELERATOR, LOCALES} = CONST;
const {DESKTOP_SHORTCUT_ACCELERATOR} = CONST;

// Setup google api key in process environment, we are setting it this way intentionally. It is required by the
// geolocation api (window.navigator.geolocation.getCurrentPosition) to work on desktop.
Expand Down Expand Up @@ -70,7 +70,7 @@ function pasteAsPlainText(browserWindow: BrowserWindow | BrowserView | WebviewTa
* @param preferredLocale - The current user language to be used for translating menu labels.
* @returns A dispose function to clean up the created context menu.
*/
function createContextMenu(preferredLocale: Locale = LOCALES.DEFAULT): () => void {
function createContextMenu(preferredLocale: Locale): () => void {
return contextMenu({
labels: {
cut: translate(preferredLocale, 'desktopApplicationMenu.cut'),
Expand All @@ -95,7 +95,7 @@ function createContextMenu(preferredLocale: Locale = LOCALES.DEFAULT): () => voi
});
}

let disposeContextMenu = createContextMenu();
let disposeContextMenu: (() => void) | undefined;

// Send all autoUpdater logs to a log file: ~/Library/Logs/new.expensify.desktop/main.log
// See https://www.npmjs.com/package/electron-log
Expand Down Expand Up @@ -128,11 +128,7 @@ let hasUpdate = false;
let downloadedVersion: string;
let isSilentUpdating = false;
let isUpdateInProgress = false;

// Note that we have to subscribe to this separately and cannot use translateLocal,
// because the only way code can be shared between the main and renderer processes at runtime is via the context bridge
// So we track preferredLocale separately via ELECTRON_EVENTS.LOCALE_UPDATED
const preferredLocale: Locale = CONST.LOCALES.DEFAULT;
let preferredLocale: Locale | undefined;

const appProtocol = CONST.DEEPLINK_BASE_URL.replace('://', '');

Expand Down Expand Up @@ -204,7 +200,7 @@ const manuallyCheckForUpdates = (menuItem?: MenuItem, browserWindow?: BaseWindow
.then((result) => {
const downloadPromise = result && 'downloadPromise' in result ? result.downloadPromise : undefined;

if (!browserWindow) {
if (!browserWindow || !preferredLocale) {
return;
}

Expand Down Expand Up @@ -419,19 +415,16 @@ const mainWindow = (): Promise<void> => {
const initialMenuTemplate: MenuItemConstructorOptions[] = [
{
id: 'mainMenu',
label: translate(preferredLocale, `desktopApplicationMenu.mainMenu`),
submenu: [
{id: 'about', role: 'about'},
{
id: 'update',
label: translate(preferredLocale, `desktopApplicationMenu.update`),
click: () => verifyAndInstallLatestVersion(browserWindow),
visible: false,
},
{id: 'checkForUpdates', label: translate(preferredLocale, `desktopApplicationMenu.checkForUpdates`), click: manuallyCheckForUpdates},
{id: 'checkForUpdates', click: manuallyCheckForUpdates},
{
id: 'viewShortcuts',
label: translate(preferredLocale, `desktopApplicationMenu.viewShortcuts`),
accelerator: 'CmdOrCtrl+J',
click: () => {
showKeyboardShortcutsPage(browserWindow);
Expand All @@ -449,12 +442,10 @@ const mainWindow = (): Promise<void> => {
},
{
id: 'fileMenu',
label: translate(preferredLocale, `desktopApplicationMenu.fileMenu`),
submenu: [{id: 'closeWindow', role: 'close', accelerator: 'Cmd+w'}],
},
{
id: 'editMenu',
label: translate(preferredLocale, `desktopApplicationMenu.editMenu`),
submenu: [
{id: 'undo', role: 'undo'},
{id: 'redo', role: 'redo'},
Expand All @@ -477,7 +468,6 @@ const mainWindow = (): Promise<void> => {
{type: 'separator'},
{
id: 'speechSubmenu',
label: translate(preferredLocale, `desktopApplicationMenu.speechSubmenu`),
submenu: [
{id: 'startSpeaking', role: 'startSpeaking'},
{id: 'stopSpeaking', role: 'stopSpeaking'},
Expand All @@ -487,7 +477,6 @@ const mainWindow = (): Promise<void> => {
},
{
id: 'viewMenu',
label: translate(preferredLocale, `desktopApplicationMenu.viewMenu`),
submenu: [
{id: 'reload', role: 'reload'},
{id: 'forceReload', role: 'forceReload'},
Expand All @@ -502,7 +491,6 @@ const mainWindow = (): Promise<void> => {
},
{
id: 'historyMenu',
label: translate(preferredLocale, `desktopApplicationMenu.historyMenu`),
submenu: [
{
id: 'back',
Expand Down Expand Up @@ -543,33 +531,28 @@ const mainWindow = (): Promise<void> => {
},
{
id: 'helpMenu',
label: translate(preferredLocale, `desktopApplicationMenu.helpMenu`),
role: 'help',
submenu: [
{
id: 'learnMore',
label: translate(preferredLocale, `desktopApplicationMenu.learnMore`),
click: () => {
shell.openExternal(CONST.MENU_HELP_URLS.LEARN_MORE);
},
},
{
id: 'documentation',
label: translate(preferredLocale, `desktopApplicationMenu.documentation`),
click: () => {
shell.openExternal(CONST.MENU_HELP_URLS.DOCUMENTATION);
},
},
{
id: 'communityDiscussions',
label: translate(preferredLocale, `desktopApplicationMenu.communityDiscussions`),
click: () => {
shell.openExternal(CONST.MENU_HELP_URLS.COMMUNITY_DISCUSSIONS);
},
},
{
id: 'searchIssues',
label: translate(preferredLocale, `desktopApplicationMenu.searchIssues`),
click: () => {
shell.openExternal(CONST.MENU_HELP_URLS.SEARCH_ISSUES);
},
Expand All @@ -578,10 +561,6 @@ const mainWindow = (): Promise<void> => {
},
];

// Build and set the initial menu
const initialMenu = Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, preferredLocale));
Menu.setApplicationMenu(initialMenu);

// When the user clicks a link that has target="_blank" (which is all external links)
// open the default browser instead of a new electron window
browserWindow.webContents.setWindowOpenHandler(({url}) => {
Expand Down Expand Up @@ -682,9 +661,13 @@ const mainWindow = (): Promise<void> => {
app.hide();
}

// Note that we have to subscribe to this separately since we cannot listen to Onyx.connect here,
// because the only way code can be shared between the main and renderer processes at runtime is via the context bridge
// So we track preferredLocale separately via ELECTRON_EVENTS.LOCALE_UPDATED
ipcMain.on(ELECTRON_EVENTS.LOCALE_UPDATED, (event, updatedLocale: Locale) => {
preferredLocale = updatedLocale;
Menu.setApplicationMenu(Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, updatedLocale)));
disposeContextMenu();
disposeContextMenu?.();
disposeContextMenu = createContextMenu(updatedLocale);
});

Expand Down
2 changes: 1 addition & 1 deletion src/libs/Localize/LocaleListener/BaseLocaleListener.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const connect: LocaleListenerConnect = (callbackAfterChange = () => {}) => {
Onyx.connect({
key: ONYXKEYS.NVP_PREFERRED_LOCALE,
callback: (val) => {
if (!val || val === preferredLocale) {
if (!val) {
return;
}

Expand Down