fix #1273: untranslated menu items

This commit is contained in:
antelle 2019-10-05 08:37:10 +02:00
parent 39aaac2d1b
commit dcce37d99e
4 changed files with 12 additions and 6 deletions

View File

@ -176,7 +176,10 @@ const Launcher = {
return this.electron().clipboard.clear();
},
minimizeApp() {
this.remoteApp().minimizeApp();
this.remoteApp().minimizeApp({
restore: Locale.menuRestoreApp.replace('{}', 'KeeWeb'),
quit: Locale.menuQuitApp.replace('{}', 'KeeWeb')
});
},
canMinimize() {
return process.platform !== 'darwin';

View File

@ -72,6 +72,8 @@
"menuEmptyTrashAlert": "Empty Trash?",
"menuEmptyTrashAlertBody": "You will not be able to put items back",
"menuItemCollapsed": "Double-click to expand",
"menuRestoreApp": "Open {}",
"menuQuitApp": "Quit {}",
"alertYes": "Yes",
"alertNo": "No",
@ -415,7 +417,7 @@
"setGenNoClear": "Don't clear",
"setGenClearSeconds": "In {} seconds",
"setGenClearMinute": "In a minute",
"setGenMinInstead": "Minimize app instead of close",
"setGenMinInstead": "Minimize the app instead of close",
"setGenLock": "Auto lock",
"setGenLockMinimize": "When the app is minimized",
"setGenLockCopy": "On password copy",

View File

@ -102,7 +102,7 @@ app.restartApp = function() {
app.openWindow = function(opts) {
return new electron.BrowserWindow(opts);
};
app.minimizeApp = function() {
app.minimizeApp = function(menuItemLabels) {
let imagePath;
mainWindow.hide();
if (process.platform === 'darwin') {
@ -117,8 +117,8 @@ app.minimizeApp = function() {
appIcon = new electron.Tray(image);
appIcon.on('click', restoreMainWindow);
const contextMenu = electron.Menu.buildFromTemplate([
{ label: 'Open KeeWeb', click: restoreMainWindow },
{ label: 'Quit KeeWeb', click: closeMainWindow }
{ label: menuItemLabels.restore, click: restoreMainWindow },
{ label: menuItemLabels.quit, click: closeMainWindow }
]);
appIcon.setContextMenu(contextMenu);
appIcon.setToolTip('KeeWeb');

View File

@ -1,7 +1,8 @@
Release notes
-------------
##### v1.12.0 (TBD)
`-` #1022: fuzzy search
`-` #1022: fuzzy search
`-` fix #1273: untranslated menu items
##### v1.11.6 (2019-10-04)
`-` fix #1285: issues in moving entries across files