pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 09:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/bugfix' (#482) from fix/bugfix into release/v9.0.0

Browse Source
This commit is contained in:
Julia Radzhabova
2025-06-04 15:20:41 +00:00
parent 212faad0f2 2d0e5fb5f2
commit fcdf77fc1e
10 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/forms/lib/view/modals.js
View File

@ -35,8 +35,7 @@
define([
'common/main/lib/component/Window',
'common/main/lib/component/MetricSpinner',
'common/main/lib/component/TextareaField'
'common/main/lib/component/MetricSpinner'
], function () { 'use strict';
Common.Views.EmbedDialog = Common.UI.Window.extend(_.extend({

4
apps/common/main/lib/controller/Themes.js
View File

@ -169,7 +169,7 @@ define([
},
},
'theme-white': {
text: locale.txtThemeModerLight || 'White',
text: locale.txtThemeModernLight || 'White',
type: 'light',
source: 'static',
icons: {
@ -177,7 +177,7 @@ define([
}
},
'theme-night': {
text: locale.txtThemeModerDark || 'Night',
text: locale.txtThemeModernDark || 'Night',
type: 'dark',
source: 'static',
icons: {

5
apps/documenteditor/forms/app_dev.js
View File

@ -145,13 +145,12 @@ require([
'common/forms/lib/view/modals'
], function() {
app.postLaunchScripts = [
'common/main/lib/component/TextareaField',
'common/main/lib/view/PluginDlg',
'common/main/lib/view/CopyWarningDialog',
'common/main/lib/view/TextInputDialog',
'common/main/lib/view/SelectFileDlg',
'common/main/lib/view/SaveAsDlg',
'common/main/lib/view/SignDialog',
'common/main/lib/view/SignSettingsDialog',
'common/main/lib/view/SaveAsDlg'
];
window.compareVersions = true;

5
apps/documenteditor/forms/app_pack.js
View File

@ -1,11 +1,10 @@
require([
'common/main/lib/component/TextareaField',
'common/main/lib/view/PluginDlg',
'common/main/lib/view/CopyWarningDialog',
'common/main/lib/view/TextInputDialog',
'common/main/lib/view/SelectFileDlg',
'common/main/lib/view/SaveAsDlg',
'common/main/lib/view/SignDialog',
'common/main/lib/view/SignSettingsDialog',
'common/main/lib/view/SaveAsDlg'
], function () {
Common.NotificationCenter.trigger('app-pack:loaded');
});

2
apps/documenteditor/forms/locale/en.json
View File

@ -44,6 +44,8 @@
"Common.UI.Themes.txtThemeGray": "Gray",
"Common.UI.Themes.txtThemeLight": "Light",
"Common.UI.Themes.txtThemeSystem": "Same as system",
"Common.UI.Themes.txtThemeModernLight": "Modern Light",
"Common.UI.Themes.txtThemeModernDark": "Modern Dark",
"Common.UI.Window.cancelButtonText": "Cancel",
"Common.UI.Window.closeButtonText": "Close",
"Common.UI.Window.noButtonText": "No",

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

@ -379,8 +379,8 @@
"Common.UI.Themes.txtThemeGray": "Gray",
"Common.UI.Themes.txtThemeLight": "Light",
"Common.UI.Themes.txtThemeSystem": "Same as system",
"Common.UI.Themes.txtThemeModerLight": "Moder Light",
"Common.UI.Themes.txtThemeModerDark": "Moder Dark",
"Common.UI.Themes.txtThemeModernLight": "Modern Light",
"Common.UI.Themes.txtThemeModernDark": "Modern Dark",
"Common.UI.Window.cancelButtonText": "Cancel",
"Common.UI.Window.closeButtonText": "Close",
"Common.UI.Window.noButtonText": "No",

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

@ -90,6 +90,8 @@
"Common.UI.Themes.txtThemeGray": "Gray",
"Common.UI.Themes.txtThemeLight": "Light",
"Common.UI.Themes.txtThemeSystem": "Same as system",
"Common.UI.Themes.txtThemeModernLight": "Modern Light",
"Common.UI.Themes.txtThemeModernDark": "Modern Dark",
"Common.UI.Window.cancelButtonText": "Cancel",
"Common.UI.Window.closeButtonText": "Close",
"Common.UI.Window.noButtonText": "No",

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

@ -469,6 +469,8 @@
"Common.UI.Themes.txtThemeGray": "Gray",
"Common.UI.Themes.txtThemeLight": "Light",
"Common.UI.Themes.txtThemeSystem": "Same as system",
"Common.UI.Themes.txtThemeModernLight": "Modern Light",
"Common.UI.Themes.txtThemeModernDark": "Modern Dark",
"Common.UI.Window.cancelButtonText": "Cancel",
"Common.UI.Window.closeButtonText": "Close",
"Common.UI.Window.noButtonText": "No",

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

@ -319,6 +319,8 @@
"Common.UI.Themes.txtThemeGray": "Gray",
"Common.UI.Themes.txtThemeLight": "Light",
"Common.UI.Themes.txtThemeSystem": "Same as system",
"Common.UI.Themes.txtThemeModernLight": "Modern Light",
"Common.UI.Themes.txtThemeModernDark": "Modern Dark",
"Common.UI.Window.cancelButtonText": "Cancel",
"Common.UI.Window.closeButtonText": "Close",
"Common.UI.Window.noButtonText": "No",

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

@ -40,6 +40,8 @@
"Common.UI.Themes.txtThemeGray": "Gray",
"Common.UI.Themes.txtThemeLight": "Light",
"Common.UI.Themes.txtThemeSystem": "Same as system",
"Common.UI.Themes.txtThemeModernLight": "Modern Light",
"Common.UI.Themes.txtThemeModernDark": "Modern Dark",
"Common.UI.Window.cancelButtonText": "Cancel",
"Common.UI.Window.closeButtonText": "Close",
"Common.UI.Window.noButtonText": "No",