Merge pull request #3133 from ONLYOFFICE/fix/bugfix

Remove margin preset
ONLYOFFICE · Aug 17, 2024 · 5132ab5 · 5132ab5
2 parents 6a36261 + 9c69250
commit 5132ab5
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 15 deletions.
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -2793,7 +2793,6 @@ define([
                 cls: 'input-group-nr',
                 data: [
                     { value: 0, displayValue: this.textMarginsNormal, size: [20, 30, 20, 15]},
-                    { value: 1, displayValue: this.textMarginsUsNormal, size: [25.4, 25.4, 25.4, 25.4]},
                     { value: 2, displayValue: this.textMarginsNarrow, size: [12.7, 12.7, 12.7, 12.7]},
                     { value: 3, displayValue: this.textMarginsModerate, size: [25.4, 19.1, 25.4, 19.1]},
                     { value: 4, displayValue: this.textMarginsWide, size: [25.4, 50.8, 25.4, 50.8]},
@@ -2982,7 +2981,6 @@ define([
         txtPages: 'Pages',
         textMarginsLast: 'Last Custom',
         textMarginsNormal: 'Normal',
-        textMarginsUsNormal: 'US Normal',
         textMarginsNarrow: 'Narrow',
         textMarginsModerate: 'Moderate',
         textMarginsWide: 'Wide',

diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js
@@ -1213,13 +1213,6 @@ define([
                                     toggleGroup: 'menuPageMargins',
                                     value: [20, 30, 20, 15]
                                 },
-                                {
-                                    caption: this.textMarginsUsNormal,
-                                    checkable: true,
-                                    template: pageMarginsTemplate,
-                                    toggleGroup: 'menuPageMargins',
-                                    value: [25.4, 25.4, 25.4, 25.4]
-                                },
                                 {
                                     caption: this.textMarginsNarrow,
                                     checkable: true,
@@ -3540,7 +3533,6 @@ define([
             tipPageMargins: 'Page Margins',
             textMarginsLast: 'Last Custom',
             textMarginsNormal: 'Normal',
-            textMarginsUsNormal: 'US Normal',
             textMarginsNarrow: 'Narrow',
             textMarginsModerate: 'Moderate',
             textMarginsWide: 'Wide',

diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
@@ -2890,7 +2890,7 @@
   "DE.Views.PrintWithPreview.textMarginsModerate": "Moderate",
   "DE.Views.PrintWithPreview.textMarginsNarrow": "Narrow",
   "DE.Views.PrintWithPreview.textMarginsNormal": "Normal",
-  "DE.Views.PrintWithPreview.textMarginsUsNormal": "US Normal",
+  "del_DE.Views.PrintWithPreview.textMarginsUsNormal": "US Normal",
   "DE.Views.PrintWithPreview.textMarginsWide": "Wide",
   "DE.Views.PrintWithPreview.txtAllPages": "All pages",
   "DE.Views.PrintWithPreview.txtBothSides": "Print on both sides",
@@ -3416,7 +3416,7 @@
   "DE.Views.Toolbar.textMarginsModerate": "Moderate",
   "DE.Views.Toolbar.textMarginsNarrow": "Narrow",
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
-  "DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
+  "del_DE.Views.Toolbar.textMarginsUsNormal": "US Normal",
   "DE.Views.Toolbar.textMarginsWide": "Wide",
   "DE.Views.Toolbar.textMoreSymbols": "More symbols",
   "DE.Views.Toolbar.textNewColor": "More colors",

diff --git a/apps/pdfeditor/main/app/view/FileMenuPanels.js b/apps/pdfeditor/main/app/view/FileMenuPanels.js
@@ -2539,7 +2539,6 @@ define([
                 cls: 'input-group-nr',
                 data: [
                     { value: 0, displayValue: this.textMarginsNormal, size: [20, 30, 20, 15]},
-                    { value: 1, displayValue: this.textMarginsUsNormal, size: [25.4, 25.4, 25.4, 25.4]},
                     { value: 2, displayValue: this.textMarginsNarrow, size: [12.7, 12.7, 12.7, 12.7]},
                     { value: 3, displayValue: this.textMarginsModerate, size: [25.4, 19.1, 25.4, 19.1]},
                     { value: 4, displayValue: this.textMarginsWide, size: [25.4, 50.8, 25.4, 50.8]},
@@ -2728,7 +2727,6 @@ define([
         txtPages: 'Pages',
         textMarginsLast: 'Last Custom',
         textMarginsNormal: 'Normal',
-        textMarginsUsNormal: 'US Normal',
         textMarginsNarrow: 'Narrow',
         textMarginsModerate: 'Moderate',
         textMarginsWide: 'Wide',

diff --git a/apps/pdfeditor/main/locale/en.json b/apps/pdfeditor/main/locale/en.json
@@ -1558,7 +1558,7 @@
   "PDFE.Views.PrintWithPreview.textMarginsModerate": "Moderate",
   "PDFE.Views.PrintWithPreview.textMarginsNarrow": "Narrow",
   "PDFE.Views.PrintWithPreview.textMarginsNormal": "Normal",
-  "PDFE.Views.PrintWithPreview.textMarginsUsNormal": "US Normal",
+  "del_PDFE.Views.PrintWithPreview.textMarginsUsNormal": "US Normal",
   "PDFE.Views.PrintWithPreview.textMarginsWide": "Wide",
   "PDFE.Views.PrintWithPreview.txtAllPages": "All pages",
   "PDFE.Views.PrintWithPreview.txtBothSides": "Print on both sides",