From df4acc4bb8d1b72d2db06da215c7ac1ad279840c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 12 Dec 2019 12:07:58 +0300 Subject: [PATCH] Merge with develop --- apps/common/locale.js | 12 +- apps/common/main/lib/component/CheckBox.js | 33 ++-- apps/common/main/lib/component/ComboBox.js | 2 + apps/common/main/lib/component/Menu.js | 2 +- .../main/lib/component/MetricSpinner.js | 10 +- apps/common/main/lib/component/RadioBox.js | 17 +- apps/common/main/lib/component/TabBar.js | 185 +----------------- apps/common/main/lib/component/Window.js | 3 + apps/common/main/lib/util/utils.js | 25 ++- apps/common/main/lib/view/LanguageDialog.js | 4 +- .../main/lib/view/ListSettingsDialog.js | 4 +- .../img/controls/common-controls@1.5x.png | Bin 0 -> 12309 bytes .../resources/img/controls/flags@1.5x.png | Bin 0 -> 9530 bytes .../dimension-highlighted@1.5x.png | Bin 0 -> 124 bytes .../dimension-unhighlighted@1.5x.png | Bin 0 -> 124 bytes .../hsbcolorpicker/hsb-colorpicker@1.5x.png | Bin 0 -> 27636 bytes .../img/right-panels/Begin-EndStyle@1.5x.png | Bin 0 -> 13504 bytes .../img/right-panels/gradients@1.5x.png | Bin 0 -> 5246 bytes .../img/right-panels/patterns@1.5x.png | Bin 0 -> 5424 bytes .../img/right-panels/rowscols_icon@1.5x.png | Bin 0 -> 577 bytes .../img/toolbar/1.5x/big/.css.handlebars | 5 +- .../img/toolbar/1.5x/big/btn-editheader.png | Bin 203 -> 157 bytes .../img/toolbar/1.5x/big/btn-insertchart.png | Bin 233 -> 164 bytes .../toolbar/1.5x/big/btn-insertequation.png | Bin 532 -> 610 bytes .../img/toolbar/1.5x/btn-border-bottom.png | Bin 121 -> 121 bytes .../img/toolbar/1.5x/btn-border-diagdown.png | Bin 193 -> 197 bytes .../img/toolbar/1.5x/btn-border-diagup.png | Bin 194 -> 195 bytes .../img/toolbar/1.5x/btn-border-inside.png | Bin 139 -> 139 bytes .../img/toolbar/1.5x/btn-border-insidehor.png | Bin 120 -> 120 bytes .../toolbar/1.5x/btn-border-insidevert.png | Bin 129 -> 129 bytes .../img/toolbar/1.5x/btn-border-left.png | Bin 134 -> 135 bytes .../img/toolbar/1.5x/btn-border-no.png | Bin 114 -> 114 bytes .../img/toolbar/1.5x/btn-border-out.png | Bin 136 -> 136 bytes .../img/toolbar/1.5x/btn-border-right.png | Bin 126 -> 126 bytes .../img/toolbar/1.5x/btn-border-top.png | Bin 119 -> 120 bytes .../resources/img/toolbar/1.5x/btn-close.png | Bin 0 -> 240 bytes .../img/toolbar/1.5x/btn-colorschemas.png | Bin 131 -> 136 bytes .../img/toolbar/1.5x/btn-firstitem.png | Bin 221 -> 213 bytes .../img/toolbar/1.5x/btn-lastitem.png | Bin 222 -> 209 bytes .../img/toolbar/1.5x/btn-nextitem.png | Bin 204 -> 202 bytes .../img/toolbar/1.5x/btn-previtem.png | Bin 209 -> 202 bytes .../img/toolbar/1.5x/btn-settings.png | Bin 602 -> 569 bytes .../img/toolbar/1x/big/btn-insertequation.png | Bin 403 -> 433 bytes .../img/toolbar/1x/big/btn-inserttable.png | Bin 172 -> 130 bytes .../img/toolbar/1x/btn-border-bottom.png | Bin 107 -> 107 bytes .../img/toolbar/1x/btn-border-diagdown.png | Bin 174 -> 174 bytes .../img/toolbar/1x/btn-border-diagup.png | Bin 174 -> 176 bytes .../img/toolbar/1x/btn-border-inside.png | Bin 123 -> 123 bytes .../img/toolbar/1x/btn-border-insidehor.png | Bin 108 -> 108 bytes .../img/toolbar/1x/btn-border-insidevert.png | Bin 115 -> 115 bytes .../img/toolbar/1x/btn-border-left.png | Bin 116 -> 116 bytes .../img/toolbar/1x/btn-border-no.png | Bin 99 -> 99 bytes .../img/toolbar/1x/btn-border-out.png | Bin 120 -> 121 bytes .../img/toolbar/1x/btn-border-right.png | Bin 111 -> 111 bytes .../img/toolbar/1x/btn-border-top.png | Bin 106 -> 106 bytes .../resources/img/toolbar/1x/btn-close.png | Bin 0 -> 243 bytes .../img/toolbar/1x/btn-colorschemas.png | Bin 115 -> 122 bytes .../img/toolbar/1x/btn-firstitem.png | Bin 183 -> 194 bytes .../resources/img/toolbar/1x/btn-lastitem.png | Bin 177 -> 190 bytes .../img/toolbar/1x/btn-menu-shape.png | Bin 298 -> 276 bytes .../resources/img/toolbar/1x/btn-nextitem.png | Bin 167 -> 182 bytes .../resources/img/toolbar/1x/btn-previtem.png | Bin 171 -> 184 bytes .../resources/img/toolbar/1x/btn-settings.png | Bin 451 -> 425 bytes .../img/toolbar/2x/big/btn-insertequation.png | Bin 805 -> 847 bytes .../img/toolbar/2x/btn-border-bottom.png | Bin 135 -> 135 bytes .../img/toolbar/2x/btn-border-diagdown.png | Bin 266 -> 264 bytes .../img/toolbar/2x/btn-border-diagup.png | Bin 266 -> 266 bytes .../img/toolbar/2x/btn-border-inside.png | Bin 165 -> 165 bytes .../img/toolbar/2x/btn-border-insidehor.png | Bin 134 -> 135 bytes .../img/toolbar/2x/btn-border-insidevert.png | Bin 158 -> 158 bytes .../img/toolbar/2x/btn-border-left.png | Bin 155 -> 155 bytes .../img/toolbar/2x/btn-border-no.png | Bin 130 -> 132 bytes .../img/toolbar/2x/btn-border-out.png | Bin 153 -> 153 bytes .../img/toolbar/2x/btn-border-right.png | Bin 152 -> 152 bytes .../img/toolbar/2x/btn-border-top.png | Bin 137 -> 138 bytes .../resources/img/toolbar/2x/btn-close.png | Bin 0 -> 324 bytes .../img/toolbar/2x/btn-colorschemas.png | Bin 140 -> 144 bytes .../img/toolbar/2x/btn-firstitem.png | Bin 283 -> 278 bytes .../resources/img/toolbar/2x/btn-lastitem.png | Bin 278 -> 271 bytes .../img/toolbar/2x/btn-menu-shape.png | Bin 540 -> 997 bytes .../resources/img/toolbar/2x/btn-nextitem.png | Bin 267 -> 266 bytes .../resources/img/toolbar/2x/btn-previtem.png | Bin 269 -> 269 bytes .../resources/img/toolbar/2x/btn-settings.png | Bin 883 -> 862 bytes .../resources/img/toolbar/charttypes@1.5x.png | Bin 0 -> 15189 bytes .../main/resources/less/asc-mixins.less | 30 +-- apps/common/main/resources/less/buttons.less | 6 +- apps/common/main/resources/less/checkbox.less | 41 ++-- .../main/resources/less/colorpalette.less | 12 +- apps/common/main/resources/less/combobox.less | 23 ++- .../main/resources/less/dimension-picker.less | 6 +- .../resources/less/extended-color-picker.less | 5 +- apps/common/main/resources/less/radiobox.less | 39 ++-- .../resources/less/theme-colorpalette.less | 2 - .../main/app/controller/Main.js | 6 +- .../main/app/view/ControlSettingsDialog.js | 7 +- .../main/app/view/DocumentHolder.js | 21 +- .../main/app/view/EditListItemDialog.js | 2 + .../main/app/view/FileMenuPanels.js | 4 +- .../documenteditor/main/app/view/Statusbar.js | 2 +- apps/documenteditor/main/locale/en.json | 2 + apps/documenteditor/main/locale/ru.json | 1 + .../img/toolbar/1.5x/big/btn-blankpage.png | Bin 186 -> 205 bytes .../img/toolbar/1.5x/big/btn-bookmarks.png | Bin 280 -> 344 bytes .../img/toolbar/1.5x/big/btn-caption.png | Bin 286 -> 325 bytes .../img/toolbar/1.5x/big/btn-columns.png | Bin 116 -> 119 bytes .../toolbar/1.5x/big/btn-contents-update.png | Bin 391 -> 557 bytes .../img/toolbar/1.5x/big/btn-contents.png | Bin 121 -> 127 bytes .../img/toolbar/1.5x/big/btn-controls.png | Bin 203 -> 229 bytes .../img/toolbar/1.5x/big/btn-dropcap.png | Bin 261 -> 332 bytes .../img/toolbar/1.5x/big/btn-ic-review.png | Bin 275 -> 347 bytes .../toolbar/1.5x/big/btn-ic-reviewview.png | Bin 325 -> 431 bytes .../img/toolbar/1.5x/big/btn-img-wrap.png | Bin 339 -> 460 bytes .../img/toolbar/1.5x/big/btn-notes.png | Bin 383 -> 525 bytes .../img/toolbar/1.5x/big/btn-pagebreak.png | Bin 158 -> 165 bytes .../img/toolbar/1.5x/big/btn-review-deny.png | Bin 281 -> 363 bytes .../img/toolbar/1.5x/big/btn-review-next.png | Bin 244 -> 291 bytes .../img/toolbar/1.5x/big/btn-review-prev.png | Bin 251 -> 303 bytes .../img/toolbar/1.5x/big/btn-review-save.png | Bin 349 -> 481 bytes .../img/toolbar/1.5x/big/btn-watermark.png | Bin 386 -> 487 bytes .../img/toolbar/1x/big/btn-notes.png | Bin 413 -> 401 bytes .../img/toolbar/2x/big/btn-blankpage.png | Bin 245 -> 291 bytes .../img/toolbar/2x/big/btn-bookmarks.png | Bin 372 -> 455 bytes .../img/toolbar/2x/big/btn-caption.png | Bin 394 -> 520 bytes .../img/toolbar/2x/big/btn-columns.png | Bin 116 -> 129 bytes .../toolbar/2x/big/btn-contents-update.png | Bin 525 -> 800 bytes .../img/toolbar/2x/big/btn-contents.png | Bin 121 -> 136 bytes .../img/toolbar/2x/big/btn-controls.png | Bin 248 -> 316 bytes .../img/toolbar/2x/big/btn-dropcap.png | Bin 291 -> 380 bytes .../img/toolbar/2x/big/btn-ic-review.png | Bin 356 -> 486 bytes .../img/toolbar/2x/big/btn-ic-reviewview.png | Bin 453 -> 655 bytes .../img/toolbar/2x/big/btn-img-wrap.png | Bin 465 -> 670 bytes .../img/toolbar/2x/big/btn-notes.png | Bin 519 -> 769 bytes .../img/toolbar/2x/big/btn-pagebreak.png | Bin 208 -> 227 bytes .../img/toolbar/2x/big/btn-review-deny.png | Bin 327 -> 466 bytes .../img/toolbar/2x/big/btn-review-next.png | Bin 285 -> 329 bytes .../img/toolbar/2x/big/btn-review-prev.png | Bin 274 -> 333 bytes .../img/toolbar/2x/big/btn-review-save.png | Bin 434 -> 598 bytes .../img/toolbar/2x/big/btn-watermark.png | Bin 535 -> 713 bytes .../main/resources/img/toolbar/AutoColor.png | Bin 90 -> 0 bytes .../main/resources/img/toolbar/nocolor.png | Bin 108 -> 0 bytes .../mobile/app/controller/Settings.js | 8 +- .../main/app/template/LeftMenu.template | 2 +- .../main/app/view/DocumentHolder.js | 4 +- .../main/app/view/DocumentPreview.js | 31 +-- .../main/app/view/FileMenuPanels.js | 4 +- .../app/view/ParagraphSettingsAdvanced.js | 10 +- .../main/app/view/Statusbar.js | 2 +- .../main/app/view/Toolbar.js | 2 +- .../img/toolbar/1.5x/btn-presenter-view.png | Bin 0 -> 196 bytes .../1.5x/btn-preview-exit-fullscreen.png | Bin 0 -> 138 bytes .../toolbar/1.5x/btn-preview-fullscreen.png | Bin 0 -> 137 bytes .../img/toolbar/1.5x/btn-preview-pause.png | Bin 0 -> 105 bytes .../img/toolbar/1.5x/btn-preview-play.png | Bin 0 -> 251 bytes .../img/toolbar/1x/btn-presenter-view.png | Bin 0 -> 168 bytes .../1x/btn-preview-exit-fullscreen.png | Bin 0 -> 127 bytes .../img/toolbar/1x/btn-preview-fullscreen.png | Bin 0 -> 124 bytes .../img/toolbar/1x/btn-preview-pause.png | Bin 0 -> 99 bytes .../img/toolbar/1x/btn-preview-play.png | Bin 0 -> 214 bytes .../img/toolbar/2x/btn-presenter-view.png | Bin 0 -> 236 bytes .../2x/btn-preview-exit-fullscreen.png | Bin 0 -> 150 bytes .../img/toolbar/2x/btn-preview-fullscreen.png | Bin 0 -> 148 bytes .../img/toolbar/2x/btn-preview-pause.png | Bin 0 -> 114 bytes .../img/toolbar/2x/btn-preview-play.png | Bin 0 -> 328 bytes .../main/resources/less/document-preview.less | 36 ---- .../mobile/app/controller/Settings.js | 8 +- .../main/app/controller/DocumentHolder.js | 4 +- .../main/app/controller/LeftMenu.js | 13 +- .../main/app/controller/Main.js | 28 ++- .../main/app/template/SortDialog.template | 4 +- .../main/app/view/AutoFilterDialog.js | 32 +-- .../main/app/view/FileMenuPanels.js | 113 ++++++++++- .../main/app/view/NameManagerDlg.js | 2 +- .../app/view/ParagraphSettingsAdvanced.js | 10 +- .../main/app/view/SortDialog.js | 115 ++++++++--- .../main/app/view/Toolbar.js | 2 +- apps/spreadsheeteditor/main/locale/en.json | 22 +-- .../img/toolbar/1.5x/big/btn-datetime.png | Bin 562 -> 537 bytes .../img/toolbar/1.5x/btn-clear-filter.png | Bin 251 -> 252 bytes .../resources/img/toolbar/1.5x/btn-merge.png | Bin 120 -> 198 bytes .../img/toolbar/1.5x/btn-named-range.png | Bin 293 -> 151 bytes .../img/toolbar/1x/btn-clear-filter.png | Bin 207 -> 205 bytes .../resources/img/toolbar/1x/btn-merge.png | Bin 112 -> 184 bytes .../img/toolbar/1x/btn-named-range.png | Bin 229 -> 140 bytes .../img/toolbar/2x/btn-clear-filter.png | Bin 312 -> 315 bytes .../resources/img/toolbar/2x/btn-function.png | Bin 2234 -> 654 bytes .../resources/img/toolbar/2x/btn-merge.png | Bin 133 -> 265 bytes .../img/toolbar/2x/btn-named-range.png | Bin 416 -> 164 bytes .../resources/less/advanced-settings.less | 14 +- .../main/resources/less/statusbar.less | 4 +- .../mobile/app/controller/Settings.js | 8 +- 190 files changed, 502 insertions(+), 487 deletions(-) create mode 100644 apps/common/main/resources/img/controls/common-controls@1.5x.png create mode 100644 apps/common/main/resources/img/controls/flags@1.5x.png create mode 100644 apps/common/main/resources/img/dimension-picker/dimension-highlighted@1.5x.png create mode 100644 apps/common/main/resources/img/dimension-picker/dimension-unhighlighted@1.5x.png create mode 100644 apps/common/main/resources/img/hsbcolorpicker/hsb-colorpicker@1.5x.png create mode 100644 apps/common/main/resources/img/right-panels/Begin-EndStyle@1.5x.png create mode 100644 apps/common/main/resources/img/right-panels/gradients@1.5x.png create mode 100644 apps/common/main/resources/img/right-panels/patterns@1.5x.png create mode 100644 apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png create mode 100644 apps/common/main/resources/img/toolbar/1.5x/btn-close.png create mode 100644 apps/common/main/resources/img/toolbar/1x/btn-close.png create mode 100644 apps/common/main/resources/img/toolbar/2x/btn-close.png create mode 100644 apps/common/main/resources/img/toolbar/charttypes@1.5x.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/AutoColor.png delete mode 100644 apps/documenteditor/main/resources/img/toolbar/nocolor.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-presenter-view.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-exit-fullscreen.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-fullscreen.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-pause.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1.5x/btn-preview-play.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-presenter-view.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-exit-fullscreen.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-fullscreen.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-pause.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview-play.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/btn-presenter-view.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-exit-fullscreen.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-fullscreen.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-pause.png create mode 100644 apps/presentationeditor/main/resources/img/toolbar/2x/btn-preview-play.png diff --git a/apps/common/locale.js b/apps/common/locale.js index 9cf5cbf969..d954165fc8 100644 --- a/apps/common/locale.js +++ b/apps/common/locale.js @@ -38,7 +38,8 @@ Common.Locale = new(function() { "use strict"; var l10n = null; var loadcallback, - apply = false; + apply = false, + currentLang = 'en'; var _applyLocalization = function(callback) { try { @@ -78,6 +79,10 @@ Common.Locale = new(function() { return res || (scope ? eval(scope.name).prototype[prop] : ''); }; + var _getCurrentLanguage = function() { + return (currentLang || 'en'); + }; + var _getUrlParameterByName = function(name) { name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]"); var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"), @@ -87,9 +92,11 @@ Common.Locale = new(function() { var _requireLang = function () { var lang = (_getUrlParameterByName('lang') || 'en').split(/[\-_]/)[0]; + currentLang = lang; fetch('locale/' + lang + '.json') .then(function(response) { if (!response.ok) { + currentLang = 'en'; if (lang != 'en') /* load default lang if fetch failed */ return fetch('locale/en.json'); @@ -130,7 +137,8 @@ Common.Locale = new(function() { return { apply: _applyLocalization, - get: _get + get: _get, + getCurrentLanguage: _getCurrentLanguage }; })(); diff --git a/apps/common/main/lib/component/CheckBox.js b/apps/common/main/lib/component/CheckBox.js index 019c1013f9..c42f26253e 100644 --- a/apps/common/main/lib/component/CheckBox.js +++ b/apps/common/main/lib/component/CheckBox.js @@ -94,7 +94,8 @@ define([ checked : false, value : 'unchecked', - template : _.template(''), + template : _.template('