Commit 46c33645 authored by Alexander.Trofimov's avatar Alexander.Trofimov

asc_getLocaleExample2 -> asc_getLocaleExample

parent 90351374
...@@ -217,33 +217,14 @@ var editor; ...@@ -217,33 +217,14 @@ var editor;
this.asc_SendThemeColors(_ret_array, standart_colors); this.asc_SendThemeColors(_ret_array, standart_colors);
}; };
spreadsheet_api.prototype.asc_getLocaleExample = function(val, number, date) { spreadsheet_api.prototype.asc_getCurrencySymbols = function () {
var res = '';
var cultureInfo = AscCommon.g_aCultureInfos[val];
if (cultureInfo) {
var numFormatDigit = AscCommon.oNumFormatCache.get('#,##0.00');
var formatDate = AscCommon.getShortDateFormat(cultureInfo);
formatDate += " h:mm";
if (cultureInfo.AMDesignator && cultureInfo.PMDesignator) {
formatDate += " AM/PM";
}
var numFormatDate = AscCommon.oNumFormatCache.get(formatDate);
res += numFormatDigit.formatToChart(number, cultureInfo);
res += '; ';
res += numFormatDate.formatToChart(date.getExcelDateWithTime(), cultureInfo);
}
return res;
};
spreadsheet_api.prototype.asc_getCurrencySymbols = function () {
var result = {}; var result = {};
for (var key in AscCommon.g_aCultureInfos) { for (var key in AscCommon.g_aCultureInfos) {
result[key] = AscCommon.g_aCultureInfos[key].CurrencySymbol; result[key] = AscCommon.g_aCultureInfos[key].CurrencySymbol;
} }
return result; return result;
}; };
spreadsheet_api.prototype.asc_getLocaleExample2 = function(format, value, culture) { spreadsheet_api.prototype.asc_getLocaleExample = function(format, value, culture) {
var cultureInfo = AscCommon.g_aCultureInfos[culture] || AscCommon.g_oDefaultCultureInfo; var cultureInfo = AscCommon.g_aCultureInfos[culture] || AscCommon.g_oDefaultCultureInfo;
var numFormat = AscCommon.oNumFormatCache.get(format); var numFormat = AscCommon.oNumFormatCache.get(format);
var res; var res;
...@@ -3378,9 +3359,8 @@ var editor; ...@@ -3378,9 +3359,8 @@ var editor;
prot["asc_GetFontThumbnailsPath"] = prot.asc_GetFontThumbnailsPath; prot["asc_GetFontThumbnailsPath"] = prot.asc_GetFontThumbnailsPath;
prot["asc_setDocInfo"] = prot.asc_setDocInfo; prot["asc_setDocInfo"] = prot.asc_setDocInfo;
prot["asc_getLocaleExample"] = prot.asc_getLocaleExample;
prot['asc_getCurrencySymbols'] = prot.asc_getCurrencySymbols; prot['asc_getCurrencySymbols'] = prot.asc_getCurrencySymbols;
prot['asc_getLocaleExample2'] = prot.asc_getLocaleExample2; prot['asc_getLocaleExample'] = prot.asc_getLocaleExample;
prot['asc_getFormatCells'] = prot.asc_getFormatCells; prot['asc_getFormatCells'] = prot.asc_getFormatCells;
prot["asc_getLocaleCurrency"] = prot.asc_getLocaleCurrency; prot["asc_getLocaleCurrency"] = prot.asc_getLocaleCurrency;
prot["asc_setLocale"] = prot.asc_setLocale; prot["asc_setLocale"] = prot.asc_setLocale;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment