pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 18:49:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/translations-for-shortcuts' (#766) from fix/translations-for-shortcuts into release/v9.1.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/web-apps/pulls/766
This commit is contained in:
Oleg Korshul
2025-10-08 11:21:35 +00:00
parent df58d42105 ad607bd9e9
commit d70b5729db
17 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/common/main/lib/view/ShortcutsDialog.js
View File

@ -58,7 +58,7 @@ define([
'</div>',
'<div id="actions-list"></div>',
'<div id="action-description">',
'<b>Description: </b>',
'<b><%= scope.txtDescription %>: </b>',
'<span id="action-description-text"></span>',
'</div>'
].join(''))({scope: this}),
@ -130,7 +130,7 @@ define([
Common.NotificationCenter.on('shortcuts:update', _.bind(function() {
this._setDefaults();
this.shortcutEditDialog && this.shortcutEditDialog.renderShortcutsWarning();
this.shortcutsEditDialog && this.shortcutsEditDialog.renderShortcutsWarning();
}, this));
this._setDefaults();
},
@ -199,12 +199,12 @@ define([
const me = this;
this.shortcutEditDialog = new Common.Views.ShortcutEditDialog({
this.shortcutsEditDialog = new Common.Views.ShortcutsEditDialog({
action: record.get('action')
});
this.shortcutEditDialog.show();
this.shortcutEditDialog.on('close', function() {
me.shortcutEditDialog = null;
this.shortcutsEditDialog.show();
this.shortcutsEditDialog.on('close', function() {
me.shortcutsEditDialog = null;
me.actionsList.focus();
});
},
@ -246,6 +246,7 @@ define([
},
txtTitle: 'Keyboard Shortcuts',
txtDescription: 'Description',
txtEmpty: 'No matches found. Adjust your search.',
txtSearch: 'Search',
txtRestoreAll: 'Restore All to Defaults',

6
apps/common/main/lib/view/ShortcutEditDialog.js → apps/common/main/lib/view/ShortcutsEditDialog.js
View File

@ -30,7 +30,7 @@
*
*/
/**
* ShortcutEditDialog.js
* ShortcutsEditDialog.js
*
* Created on 23/06/25
*
@ -40,7 +40,7 @@ define([
'common/main/lib/view/AdvancedSettingsWindow',
], function () { 'use strict';
Common.Views.ShortcutEditDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
Common.Views.ShortcutsEditDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({
options: {
height: 'auto',
contentWidth: 268,
@ -462,5 +462,5 @@ define([
txtRestoreDescription: 'All shortcuts for action “%1” will be restored to deafult.',
txtRestoreContinue: 'Do you want to continue?'
}, Common.Views.ShortcutEditDialog || {}))
}, Common.Views.ShortcutsEditDialog || {}))
});

2
apps/documenteditor/main/app_dev.js
View File

@ -233,7 +233,7 @@ require([
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'documenteditor/main/app/controller/DocumentHolderExt',

2
apps/documenteditor/main/app_pack.js
View File

@ -34,7 +34,7 @@ require([
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'documenteditor/main/app/controller/DocumentHolderExt',

1
apps/documenteditor/main/locale/en.json
View File

@ -1184,6 +1184,7 @@
"Common.Views.ShortcutsDialog.txtRestoreToDefault": "Restore to default",
"Common.Views.ShortcutsDialog.txtSearch": "Search",
"Common.Views.ShortcutsDialog.txtTitle": "Keyboard Shortcuts",
"Common.Views.ShortcutsDialog.txtDescription": "Description",
"Common.Views.ShortcutsEditDialog.txtAction": "Action",
"Common.Views.ShortcutsEditDialog.txtInputPlaceholder": "Type desired shortcut",
"Common.Views.ShortcutsEditDialog.txtInputWarnMany": "The shortcut used by actions %1",

2
apps/pdfeditor/main/app_dev.js
View File

@ -216,7 +216,7 @@ require([
'common/main/lib/view/PasswordDialog',
'common/main/lib/component/TextareaField',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'pdfeditor/main/app/controller/DocumentHolderExt',
'pdfeditor/main/app/view/FileMenuPanels',

2
apps/pdfeditor/main/app_pack.js
View File

@ -26,7 +26,7 @@ require([
'common/main/lib/view/PasswordDialog',
'common/main/lib/component/TextareaField',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'pdfeditor/main/app/controller/DocumentHolderExt',
'pdfeditor/main/app/view/FileMenuPanels',

1
apps/pdfeditor/main/locale/en.json
View File

@ -888,6 +888,7 @@
"Common.Views.ShortcutsDialog.txtRestoreToDefault": "Restore to default",
"Common.Views.ShortcutsDialog.txtSearch": "Search",
"Common.Views.ShortcutsDialog.txtTitle": "Keyboard Shortcuts",
"Common.Views.ShortcutsDialog.txtDescription": "Description",
"Common.Views.ShortcutsEditDialog.txtAction": "Action",
"Common.Views.ShortcutsEditDialog.txtInputPlaceholder": "Type desired shortcut",
"Common.Views.ShortcutsEditDialog.txtInputWarnMany": "The shortcut used by actions %1",

2
apps/presentationeditor/main/app_dev.js
View File

@ -231,7 +231,7 @@ require([
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'common/main/lib/component/TextareaField',

2
apps/presentationeditor/main/app_pack.js
View File

@ -31,7 +31,7 @@ require([
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'common/main/lib/component/TextareaField',

1
apps/presentationeditor/main/locale/en.json
View File

@ -1246,6 +1246,7 @@
"Common.Views.ShortcutsDialog.txtRestoreToDefault": "Restore to default",
"Common.Views.ShortcutsDialog.txtSearch": "Search",
"Common.Views.ShortcutsDialog.txtTitle": "Keyboard Shortcuts",
"Common.Views.ShortcutsDialog.txtDescription": "Description",
"Common.Views.ShortcutsEditDialog.txtAction": "Action",
"Common.Views.ShortcutsEditDialog.txtInputPlaceholder": "Type desired shortcut",
"Common.Views.ShortcutsEditDialog.txtInputWarnMany": "The shortcut used by actions %1",

2
apps/spreadsheeteditor/main/app_dev.js
View File

@ -230,7 +230,7 @@ require([
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'spreadsheeteditor/main/app/controller/DocumentHolderExt',

2
apps/spreadsheeteditor/main/app_pack.js
View File

@ -30,7 +30,7 @@ require([
'common/main/lib/view/MacrosDialog',
'common/main/lib/view/MacrosAiDialog',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'common/main/lib/component/MonacoEditor',
'spreadsheeteditor/main/app/controller/DocumentHolderExt',

1
apps/spreadsheeteditor/main/locale/en.json
View File

@ -1201,6 +1201,7 @@
"Common.Views.ShortcutsDialog.txtRestoreToDefault": "Restore to default",
"Common.Views.ShortcutsDialog.txtSearch": "Search",
"Common.Views.ShortcutsDialog.txtTitle": "Keyboard Shortcuts",
"Common.Views.ShortcutsDialog.txtDescription": "Description",
"Common.Views.ShortcutsEditDialog.txtAction": "Action",
"Common.Views.ShortcutsEditDialog.txtInputPlaceholder": "Type desired shortcut",
"Common.Views.ShortcutsEditDialog.txtInputWarnMany": "The shortcut used by actions %1",

2
apps/visioeditor/main/app_dev.js
View File

@ -174,7 +174,7 @@ require([
'common/main/lib/view/DocumentHolderExt',
'common/main/lib/view/CustomizeQuickAccessDialog',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'visioeditor/main/app/view/FileMenuPanels',
'visioeditor/main/app/view/DocumentHolderExt'

2
apps/visioeditor/main/app_pack.js
View File

@ -13,7 +13,7 @@ require([
'common/main/lib/view/DocumentHolderExt',
'common/main/lib/view/CustomizeQuickAccessDialog',
'common/main/lib/view/ShortcutsDialog',
'common/main/lib/view/ShortcutEditDialog',
'common/main/lib/view/ShortcutsEditDialog',
'visioeditor/main/app/view/FileMenuPanels',
'visioeditor/main/app/view/DocumentHolderExt'

1
apps/visioeditor/main/locale/en.json
View File

@ -167,6 +167,7 @@
"Common.Views.ShortcutsDialog.txtRestoreToDefault": "Restore to default",
"Common.Views.ShortcutsDialog.txtSearch": "Search",
"Common.Views.ShortcutsDialog.txtTitle": "Keyboard Shortcuts",
"Common.Views.ShortcutsDialog.txtDescription": "Description",
"Common.Views.ShortcutsEditDialog.txtAction": "Action",
"Common.Views.ShortcutsEditDialog.txtInputPlaceholder": "Type desired shortcut",
"Common.Views.ShortcutsEditDialog.txtInputWarnMany": "The shortcut used by actions %1",