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

[SSE] Fix Bug 36401.

Browse source
This commit is contained in:
Julia Radzhabova 2017-11-24 12:46:33 +03:00
parent 49a7e4c6ff
commit d743ab1185
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js
View file

@ -417,7 +417,7 @@ define([
me = this, me = this,
valDecimal = (initFormatInfo) ? initFormatInfo.asc_getDecimalPlaces() : this.spnDecimal.getNumberValue(), valDecimal = (initFormatInfo) ? initFormatInfo.asc_getDecimalPlaces() : this.spnDecimal.getNumberValue(),
valSeparator = (initFormatInfo) ? initFormatInfo.asc_getSeparator() : (this.chSeparator.getValue()=='checked'), valSeparator = (initFormatInfo) ? initFormatInfo.asc_getSeparator() : (this.chSeparator.getValue()=='checked'),
valSymbol = (initFormatInfo && initFormatInfo.asc_getSymbol()) ? initFormatInfo.asc_getSymbol() : this.langId; valSymbol = (initFormatInfo) ? initFormatInfo.asc_getSymbol() : this.langId;
if (record.value !== Asc.c_oAscNumFormatType.Custom) { if (record.value !== Asc.c_oAscNumFormatType.Custom) {
var info = new Asc.asc_CFormatCellsInfo(); var info = new Asc.asc_CFormatCellsInfo();
@ -428,7 +428,7 @@ define([
if (hasNegative || record.value == Asc.c_oAscNumFormatType.Date || record.value == Asc.c_oAscNumFormatType.Time) { if (hasNegative || record.value == Asc.c_oAscNumFormatType.Date || record.value == Asc.c_oAscNumFormatType.Time) {
if (hasSymbols) { if (hasSymbols) {
if (!me.CurrencySymbolsData) { if (!me.CurrencySymbolsData) {
me.CurrencySymbolsData = []; me.CurrencySymbolsData = [{value: null, displayValue: me.txtNone}];
var symbolssarr = this.api.asc_getCurrencySymbols(); var symbolssarr = this.api.asc_getCurrencySymbols();
for (var code in symbolssarr) { for (var code in symbolssarr) {
if (symbolssarr.hasOwnProperty(code)) { if (symbolssarr.hasOwnProperty(code)) {
@ -523,7 +523,8 @@ define([
txtAs16: 'As sixteenths (8/16)', txtAs16: 'As sixteenths (8/16)',
txtAs10: 'As tenths (5/10)', txtAs10: 'As tenths (5/10)',
txtAs100: 'As hundredths (50/100)', txtAs100: 'As hundredths (50/100)',
txtSample: 'Sample:' txtSample: 'Sample:',
txtNone: 'None'
}, SSE.Views.FormatSettingsDialog || {})) }, SSE.Views.FormatSettingsDialog || {}))
}); });

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

@ -1258,6 +1258,7 @@
"SSE.Views.FormatSettingsDialog.txtUpto1": "Up to one digit (1/3)", "SSE.Views.FormatSettingsDialog.txtUpto1": "Up to one digit (1/3)",
"SSE.Views.FormatSettingsDialog.txtUpto2": "Up to two digits (12/25)", "SSE.Views.FormatSettingsDialog.txtUpto2": "Up to two digits (12/25)",
"SSE.Views.FormatSettingsDialog.txtUpto3": "Up to three digits (131/135)", "SSE.Views.FormatSettingsDialog.txtUpto3": "Up to three digits (131/135)",
"SSE.Views.FormatSettingsDialog.txtNone": "None",
"SSE.Views.FormulaDialog.cancelButtonText": "Cancel", "SSE.Views.FormulaDialog.cancelButtonText": "Cancel",
"SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.okButtonText": "OK",
"SSE.Views.FormulaDialog.sCategoryAll": "All", "SSE.Views.FormulaDialog.sCategoryAll": "All",