Commit 9e9e738d authored by Alexander Yuzhin's avatar Alexander Yuzhin Committed by Maxim Kadushkin

[DE mobile] Localization EditText, ThemeColorPalette.

parent 932d5b3d
...@@ -204,6 +204,6 @@ define([ ...@@ -204,6 +204,6 @@ define([
}, },
textThemeColors: 'Theme Colors', textThemeColors: 'Theme Colors',
textStandartColors: 'Standart Colors' textStandartColors: 'Standard Colors'
}, Common.UI.ThemeColorPalette || {})); }, Common.UI.ThemeColorPalette || {}));
}); });
\ No newline at end of file
...@@ -46,7 +46,7 @@ define([ ...@@ -46,7 +46,7 @@ define([
], function (core) { ], function (core) {
'use strict'; 'use strict';
DE.Controllers.EditText = Backbone.Controller.extend((function() { DE.Controllers.EditText = Backbone.Controller.extend(_.extend((function() {
var _fontsArray = [], var _fontsArray = [],
_stack = [], _stack = [],
_paragraphObject = undefined, _paragraphObject = undefined,
...@@ -491,7 +491,7 @@ define([ ...@@ -491,7 +491,7 @@ define([
}, },
onApiChangeFont: function(font) { onApiChangeFont: function(font) {
var name = (_.isFunction(font.get_Name) ? font.get_Name() : font.asc_getName()) || 'Fonts'; var name = (_.isFunction(font.get_Name) ? font.get_Name() : font.asc_getName()) || this.textFonts;
_fontInfo.name = name; _fontInfo.name = name;
$('#font-fonts .item-title').html(name); $('#font-fonts .item-title').html(name);
...@@ -501,7 +501,7 @@ define([ ...@@ -501,7 +501,7 @@ define([
_fontInfo.size = size; _fontInfo.size = size;
var displaySize = _fontInfo.size; var displaySize = _fontInfo.size;
_.isUndefined(displaySize) ? displaySize = 'Auto' : displaySize = displaySize + ' ' + 'pt'; _.isUndefined(displaySize) ? displaySize = this.textAuto : displaySize = displaySize + ' ' + this.textPt;
$('#font-fonts .item-after span:first-child').html(displaySize); $('#font-fonts .item-after span:first-child').html(displaySize);
$('#font-size .item-after label').html(displaySize); $('#font-size .item-after label').html(displaySize);
...@@ -592,7 +592,11 @@ define([ ...@@ -592,7 +592,11 @@ define([
// Helpers // Helpers
_toggleButton: function (e) { _toggleButton: function (e) {
return $(e.currentTarget).toggleClass('active').hasClass('active'); return $(e.currentTarget).toggleClass('active').hasClass('active');
} },
textFonts: 'Fonts',
textAuto: 'Auto',
textPt: 'pt'
} }
})()); })(), DE.Controllers.EditText || {}))
}); });
\ No newline at end of file
...@@ -49,7 +49,7 @@ define([ ...@@ -49,7 +49,7 @@ define([
], function (editTemplate, $, _, Backbone) { ], function (editTemplate, $, _, Backbone) {
'use strict'; 'use strict';
DE.Views.EditText = Backbone.View.extend((function() { DE.Views.EditText = Backbone.View.extend(_.extend((function() {
// private // private
var _fontsList, var _fontsList,
_editTextController; _editTextController;
...@@ -116,6 +116,7 @@ define([ ...@@ -116,6 +116,7 @@ define([
this.layout = $('<div/>').append(this.template({ this.layout = $('<div/>').append(this.template({
android : Common.SharedSettings.get('android'), android : Common.SharedSettings.get('android'),
phone : Common.SharedSettings.get('phone'), phone : Common.SharedSettings.get('phone'),
scope : this,
bullets : _bullets, bullets : _bullets,
numbers : _numbers numbers : _numbers
})); }));
...@@ -225,8 +226,29 @@ define([ ...@@ -225,8 +226,29 @@ define([
showNumbers: function () { showNumbers: function () {
this.showPage('#edit-text-numbers'); this.showPage('#edit-text-numbers');
} },
textFonts: 'Fonts',
textFontColor: 'Font Color',
textHighlightColor: 'Highlight Color',
textAdditionalFormat: 'Additional Formatting',
textBack: 'Back',
textSize: 'Size',
textFontColors: 'Font Colors',
textAutomatic: 'Automatic',
textHighlightColors: 'Highlight Colors',
textAdditional: 'Additional',
textStrikethrough: 'Strikethrough',
textDblStrikethrough: 'Double Strikethrough',
textDblSuperscript: 'Superscript',
textSubscript: 'Subscript',
textSmallCaps: 'Small Caps',
textAllCaps: 'All Caps',
textLetterSpacing: 'Letter Spacing',
textLineSpacing: 'Line Spacing',
textBullets: 'Bullets',
textNone: 'None',
textNumbers: 'Numbers'
} }
})()); })(), DE.Views.EditText || {}))
}); });
\ No newline at end of file
{ {
"Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors",
"Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors",
"DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.",
"DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.defaultTitleText": "ONLYOFFICE Document Editor",
"DE.Controllers.Main.criticalErrorTitle": "Error", "DE.Controllers.Main.criticalErrorTitle": "Error",
...@@ -319,5 +322,30 @@ ...@@ -319,5 +322,30 @@
"DE.Views.EditTabletextBandedRow": "Banded Row", "DE.Views.EditTabletextBandedRow": "Banded Row",
"DE.Views.EditTabletextFirstColumn": "First Column", "DE.Views.EditTabletextFirstColumn": "First Column",
"DE.Views.EditTabletextLastColumn": "Last Column", "DE.Views.EditTabletextLastColumn": "Last Column",
"DE.Views.EditTabletextBandedColumn": "Banded Column" "DE.Views.EditTabletextBandedColumn": "Banded Column",
"DE.Controllers.EditText.textFonts": "Fonts",
"DE.Controllers.EditText.textAuto": "Auto",
"DE.Controllers.EditText.textPt": "pt",
"DE.Views.EditText.textFonts": "Fonts",
"DE.Views.EditText.textFontColor": "Font Color",
"DE.Views.EditText.textHighlightColor": "Highlight Color",
"DE.Views.EditText.textAdditionalFormat": "Additional Formatting",
"DE.Views.EditText.textBack": "Back",
"DE.Views.EditText.textSize": "Size",
"DE.Views.EditText.textFontColors": "Font Colors",
"DE.Views.EditText.textAutomatic": "Automatic",
"DE.Views.EditText.textHighlightColors": "Highlight Colors",
"DE.Views.EditText.textAdditional": "Additional",
"DE.Views.EditText.textStrikethrough": "Strikethrough",
"DE.Views.EditText.textDblStrikethrough": "Double Strikethrough",
"DE.Views.EditText.textDblSuperscript": "Superscript",
"DE.Views.EditText.textSubscript": "Subscript",
"DE.Views.EditText.textSmallCaps": "Small Caps",
"DE.Views.EditText.textAllCaps": "All Caps",
"DE.Views.EditText.textLetterSpacing": "Letter Spacing",
"DE.Views.EditText.textLineSpacing": "Line Spacing",
"DE.Views.EditText.textBullets": "Bullets",
"DE.Views.EditText.textNone": "None",
"DE.Views.EditText.textNumbers": "Numbers"
} }
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment