diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js index 7408cc6e8..13d45ba3d 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js @@ -453,10 +453,10 @@ define([ // Cross setOptions('horizontal-axis-cross', [ - {display: this.textAuto, value: Asc.c_oAscCrossesRule.auto}, - {display: this.textValue, value: Asc.c_oAscCrossesRule.value}, - {display: this.textMinValue, value: Asc.c_oAscCrossesRule.minValue}, - {display: this.textMaxValue, value: Asc.c_oAscCrossesRule.maxValue} + {display: me.textAuto, value: Asc.c_oAscCrossesRule.auto}, + {display: me.textValue, value: Asc.c_oAscCrossesRule.value}, + {display: me.textMinValue, value: Asc.c_oAscCrossesRule.minValue}, + {display: me.textMaxValue, value: Asc.c_oAscCrossesRule.maxValue} ]); var crossValue = axisProps.getCrossesRule(); @@ -469,8 +469,8 @@ define([ // Pos setOptions('horizontal-axis-position', [ - {display: this.textOnTickMarks, value: Asc.c_oAscLabelsPosition.byDivisions}, - {display: this.textBetweenTickMarks, value: Asc.c_oAscLabelsPosition.betweenDivisions} + {display: me.textOnTickMarks, value: Asc.c_oAscLabelsPosition.byDivisions}, + {display: me.textBetweenTickMarks, value: Asc.c_oAscLabelsPosition.betweenDivisions} ]); setValue('horizontal-axis-position', axisProps.getLabelsPosition()); @@ -478,10 +478,10 @@ define([ // Tick var tickOptions = [ - {display: this.textNone, value: Asc.c_oAscTickMark.TICK_MARK_NONE}, - {display: this.textCross, value: Asc.c_oAscTickMark.TICK_MARK_CROSS}, - {display: this.textIn, value: Asc.c_oAscTickMark.TICK_MARK_IN}, - {display: this.textOut, value: Asc.c_oAscTickMark.TICK_MARK_OUT} + {display: me.textNone, value: Asc.c_oAscTickMark.TICK_MARK_NONE}, + {display: me.textCross, value: Asc.c_oAscTickMark.TICK_MARK_CROSS}, + {display: me.textIn, value: Asc.c_oAscTickMark.TICK_MARK_IN}, + {display: me.textOut, value: Asc.c_oAscTickMark.TICK_MARK_OUT} ]; setOptions('horizontal-axis-tick-major', tickOptions); @@ -492,10 +492,10 @@ define([ // Label setOptions('horizontal-axis-label-pos', [ - {display: this.textNone, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE}, - {display: this.textLow, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW}, - {display: this.textHigh, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH}, - {display: this.textNextToAxis, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO} + {display: me.textNone, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NONE}, + {display: me.textLow, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_LOW}, + {display: me.textHigh, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_HIGH}, + {display: me.textNextToAxis, value: Asc.c_oAscTickLabelsPos.TICK_LABEL_POSITION_NEXT_TO} ]); setValue('horizontal-axis-label-pos', axisProps.getTickLabelsPos()); @@ -1059,33 +1059,9 @@ define([ return clr; }, - textChart: 'Chart', - textLayout: 'Layout', - textLegendPos: 'Legend', - textHorTitle: 'Horizontal Axis Title', - textVertTitle: 'Vertical Axis Title', - textDataLabels: 'Data Labels', - textSeparator: 'Data Labels Separator', - textSeriesName: 'Series Name', - textCategoryName: 'Category Name', textValue: 'Value', - textAxisOptions: 'Axis Options', textMinValue: 'Minimum Value', textMaxValue: 'Maximum Value', - textAxisCrosses: 'Axis Crosses', - textUnits: 'Display Units', - textTickOptions: 'Tick Options', - textMajorType: 'Major Type', - textMinorType: 'Minor Type', - textLabelOptions: 'Label Options', - textLabelPos: 'Label Position', - textReverse: 'Values in reverse order', - textVertAxis: 'Vertical Axis', - textHorAxis: 'Horizontal Axis', - textMarksInterval: 'Interval between Marks', - textLabelDist: 'Axis Label Distance', - textLabelInterval: 'Interval between Labels', - textAxisPos: 'Axis Position', textLeftOverlay: 'Left Overlay', textRightOverlay: 'Right Overlay', textOverlay: 'Overlay', @@ -1118,24 +1094,8 @@ define([ textManual: 'Manual', textBetweenTickMarks: 'Between Tick Marks', textOnTickMarks: 'On Tick Marks', - textHorGrid: 'Horizontal Gridlines', - textVertGrid: 'Vertical Gridlines', - textLines: 'Lines', - textMarkers: 'Markers', - textMajor: 'Major', - textMinor: 'Minor', - textMajorMinor: 'Major and Minor', - textStraight: 'Straight', - textSmooth: 'Smooth', - textType: 'Type', - textTypeData: 'Type & Data', - textStyle: 'Style', errorMaxRows: 'ERROR! The maximum number of data series per chart is 255.', errorStockChart: 'Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.', - textAxisSettings: 'Axis Settings', - textGridLines: 'Gridlines', - textShow: 'Show', - textHide: 'Hide', textLeft: 'Left', textRight: 'Right', textTop: 'Top', diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js index b35e6a339..7b22070e0 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js @@ -103,7 +103,7 @@ define([ $('#edit-link-sheet select').html(sheets.join('')); $('#edit-link-type select').val(linkInfo.asc_getType()); - $('#edit-link-type .item-after').text((linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? 'Internal Data Range' : 'External Link'); + $('#edit-link-type .item-after').text((linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? me.textInternalLink : me.textExternalLink); $('#edit-link-sheet, #edit-link-range').css('display', (linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none'); $('#edit-link-link').css('display', (linkInfo.asc_getType() != Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none'); @@ -217,6 +217,8 @@ define([ SSE.getController('EditContainer').hideModal(); }, + textExternalLink: 'External Link', + textInternalLink: 'Internal Data Range', textDefault: 'Selected range', textInvalidRange: 'Invalid cells range', textEmptyImgUrl: 'You need to specify image URL.', diff --git a/apps/spreadsheeteditor/mobile/app/template/EditChart.template b/apps/spreadsheeteditor/mobile/app/template/EditChart.template index 3c36819ea..a18b54f18 100644 --- a/apps/spreadsheeteditor/mobile/app/template/EditChart.template +++ b/apps/spreadsheeteditor/mobile/app/template/EditChart.template @@ -6,7 +6,7 @@
-
Style
+
<%= scope.textStyle %>
 @@ -15,7 +15,7 @@
-
Layout
+
<%= scope.textLayout %>
 @@ -24,7 +24,7 @@
-
Vertical Axis
+
<%= scope.textVerAxis %>
 @@ -33,7 +33,7 @@
-
Horizontal Axis
+
<%= scope.textHorAxis %>
 @@ -42,7 +42,7 @@
-
Reorder
+
<%= scope.textReorder %>
 @@ -126,15 +126,15 @@
<% if (!android) { %><%= scope.textBack %><% } %>
-
Style
+
<%= scope.textStyle %>
<% if (phone) { %><% } %>
<% if (!android) { %>
- Type - Style - Fill - Border + <%= scope.textType %> + <%= scope.textStyle %> + <%= scope.textFill %> + <%= scope.textBorder %>
<% } %> @@ -143,10 +143,10 @@
- Type - Style - Fill - Border + <%= scope.textType %> + <%= scope.textStyle %> + <%= scope.textFill %> + <%= scope.textBorder %>
@@ -176,7 +176,7 @@
-
Axis Title
+
<%= scope.textAxisTitle %>
-
Gridlines
+
<%= scope.textGridlines %>
-
Tick Options
+
<%= scope.textTickOptions %>Tick Options
  • @@ -469,8 +469,8 @@
    -
    Major Type
    -
    None
    +
    <%= scope.textMajorType %>
    +
    <%= scope.textNone %>
    @@ -480,15 +480,15 @@
    -
    Minor Type
    -
    None
    +
    <%= scope.textMajorType %>
    +
    <%= scope.textNone %>
-
Label Options
+
<%= scope.textLabelOptions %>
  • @@ -496,8 +496,8 @@
    -
    Label Position
    -
    None
    +
    <%= scope.textLabelPos %>
    +
    <%= scope.textNone %>
    @@ -514,7 +514,7 @@
    <% if (!android) { %><%= scope.textBack %><% } %>
    -
    Axis Options
    +
    <%= scope.textAxisOptions %>
    <% if (phone) { %><% } %>
    @@ -528,8 +528,8 @@
    -
    Axis Crosses
    -
    None
    +
    <%= scope.textAxisCrosses %>
    +
    <%= scope.textNone %>
    @@ -537,7 +537,7 @@
  • -
    Values in Reverse Order
    +
    <%= scope.textValReverseOrder %>
-
Tick Options
+
<%= scope.textTickOptions %>
  • @@ -585,8 +585,8 @@
    -
    Major Type
    -
    None
    +
    <%= scope.textMajorType %>
    +
    <%= scope.textNone %>
    @@ -596,15 +596,15 @@
    -
    Minor Type
    -
    None
    +
    <%= scope.textMajorType %>
    +
    <%= scope.textNone %>
-
Label Options
+
<%= scope.textLabelOptions %>
  • @@ -612,8 +612,8 @@
    -
    Label Position
    -
    None
    +
    <%= scope.textLabelPos %>
    +
    <%= scope.textNone %>
    diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js index 4044c89cc..287178904 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js @@ -221,6 +221,47 @@ define([ textToBackground: 'Send to Background', textForward: 'Move Forward', textBackward: 'Move Backward', + textStyle: 'Style', + textLayout: 'Layout', + textVerAxis: 'Vertical Axis', + textHorAxis: 'Horizontal Axis', + textType: 'Type', + textFill: 'Fill', + textBorder: 'Border', + textSize: 'Size', + textColor: 'Color', + textOverlay: 'Overlay', + textNoOverlay: 'No Overlay', + textChartTitle: 'Chart Title', + textLeft: 'Left', + textTop: 'Top', + textRight: 'Right', + textBottom: 'Bottom', + textLeftOverlay: 'Left Overlay', + textRightOverlay: 'Right Overlay', + textLegend: 'Legend', + textAxisTitle: 'Axis Title', + textHorizontal: 'Horizontal', + textRotated: 'Rotated', + textVertical: 'Vertical', + textMajor: 'Major', + textMinor: 'Minor', + textMajorMinor: 'Major and Minor', + textDataLabels: 'Data Labels', + textAxisOptions: 'Axis Options', + textMinValue: 'Minimum Value', + textMaxValue: 'Maximum Value', + textAxisCrosses: 'Axis Crosses', + textAuto: 'Auto', + textCrossesValue: 'Crosses Value', + textDisplayUnits: 'Display Units', + textValReverseOrder: 'Values in Reverse Order', + textTickOptions: 'Tick Options', + textMajorType: 'Major Type', + textLabelOptions: 'Label Options', + textLabelPos: 'Label Position', + textAxisPosition: 'Axis Position', + textNone: 'None' } })(), SSE.Views.EditChart || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 82ac88ed9..81107f31e 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -2,6 +2,142 @@ "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", + "SSE.Controllers.EditChart.textValue": "Value", + "SSE.Controllers.EditChart.textMinValue": "Minimum Value", + "SSE.Controllers.EditChart.textMaxValue": "Maximum Value", + "SSE.Controllers.EditChart.textLeftOverlay": "Left Overlay", + "SSE.Controllers.EditChart.textRightOverlay": "Right Overlay", + "SSE.Controllers.EditChart.textOverlay": "Overlay", + "SSE.Controllers.EditChart.textNoOverlay": "No Overlay", + "SSE.Controllers.EditChart.textRotated": "Rotated", + "SSE.Controllers.EditChart.textHorizontal": "Horizontal", + "SSE.Controllers.EditChart.textInnerBottom": "Inner Bottom", + "SSE.Controllers.EditChart.textInnerTop": "Inner Top", + "SSE.Controllers.EditChart.textOuterTop": "Outer Top", + "SSE.Controllers.EditChart.textNone": "None", + "SSE.Controllers.EditChart.textCenter": "Center", + "SSE.Controllers.EditChart.textFixed": "Fixed", + "SSE.Controllers.EditChart.textAuto": "Auto", + "SSE.Controllers.EditChart.textCross": "Cross", + "SSE.Controllers.EditChart.textIn": "In", + "SSE.Controllers.EditChart.textOut": "Out", + "SSE.Controllers.EditChart.textLow": "Low", + "SSE.Controllers.EditChart.textHigh": "High", + "SSE.Controllers.EditChart.textNextToAxis": "Next to axis", + "SSE.Controllers.EditChart.textHundreds": "Hundreds", + "SSE.Controllers.EditChart.textThousands": "Thousands", + "SSE.Controllers.EditChart.textTenThousands": "10 000", + "SSE.Controllers.EditChart.textHundredThousands": "100 000", + "SSE.Controllers.EditChart.textMillions": "Millions", + "SSE.Controllers.EditChart.textTenMillions": "10 000 000", + "SSE.Controllers.EditChart.textHundredMil": "100 000 000", + "SSE.Controllers.EditChart.textBillions": "Billions", + "SSE.Controllers.EditChart.textTrillions": "Trillions", + "SSE.Controllers.EditChart.textCustom": "Custom", + "SSE.Controllers.EditChart.textManual": "Manual", + "SSE.Controllers.EditChart.textBetweenTickMarks": "Between Tick Marks", + "SSE.Controllers.EditChart.textOnTickMarks": "On Tick Marks", + "SSE.Controllers.EditChart.errorMaxRows": "ERROR! The maximum number of data series per chart is 255.", + "SSE.Controllers.EditChart.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
    opening price, max price, min price, closing price.", + "SSE.Controllers.EditChart.textLeft": "Left", + "SSE.Controllers.EditChart.textRight": "Right", + "SSE.Controllers.EditChart.textTop": "Top", + "SSE.Controllers.EditChart.textBottom": "Bottom", + "SSE.Controllers.EditChart.textFit": "Fit Width", + "SSE.Views.EditChart.textBack": "Back", + "SSE.Views.EditChart.textChart": "Chart", + "SSE.Views.EditChart.textReorder": "Reorder", + "SSE.Views.EditChart.textRemoveChart": "Remove Chart", + "SSE.Views.EditChart.textToForeground": "Bring to Foreground", + "SSE.Views.EditChart.textToBackground": "Send to Background", + "SSE.Views.EditChart.textForward": "Move Forward", + "SSE.Views.EditChart.textBackward": "Move Backward", + "SSE.Views.EditChart.textStyle": "Style", + "SSE.Views.EditChart.textLayout": "Layout", + "SSE.Views.EditChart.textVerAxis": "Vertical Axis", + "SSE.Views.EditChart.textHorAxis": "Horizontal Axis", + "SSE.Views.EditChart.textType": "Type", + "SSE.Views.EditChart.textFill": "Fill", + "SSE.Views.EditChart.textBorder": "Border", + "SSE.Views.EditChart.textSize": "Size", + "SSE.Views.EditChart.textColor": "Color", + "SSE.Views.EditChart.textOverlay": "Overlay", + "SSE.Views.EditChart.textNoOverlay": "No Overlay", + "SSE.Views.EditChart.textChartTitle": "Chart Title", + "SSE.Views.EditChart.textLeft": "Left", + "SSE.Views.EditChart.textTop": "Top", + "SSE.Views.EditChart.textRight": "Right", + "SSE.Views.EditChart.textBottom": "Bottom", + "SSE.Views.EditChart.textLeftOverlay": "Left Overlay", + "SSE.Views.EditChart.textRightOverlay": "Right Overlay", + "SSE.Views.EditChart.textLegend": "Legend", + "SSE.Views.EditChart.textAxisTitle": "Axis Title", + "SSE.Views.EditChart.textHorizontal": "Horizontal", + "SSE.Views.EditChart.textRotated": "Rotated", + "SSE.Views.EditChart.textVertical": "Vertical", + "SSE.Views.EditChart.textMajor": "Major", + "SSE.Views.EditChart.textMinor": "Minor", + "SSE.Views.EditChart.textMajorMinor": "Major and Minor", + "SSE.Views.EditChart.textDataLabels": "Data Labels", + "SSE.Views.EditChart.textAxisOptions": "Axis Options", + "SSE.Views.EditChart.textMinValue": "Minimum Value", + "SSE.Views.EditChart.textMaxValue": "Maximum Value", + "SSE.Views.EditChart.textAxisCrosses": "Axis Crosses", + "SSE.Views.EditChart.textAuto": "Auto", + "SSE.Views.EditChart.textCrossesValue": "Crosses Value", + "SSE.Views.EditChart.textDisplayUnits": "Display Units", + "SSE.Views.EditChart.textValReverseOrder": "Values in Reverse Order", + "SSE.Views.EditChart.textTickOptions": "Tick Options", + "SSE.Views.EditChart.textMajorType": "Major Type", + "SSE.Views.EditChart.textLabelOptions": "Label Options", + "SSE.Views.EditChart.textLabelPos": "Label Position", + "SSE.Views.EditChart.textAxisPosition": "Axis Position", + "SSE.Views.EditChart.textNone": "None", + + "SSE.Views.EditImage.textReplace": "Replace", + "SSE.Views.EditImage.textReorder": "Reorder", + "SSE.Views.EditImage.textDefault": "Default Size", + "SSE.Views.EditImage.textRemove": "Remove Image", + "SSE.Views.EditImage.textBack": "Back", + "SSE.Views.EditImage.textToForeground": "Bring to Foreground", + "SSE.Views.EditImage.textToBackground": "Send to Background", + "SSE.Views.EditImage.textForward": "Move Forward", + "SSE.Views.EditImage.textBackward": "Move Backward", + "SSE.Views.EditImage.textFromLibrary": "Picture from Library", + "SSE.Views.EditImage.textFromURL": "Picture from URL", + "SSE.Views.EditImage.textLinkSettings": "Link Settings", + "SSE.Views.EditImage.textAddress": "Address", + "SSE.Views.EditImage.textImageURL": "Image URL", + "SSE.Views.EditImage.textReplaceImg": "Replace Image", + + "SSE.Views.EditShape.textStyle": "Style", + "SSE.Views.EditShape.textReplace": "Replace", + "SSE.Views.EditShape.textReorder": "Reorder", + "SSE.Views.EditShape.textRemoveShape": "Remove Shape", + "SSE.Views.EditShape.textBack": "Back", + "SSE.Views.EditShape.textToForeground": "Bring to Foreground", + "SSE.Views.EditShape.textToBackground": "Send to Background", + "SSE.Views.EditShape.textForward": "Move Forward", + "SSE.Views.EditShape.textBackward": "Move Backward", + "SSE.Views.EditShape.textFill": "Fill", + "SSE.Views.EditShape.textBorder": "Border", + "SSE.Views.EditShape.textEffects": "Effects", + "SSE.Views.EditShape.textSize": "Size", + "SSE.Views.EditShape.textColor": "Color", + "SSE.Views.EditShape.textOpacity": "Opacity", + + "SSE.Views.EditText.textBack": "Back", + "SSE.Views.EditText.textFonts": "Fonts", + "SSE.Views.EditText.textTextColor": "Text Color", + "SSE.Views.EditText.textFillColor": "Fill Color", + "SSE.Views.EditText.textSize": "Size", + + "SSE.Controllers.EditHyperlink.textExternalLink": "External Link", + "SSE.Controllers.EditHyperlink.textInternalLink": "Internal Data Range", + "SSE.Controllers.EditHyperlink.textDefault": "Selected range", + "SSE.Controllers.EditHyperlink.textInvalidRange": "Invalid cells range", + "SSE.Controllers.EditHyperlink.textEmptyImgUrl": "You need to specify image URL.", + "SSE.Controllers.EditHyperlink.txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "SSE.Views.EditHyperlink.textBack": "Back", "SSE.Views.EditHyperlink.textExternalLink": "External Link", "SSE.Views.EditHyperlink.textInternalLink": "Internal Data Range",