diff --git a/apps/common/mobile/lib/component/ThemeColorPalette.js b/apps/common/mobile/lib/component/ThemeColorPalette.js index 96b615b09..cbf243618 100644 --- a/apps/common/mobile/lib/component/ThemeColorPalette.js +++ b/apps/common/mobile/lib/component/ThemeColorPalette.js @@ -204,6 +204,6 @@ define([ }, textThemeColors: 'Theme Colors', - textStandartColors: 'Standart Colors' + textStandartColors: 'Standard Colors' }, Common.UI.ThemeColorPalette || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/controller/edit/EditText.js b/apps/documenteditor/mobile/app/controller/edit/EditText.js index 59d46728e..ce190df0e 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditText.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditText.js @@ -46,7 +46,7 @@ define([ ], function (core) { 'use strict'; - DE.Controllers.EditText = Backbone.Controller.extend((function() { + DE.Controllers.EditText = Backbone.Controller.extend(_.extend((function() { var _fontsArray = [], _stack = [], _paragraphObject = undefined, @@ -491,7 +491,7 @@ define([ }, 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; $('#font-fonts .item-title').html(name); @@ -501,7 +501,7 @@ define([ _fontInfo.size = 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-size .item-after label').html(displaySize); @@ -592,7 +592,11 @@ define([ // Helpers _toggleButton: function (e) { return $(e.currentTarget).toggleClass('active').hasClass('active'); - } + }, + + textFonts: 'Fonts', + textAuto: 'Auto', + textPt: 'pt' } - })()); -}); + })(), DE.Controllers.EditText || {})) +}); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/template/EditText.template b/apps/documenteditor/mobile/app/template/EditText.template index a895bb503..7bd5e4f6a 100644 --- a/apps/documenteditor/mobile/app/template/EditText.template +++ b/apps/documenteditor/mobile/app/template/EditText.template @@ -5,7 +5,7 @@
  • -
    Fonts
    +
    <%= scope.textFonts %>
  • @@ -24,7 +24,7 @@
    <% if (!android) { %>
    <% } %>
    -
    Font color
    +
    <%= scope.textFontColor %>
    <% if (android) { %>
    <% } %>
    @@ -34,7 +34,7 @@
    <% if (!android) { %>
    <% } %>
    -
    Highlight color
    +
    <%= scope.textHighlightColor %>
    <% if (android) { %>
    <% } %>
    @@ -45,7 +45,7 @@
    <% if (!android) { %>
    <% } %>
    -
    Additional formatting
    +
    <%= scope.textAdditionalFormat %>
    @@ -76,21 +76,21 @@
    <% if (!android) { %>
    <% } %>
    -
    Bullets
    +
    <%= scope.textBullets %>
  • <% if (!android) { %>
    <% } %>
    -
    Numbers
    +
    <%= scope.textNumbers %>
  • <% if (!android) { %>
    <% } %>
    -
    Line Spacing
    +
    <%= scope.textLineSpacing %>
  • @@ -101,8 +101,8 @@
    @@ -113,7 +113,7 @@
  • -
    Size
    +
    <%= scope.textSize %>
    <% if (!android) { %><% } %>

    @@ -127,7 +127,7 @@

  • -
    Fonts
    +
    <%= scope.textFonts %>
    @@ -139,8 +139,8 @@
    @@ -155,7 +155,7 @@
    -
    Automatic
    +
    <%= scope.textAutomatic %>
    @@ -170,8 +170,8 @@
    @@ -186,8 +186,8 @@
    @@ -200,7 +200,7 @@ <% if (android) { %>
    <% } %>
    -
    Strikethrough
    +
    <%= scope.textStrikethrough %>
    @@ -209,7 +209,7 @@ <% if (android) { %>
    <% } %>
    -
    Double Strikethrough
    +
    <%= scope.textDblStrikethrough %>
    @@ -218,7 +218,7 @@ <% if (android) { %>
    <% } %>
    -
    Superscript
    +
    <%= scope.textDblSuperscript %>
    @@ -227,7 +227,7 @@ <% if (android) { %>
    <% } %>
    -
    Subscript
    +
    <%= scope.textSubscript %>
    @@ -236,7 +236,7 @@ <% if (android) { %>
    <% } %>
    -
    Small Caps
    +
    <%= scope.textSmallCaps %>
    @@ -245,7 +245,7 @@ <% if (android) { %>
    <% } %>
    -
    All Caps
    +
    <%= scope.textAllCaps %>
    @@ -256,7 +256,7 @@
  • -
    Letter Spacing
    +
    <%= scope.textLetterSpacing %>
    <% if (!android) { %><% } %>

    @@ -278,8 +278,8 @@

    @@ -351,8 +351,8 @@
    @@ -363,7 +363,7 @@ <% _.each(row, function(bullet) { %>
  • <% if (bullet.thumb.length < 1) { %> -
    +
    <% } else { %>
    <% } %> @@ -379,8 +379,8 @@
    @@ -391,7 +391,7 @@ <% _.each(row, function(number) { %>
  • <% if (number.thumb.length < 1) { %> -
    +
    <% } else { %>
    <% } %> diff --git a/apps/documenteditor/mobile/app/view/edit/EditText.js b/apps/documenteditor/mobile/app/view/edit/EditText.js index f9adda93c..842114435 100644 --- a/apps/documenteditor/mobile/app/view/edit/EditText.js +++ b/apps/documenteditor/mobile/app/view/edit/EditText.js @@ -49,7 +49,7 @@ define([ ], function (editTemplate, $, _, Backbone) { 'use strict'; - DE.Views.EditText = Backbone.View.extend((function() { + DE.Views.EditText = Backbone.View.extend(_.extend((function() { // private var _fontsList, _editTextController; @@ -116,6 +116,7 @@ define([ this.layout = $('
    ').append(this.template({ android : Common.SharedSettings.get('android'), phone : Common.SharedSettings.get('phone'), + scope : this, bullets : _bullets, numbers : _numbers })); @@ -225,8 +226,29 @@ define([ showNumbers: function () { 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 diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index ba9586741..205aa99a8 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -1,4 +1,7 @@ { + "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.defaultTitleText": "ONLYOFFICE Document Editor", "DE.Controllers.Main.criticalErrorTitle": "Error", @@ -319,5 +322,30 @@ "DE.Views.EditTabletextBandedRow": "Banded Row", "DE.Views.EditTabletextFirstColumn": "First 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