Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 35065.

Browse source
This commit is contained in:
Julia Radzhabova 2017-06-06 11:29:30 +03:00
parent 19849935c6
commit eae0d9ade9
7 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -2339,21 +2339,21 @@ define([
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items : [ items : [
me.menuTableCellTop = new Common.UI.MenuItem({ me.menuTableCellTop = new Common.UI.MenuItem({
caption : me.topCellText, caption : me.textShapeAlignTop,
toggleGroup : 'popuptablecellalign', toggleGroup : 'popuptablecellalign',
checkable : true, checkable : true,
checked : false, checked : false,
valign : Asc.c_oAscVertAlignJc.Top valign : Asc.c_oAscVertAlignJc.Top
}).on('click', _.bind(tableCellsVAlign, me)), }).on('click', _.bind(tableCellsVAlign, me)),
me.menuTableCellCenter = new Common.UI.MenuItem({ me.menuTableCellCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.textShapeAlignMiddle,
toggleGroup : 'popuptablecellalign', toggleGroup : 'popuptablecellalign',
checkable : true, checkable : true,
checked : false, checked : false,
valign : Asc.c_oAscVertAlignJc.Center valign : Asc.c_oAscVertAlignJc.Center
}).on('click', _.bind(tableCellsVAlign, me)), }).on('click', _.bind(tableCellsVAlign, me)),
me.menuTableCellBottom = new Common.UI.MenuItem({ me.menuTableCellBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.textShapeAlignBottom,
toggleGroup : 'popuptablecellalign', toggleGroup : 'popuptablecellalign',
checkable : true, checkable : true,
checked : false, checked : false,
@ -2855,21 +2855,21 @@ define([
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items : [ items : [
me.menuParagraphTop = new Common.UI.MenuItem({ me.menuParagraphTop = new Common.UI.MenuItem({
caption : me.topCellText, caption : me.textShapeAlignTop,
checkable : true, checkable : true,
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVAlign.Top valign : Asc.c_oAscVAlign.Top
}).on('click', _.bind(paragraphVAlign, me)), }).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphCenter = new Common.UI.MenuItem({ me.menuParagraphCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.textShapeAlignMiddle,
checkable : true, checkable : true,
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
valign : Asc.c_oAscVAlign.Center valign : Asc.c_oAscVAlign.Center
}).on('click', _.bind(paragraphVAlign, me)), }).on('click', _.bind(paragraphVAlign, me)),
me.menuParagraphBottom = new Common.UI.MenuItem({ me.menuParagraphBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.textShapeAlignBottom,
checkable : true, checkable : true,
checked : false, checked : false,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
@ -3349,9 +3349,6 @@ define([
/** coauthoring begin **/ /** coauthoring begin **/
addCommentText : 'Add Comment', addCommentText : 'Add Comment',
/** coauthoring end **/ /** coauthoring end **/
topCellText: 'Align Top',
centerCellText: 'Align Center',
bottomCellText: 'Align Bottom',
cellAlignText: 'Cell Vertical Alignment', cellAlignText: 'Cell Vertical Alignment',
txtInline: 'Inline', txtInline: 'Inline',
txtSquare: 'Square', txtSquare: 'Square',

6
apps/documenteditor/main/locale/en.json
View file

@ -695,11 +695,11 @@
"DE.Views.DocumentHolder.advancedText": "Advanced Settings", "DE.Views.DocumentHolder.advancedText": "Advanced Settings",
"DE.Views.DocumentHolder.alignmentText": "Alignment", "DE.Views.DocumentHolder.alignmentText": "Alignment",
"DE.Views.DocumentHolder.belowText": "Below", "DE.Views.DocumentHolder.belowText": "Below",
"DE.Views.DocumentHolder.bottomCellText": "Align Bottom", "del_DE.Views.DocumentHolder.bottomCellText": "Align Bottom",
"DE.Views.DocumentHolder.breakBeforeText": "Page break before", "DE.Views.DocumentHolder.breakBeforeText": "Page break before",
"DE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment", "DE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment",
"DE.Views.DocumentHolder.cellText": "Cell", "DE.Views.DocumentHolder.cellText": "Cell",
"DE.Views.DocumentHolder.centerCellText": "Align Center", "del_DE.Views.DocumentHolder.centerCellText": "Align Center",
"DE.Views.DocumentHolder.centerText": "Center", "DE.Views.DocumentHolder.centerText": "Center",
"DE.Views.DocumentHolder.chartText": "Chart Advanced Settings", "DE.Views.DocumentHolder.chartText": "Chart Advanced Settings",
"DE.Views.DocumentHolder.columnText": "Column", "DE.Views.DocumentHolder.columnText": "Column",
@ -773,7 +773,7 @@
"DE.Views.DocumentHolder.textShapeAlignTop": "Align Top", "DE.Views.DocumentHolder.textShapeAlignTop": "Align Top",
"DE.Views.DocumentHolder.textWrap": "Wrapping Style", "DE.Views.DocumentHolder.textWrap": "Wrapping Style",
"DE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.", "DE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.",
"DE.Views.DocumentHolder.topCellText": "Align Top", "del_DE.Views.DocumentHolder.topCellText": "Align Top",
"DE.Views.DocumentHolder.txtAddBottom": "Add bottom border", "DE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
"DE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar", "DE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
"DE.Views.DocumentHolder.txtAddHor": "Add horizontal line", "DE.Views.DocumentHolder.txtAddHor": "Add horizontal line",

15
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -1973,19 +1973,19 @@ define([
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items: [ items: [
me.menuTableCellTop = new Common.UI.MenuItem({ me.menuTableCellTop = new Common.UI.MenuItem({
caption : me.topCellText, caption : me.textShapeAlignTop,
checkable : true, checkable : true,
toggleGroup : 'popuptablecellalign', toggleGroup : 'popuptablecellalign',
value : Asc.c_oAscVertAlignJc.Top value : Asc.c_oAscVertAlignJc.Top
}).on('click', _.bind(onItemClick, me)), }).on('click', _.bind(onItemClick, me)),
me.menuTableCellCenter = new Common.UI.MenuItem({ me.menuTableCellCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.textShapeAlignMiddle,
checkable : true, checkable : true,
toggleGroup : 'popuptablecellalign', toggleGroup : 'popuptablecellalign',
value : Asc.c_oAscVertAlignJc.Center value : Asc.c_oAscVertAlignJc.Center
}).on('click', _.bind(onItemClick, me)), }).on('click', _.bind(onItemClick, me)),
me.menuTableCellBottom = new Common.UI.MenuItem({ me.menuTableCellBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.textShapeAlignBottom,
checkable : true, checkable : true,
toggleGroup : 'popuptablecellalign', toggleGroup : 'popuptablecellalign',
value : Asc.c_oAscVertAlignJc.Bottom value : Asc.c_oAscVertAlignJc.Bottom
@ -2496,19 +2496,19 @@ define([
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
items: [ items: [
me.menuParagraphTop = new Common.UI.MenuItem({ me.menuParagraphTop = new Common.UI.MenuItem({
caption : me.topCellText, caption : me.textShapeAlignTop,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVAlign.Top value : Asc.c_oAscVAlign.Top
}).on('click', _.bind(onItemClick, me)), }).on('click', _.bind(onItemClick, me)),
me.menuParagraphCenter = new Common.UI.MenuItem({ me.menuParagraphCenter = new Common.UI.MenuItem({
caption : me.centerCellText, caption : me.textShapeAlignMiddle,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVAlign.Center value : Asc.c_oAscVAlign.Center
}).on('click', _.bind(onItemClick, me)), }).on('click', _.bind(onItemClick, me)),
me.menuParagraphBottom = new Common.UI.MenuItem({ me.menuParagraphBottom = new Common.UI.MenuItem({
caption : me.bottomCellText, caption : me.textShapeAlignBottom,
checkable : true, checkable : true,
toggleGroup : 'popupparagraphvalign', toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVAlign.Bottom value : Asc.c_oAscVAlign.Bottom
@ -3143,9 +3143,6 @@ define([
txtDistribHor : 'Distribute Horizontally', txtDistribHor : 'Distribute Horizontally',
txtDistribVert : 'Distribute Vertically', txtDistribVert : 'Distribute Vertically',
txtSlide : 'Slide', txtSlide : 'Slide',
topCellText : 'Align Top',
centerCellText : 'Align Center',
bottomCellText : 'Align Bottom',
cellAlignText : 'Cell Vertical Alignment', cellAlignText : 'Cell Vertical Alignment',
advancedShapeText : 'Shape Advanced Settings', advancedShapeText : 'Shape Advanced Settings',
/** coauthoring begin **/ /** coauthoring begin **/

6
apps/presentationeditor/main/locale/en.json
View file

@ -625,10 +625,10 @@
"PE.Views.DocumentHolder.advancedTableText": "Table Advanced Settings", "PE.Views.DocumentHolder.advancedTableText": "Table Advanced Settings",
"PE.Views.DocumentHolder.alignmentText": "Alignment", "PE.Views.DocumentHolder.alignmentText": "Alignment",
"PE.Views.DocumentHolder.belowText": "Below", "PE.Views.DocumentHolder.belowText": "Below",
"PE.Views.DocumentHolder.bottomCellText": "Align Bottom", "del_PE.Views.DocumentHolder.bottomCellText": "Align Bottom",
"PE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment", "PE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment",
"PE.Views.DocumentHolder.cellText": "Cell", "PE.Views.DocumentHolder.cellText": "Cell",
"PE.Views.DocumentHolder.centerCellText": "Align Center", "del_PE.Views.DocumentHolder.centerCellText": "Align Center",
"PE.Views.DocumentHolder.centerText": "Center", "PE.Views.DocumentHolder.centerText": "Center",
"PE.Views.DocumentHolder.columnText": "Column", "PE.Views.DocumentHolder.columnText": "Column",
"PE.Views.DocumentHolder.deleteColumnText": "Delete Column", "PE.Views.DocumentHolder.deleteColumnText": "Delete Column",
@ -683,7 +683,7 @@
"PE.Views.DocumentHolder.textShapeAlignTop": "Align Top", "PE.Views.DocumentHolder.textShapeAlignTop": "Align Top",
"PE.Views.DocumentHolder.textSlideSettings": "Slide Settings", "PE.Views.DocumentHolder.textSlideSettings": "Slide Settings",
"PE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.", "PE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.",
"PE.Views.DocumentHolder.topCellText": "Align Top", "del_PE.Views.DocumentHolder.topCellText": "Align Top",
"PE.Views.DocumentHolder.txtAddBottom": "Add bottom border", "PE.Views.DocumentHolder.txtAddBottom": "Add bottom border",
"PE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar", "PE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar",
"PE.Views.DocumentHolder.txtAddHor": "Add horizontal line", "PE.Views.DocumentHolder.txtAddHor": "Add horizontal line",

2
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -741,7 +741,7 @@ define([
txtUngroup: 'Ungroup', txtUngroup: 'Ungroup',
txtGroup: 'Group', txtGroup: 'Group',
topCellText: 'Align Top', topCellText: 'Align Top',
centerCellText: 'Align Center', centerCellText: 'Align Middle',
bottomCellText: 'Align Bottom', bottomCellText: 'Align Bottom',
vertAlignText: 'Vertical Alignment', vertAlignText: 'Vertical Alignment',
txtTextAdvanced: 'Text Advanced Settings', txtTextAdvanced: 'Text Advanced Settings',

2
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1125,7 +1125,7 @@ define([
value : 'top' value : 'top'
}, },
{ {
caption : me.tipAlignCenter, caption : me.tipAlignMiddle,
iconCls : 'mnu-valign-middle', iconCls : 'mnu-valign-middle',
icls : 'btn-valign-middle', icls : 'btn-valign-middle',
checkable : true, checkable : true,

3
apps/spreadsheeteditor/main/locale/en.json
View file

@ -949,7 +949,7 @@
"SSE.Views.DocumentHolder.advancedShapeText": "Shape Advanced Settings", "SSE.Views.DocumentHolder.advancedShapeText": "Shape Advanced Settings",
"SSE.Views.DocumentHolder.bottomCellText": "Align Bottom", "SSE.Views.DocumentHolder.bottomCellText": "Align Bottom",
"SSE.Views.DocumentHolder.bulletsText": "Bullets and Numbering", "SSE.Views.DocumentHolder.bulletsText": "Bullets and Numbering",
"SSE.Views.DocumentHolder.centerCellText": "Align Center", "SSE.Views.DocumentHolder.centerCellText": "Align Middle",
"SSE.Views.DocumentHolder.chartText": "Chart Advanced Settings", "SSE.Views.DocumentHolder.chartText": "Chart Advanced Settings",
"SSE.Views.DocumentHolder.deleteColumnText": "Column", "SSE.Views.DocumentHolder.deleteColumnText": "Column",
"SSE.Views.DocumentHolder.deleteRowText": "Row", "SSE.Views.DocumentHolder.deleteRowText": "Row",
@ -1095,6 +1095,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strResolvedComment": "Turn on display of the resolved comments",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "General", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General",
"SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Page Settings", "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Page Settings",
"SSE.Views.FormatSettingsDialog.textCancel": "Cancel", "SSE.Views.FormatSettingsDialog.textCancel": "Cancel",