diff --git a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js index 08a583996..326dfc60c 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormatSettingsDialog.js @@ -417,7 +417,7 @@ define([ me = this, valDecimal = (initFormatInfo) ? initFormatInfo.asc_getDecimalPlaces() : this.spnDecimal.getNumberValue(), 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) { 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 (hasSymbols) { if (!me.CurrencySymbolsData) { - me.CurrencySymbolsData = []; + me.CurrencySymbolsData = [{value: null, displayValue: me.txtNone}]; var symbolssarr = this.api.asc_getCurrencySymbols(); for (var code in symbolssarr) { if (symbolssarr.hasOwnProperty(code)) { @@ -523,7 +523,8 @@ define([ txtAs16: 'As sixteenths (8/16)', txtAs10: 'As tenths (5/10)', txtAs100: 'As hundredths (50/100)', - txtSample: 'Sample:' + txtSample: 'Sample:', + txtNone: 'None' }, SSE.Views.FormatSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 39ce8ce08..c393de08f 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1258,6 +1258,7 @@ "SSE.Views.FormatSettingsDialog.txtUpto1": "Up to one digit (1/3)", "SSE.Views.FormatSettingsDialog.txtUpto2": "Up to two digits (12/25)", "SSE.Views.FormatSettingsDialog.txtUpto3": "Up to three digits (131/135)", + "SSE.Views.FormatSettingsDialog.txtNone": "None", "SSE.Views.FormulaDialog.cancelButtonText": "Cancel", "SSE.Views.FormulaDialog.okButtonText": "OK", "SSE.Views.FormulaDialog.sCategoryAll": "All",