diff --git a/apps/documenteditor/mobile/app/controller/edit/EditShape.js b/apps/documenteditor/mobile/app/controller/edit/EditShape.js index 06746a0ce..e93c2f5c2 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditShape.js @@ -46,7 +46,7 @@ define([ ], function (core) { 'use strict'; - DE.Controllers.EditShape = Backbone.Controller.extend((function() { + DE.Controllers.EditShape = Backbone.Controller.extend(_.extend((function() { // Private var _stack = [], _shapeObject = undefined, @@ -558,5 +558,5 @@ define([ return shapeExist; } }; - })()); + })(), DE.Controllers.EditShape || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/template/EditShape.template b/apps/documenteditor/mobile/app/template/EditShape.template index aacee4a09..6c844241b 100644 --- a/apps/documenteditor/mobile/app/template/EditShape.template +++ b/apps/documenteditor/mobile/app/template/EditShape.template @@ -6,7 +6,7 @@
-
Style
+
<%= scope.textStyle %>
 @@ -15,7 +15,7 @@
-
Wrap
+
<%= scope.textWrap %>
 @@ -24,7 +24,7 @@
-
Replace
+
<%= scope.textReplace %>
 @@ -33,7 +33,7 @@
-
Reorder
+
<%= scope.textReorder %>
 @@ -44,9 +44,9 @@ @@ -57,8 +57,8 @@
-
<% if (!android) { %>Back<% } %>
-
Reorder
+
<% if (!android) { %><%= scope.textBack %><% } %>
+
<%= scope.textReorder %>
<% if (phone) { %><% } %>
@@ -71,7 +71,7 @@
-
Bring to Foreground
+
<%= scope.textToForeground %>
@@ -81,7 +81,7 @@
-
Send to Background
+
<%= scope.textToBackground %>
@@ -91,7 +91,7 @@
-
Move Forward
+
<%= scope.textForward %>
@@ -101,7 +101,7 @@
-
Move Backward
+
<%= scope.textBackward %>
@@ -116,8 +116,8 @@
-
<% if (!android) { %>Back<% } %>
-
Replace
+
<% if (!android) { %><%= scope.textBack %><% } %>
+
<%= scope.textReplace %>
<% if (phone) { %><% } %>
@@ -140,8 +140,8 @@
-
<% if (!android) { %>Back<% } %>
-
Wrap
+
<% if (!android) { %><%= scope.textBack %><% } %>
+
<%= scope.textWrap %>
<% if (phone) { %><% } %>
@@ -158,7 +158,7 @@
<% } %>
-
Inline
+
<%= scope.textInline %>
@@ -171,7 +171,7 @@
<% } %>
-
Square
+
<%= scope.textSquare %>
@@ -184,7 +184,7 @@
<% } %>
-
Tight
+
<%= scope.textTight %>
@@ -197,7 +197,7 @@
<% } %>
-
Through
+
<%= scope.textThrough %>
@@ -210,7 +210,7 @@
<% } %>
-
Top and Bottom
+
<%= scope.textTopAndBottom %>
@@ -223,7 +223,7 @@
<% } %>
-
In Front
+
<%= scope.textInFront %>
@@ -236,13 +236,13 @@
<% } %>
-
Behind
+
<%= scope.textBehind %>
-
Align
+
<%= scope.textAlign %>
  • @@ -263,7 +263,7 @@
  • -
    Move with Text
    +
    <%= scope.textWithText %>
  • -
    Allow Overlap
    +
    <%= scope.textOverlap %>
-
Distance from text
+
<%= scope.textFromText %>
  • @@ -313,21 +313,21 @@
    -
    <% if (!android) { %>Back<% } %>
    +
    <% if (!android) { %><%= scope.textBack %><% } %>
    <% if (android) { %>
    - Fill - Border - Effects + <%= scope.textFill %> + <%= scope.textBorder %> + <%= scope.textEffects %>
    <% } else { %>
    - Fill - Border - Effects + <%= scope.textFill %> + <%= scope.textBorder %> + <%= scope.textEffects %>
    <% } %>
    @@ -344,7 +344,7 @@
    • -
      Size
      +
      <%= scope.textSize %>
      @@ -360,7 +360,7 @@
      -
      Color
      +
      <%= scope.textColor %>
      @@ -373,7 +373,7 @@
      • -
        Opacity
        +
        <%= scope.textOpacity %>
        @@ -397,8 +397,8 @@
        -
        <% if (!android) { %>Back<% } %>
        -
        Color
        +
        <% if (!android) { %><%= scope.textBack %><% } %>
        +
        <%= scope.textColor %>
        <% if (phone) { %><% } %>
        diff --git a/apps/documenteditor/mobile/app/view/edit/EditShape.js b/apps/documenteditor/mobile/app/view/edit/EditShape.js index fe3b30795..369776cb5 100644 --- a/apps/documenteditor/mobile/app/view/edit/EditShape.js +++ b/apps/documenteditor/mobile/app/view/edit/EditShape.js @@ -48,7 +48,7 @@ define([ ], function (editTemplate, $, _, Backbone) { 'use strict'; - DE.Views.EditShape = Backbone.View.extend((function() { + DE.Views.EditShape = Backbone.View.extend(_.extend((function() { // private return { @@ -89,7 +89,8 @@ define([ this.layout = $('
        ').append(this.template({ android : Common.SharedSettings.get('android'), phone : Common.SharedSettings.get('phone'), - shapes : Common.SharedSettings.get('shapes') + shapes : Common.SharedSettings.get('shapes'), + scope : this })); return this; @@ -170,7 +171,35 @@ define([ }); this.fireEvent('page:show', [this, selector]); - } + }, + + textStyle: 'Style', + textWrap: 'Wrap', + textReplace: 'Replace', + textReorder: 'Reorder', + textRemoveShape: 'Remove Shape', + textBack: 'Back', + textToForeground: 'Bring to Foreground', + textToBackground: 'Send to Background', + textForward: 'Move Forward', + textBackward: 'Move Backward', + textInline: 'Inline', + textSquare: 'Square', + textTight: 'Tight', + textThrough: 'Through', + textTopAndBottom: 'Top and Bottom', + textInFront: 'In Front', + textBehind: 'Behind', + textAlign: 'Align', + textWithText: 'Move with Text', + textOverlap: 'Allow Overlap', + textFromText: 'Distance from Text', + textFill: 'Fill', + textBorder: 'Border', + textEffects: 'Effects', + textSize: 'Size', + textColor: 'Color', + textOpacity: 'Opacity' } - })()); + })(), DE.Views.EditShape || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 505433a3e..bbae6d9bd 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -266,4 +266,32 @@ "DE.Views.EditParagraph.textOrphan": "Orphan Control", "DE.Views.EditParagraph.textKeepLines": "Keep Lines Together", "DE.Views.EditParagraph.textKeepNext": "Keep with Next", + + "DE.Views.EditShape.textStyle": "Style", + "DE.Views.EditShape.textWrap": "Wrap", + "DE.Views.EditShape.textReplace": "Replace", + "DE.Views.EditShape.textReorder": "Reorder", + "DE.Views.EditShape.textRemoveShape": "Remove Shape", + "DE.Views.EditShape.textBack": "Back", + "DE.Views.EditShape.textToForeground": "Bring to Foreground", + "DE.Views.EditShape.textToBackground": "Send to Background", + "DE.Views.EditShape.textForward": "Move Forward", + "DE.Views.EditShape.textBackward": "Move Backward", + "DE.Views.EditShape.textInline": "Inline", + "DE.Views.EditShape.textSquare": "Square", + "DE.Views.EditShape.textTight": "Tight", + "DE.Views.EditShape.textThrough": "Through", + "DE.Views.EditShape.textTopAndBottom": "Top and Bottom", + "DE.Views.EditShape.textInFront": "In Front", + "DE.Views.EditShape.textBehind": "Behind", + "DE.Views.EditShape.textAlign": "Align", + "DE.Views.EditShape.textWithText": "Move with Text", + "DE.Views.EditShape.textOverlap": "Allow Overlap", + "DE.Views.EditShape.textFromText": "Distance from Text", + "DE.Views.EditShape.textFill": "Fill", + "DE.Views.EditShape.textBorder": "Border", + "DE.Views.EditShape.textEffects": "Effects", + "DE.Views.EditShape.textSize": "Size", + "DE.Views.EditShape.textColor": "Color", + "DE.Views.EditShape.textOpacity": "Opacity" } \ No newline at end of file