国际化

src/controllers/ifFormulaGenerator.js

@@ -4,13 +4,16 @@ import luckysheetupdateCell from './updateCell';
 import { modelHTML } from './constant';
 import { replaceHtml } from '../utils/util';
 import Store from '../store';
+import locale from '../locale/locale';
 
 //if公式生成器
 const ifFormulaGenerator = {
     singleRangeFocus: false,
     init: function(){
         let _this = this;
-
+        const _locale = locale();
+        const locale_formula = _locale.formula;
+        const locale_button = _locale.button;
         //点击选择单元格
         $(document).off("focus.IFcompareValue").on("focus.IFcompareValue", "#luckysheet-ifFormulaGenerator-dialog #compareValue", function(){
             $("#luckysheet-modal-dialog-mask").hide();
@@ -143,7 +146,7 @@ const ifFormulaGenerator = {
         $(document).off("click.IFcreateBtn").on("click.IFcreateBtn", "#luckysheet-ifFormulaGenerator-dialog #createBtn", function(){
             let compareValue = $(this).parents("#luckysheet-ifFormulaGenerator-dialog").find("#compareValue").val().trim();
             if(compareValue == ""){
-                _this.info("比较值不能为空！");
+                _this.info(locale_formula.ifGenTipNotNullValue);
                 return;
             }
 
@@ -161,7 +164,7 @@ const ifFormulaGenerator = {
                                         '<option value="1" selected="selected"> < </option>'+
                                     '</select>'+
                                     '<input type="number" class="largeNum formulaInputFocus"/>'+
-                                    '<span>标签：</span>'+
+                                    '<span>'+locale_formula.ifGenTipLableTitile+'：</span>'+
                                     '<input type="text" class="markText formulaInputFocus" value="">'+
                                     '<i class="fa fa-remove" aria-hidden="true"></i>'+
                                 '</div>';
@@ -173,11 +176,11 @@ const ifFormulaGenerator = {
                 let DivisionMethodVal = $(this).parents("#luckysheet-ifFormulaGenerator-dialog").find("#DivisionMethodVal").val().trim();
                 
                 if(smallRange == "" || largeRange == ""){
-                    _this.info("范围不能为空！");
+                    _this.info(locale_formula.ifGenTipRangeNotforNull);
                     return;
                 }
                 else if(DivisionMethodVal == ""){
-                    _this.info("划分值不能为空！");
+                    _this.info(locale_formula.ifGenTipCutValueNotforNull);
                     return;
                 }
 
@@ -204,7 +207,7 @@ const ifFormulaGenerator = {
 
                 let markText = $(e).find(".markText").val().trim();
                 if(markText == ""){
-                    markText = "标签" + (i + 1);
+                    markText = locale_formula.ifGenTipLableTitile + (i + 1);
                 }
 
                 if(smallNum == "" && largeNum == ""){
@@ -247,7 +250,7 @@ const ifFormulaGenerator = {
             })
             
             if(str.length == 0){
-                _this.info("没有生成可用的条件！");
+                _this.info(locale_formula.ifGenTipNotGenCondition);
                 return;
             }
 
@@ -281,6 +284,10 @@ const ifFormulaGenerator = {
     ifFormulaDialog: function(fp){
         let _this = this;
 
+        const _locale = locale();
+        const locale_formula = _locale.formula;
+        const locale_button = _locale.button;
+
         $("#luckysheet-modal-dialog-mask").show();
         $("#luckysheet-ifFormulaGenerator-dialog").remove();
 
@@ -321,7 +328,7 @@ const ifFormulaGenerator = {
                                         '<option value="1" selected="selected"> < </option>'+
                                     '</select>'+
                                     '<input type="number" class="largeNum formulaInputFocus" value="'+ largeNum +'"/>'+
-                                    '<span>标签：</span>'+
+                                    '<span>'+locale_formula.ifGenTipLableTitile+'：</span>'+
                                     '<input type="text" class="markText formulaInputFocus" value="'+ markText +'">'+
                                     '<i class="fa fa-remove" aria-hidden="true"></i>'+
                                 '</div>'; 
@@ -331,31 +338,31 @@ const ifFormulaGenerator = {
 
         let content = '<div class="ifAttr">'+
                         '<div class="attrBox">'+
-                            '<label for="compareValue"> 比较值 </label>'+
+                            '<label for="compareValue"> '+ locale_formula.ifGenCompareValueTitle +' </label>'+
                             '<div class="inpBox">'+
                                 '<input id="compareValue" class="formulaInputFocus" value="'+ compareValue +'"/>'+
-                                '<i class="singRange fa fa-table" aria-hidden="true" title="点击选择单元格"></i>'+
+                                '<i class="singRange fa fa-table" aria-hidden="true" title="'+ locale_formula.ifGenSelectCellTitle +'"></i>'+
                             '</div>'+
                         '</div>'+
                         '<div class="attrBox">'+
-                            '<label for="smallRange"> 范围 </label>'+
+                            '<label for="smallRange"> '+ locale_formula.ifGenRangeTitle +' </label>'+
                             '<input type="number" id="smallRange" class="formulaInputFocus"/>'+
-                            '<span class="text"> 至 </span>'+
+                            '<span class="text"> '+ locale_formula.ifGenRangeTo +' </span>'+
                             '<input type="number" id="largeRange" class="formulaInputFocus"/>'+
                             '<div id="rangeAssess">'+
-                                '<span> 范围评估 </span>'+
-                                '<i class="multiRange fa fa-table" aria-hidden="true" title="点击选择范围"></i>'+
+                                '<span> '+ locale_formula.ifGenRangeEvaluate +' </span>'+
+                                '<i class="multiRange fa fa-table" aria-hidden="true" title="'+ locale_formula.ifGenSelectRangeTitle +'"></i>'+
                             '</div>'+
                         '</div>'+
                         '<div class="attrBox">'+
-                            '<label for="DivisionMethod"> 划分方式 </label>'+
+                            '<label for="DivisionMethod"> '+ locale_formula.ifGenCutWay +' </label>'+
                             '<select id="DivisionMethod">'+
-                                '<option value="0"> 划分值相同 </option>'+
-                                '<option value="1"> 划分为N份 </option>'+
-                                '<option value="2"> 自定义输入 </option>'+
+                                '<option value="0"> '+ locale_formula.ifGenCutSame +' </option>'+
+                                '<option value="1"> '+ locale_formula.ifGenCutNpiece +' </option>'+
+                                '<option value="2"> '+ locale_formula.ifGenCutCustom +' </option>'+
                             '</select>'+
                             '<input id="DivisionMethodVal" class="formulaInputFocus"/>'+
-                            '<div id="createBtn"> 生成 </div>'+
+                            '<div id="createBtn"> '+ locale_formula.ifGenCutSame +' </div>'+
                         '</div>'+
                       '</div>'+
                       '<div class="ifList">'+ifListHtml+'</div>';
@@ -363,9 +370,9 @@ const ifFormulaGenerator = {
         $("body").append(replaceHtml(modelHTML, { 
             "id": "luckysheet-ifFormulaGenerator-dialog", 
             "addclass": "luckysheet-ifFormulaGenerator-dialog", 
-            "title": "if公式生成器", 
+            "title": locale_formula.ifGenerate, 
             "content": content, 
-            "botton": '<button id="luckysheet-ifFormulaGenerator-dialog-confirm" class="btn btn-primary">确认</button><button class="btn btn-default luckysheet-model-close-btn">取消</button>', 
+            "botton": '<button id="luckysheet-ifFormulaGenerator-dialog-confirm" class="btn btn-primary">'+locale_button.confirm+'</button><button class="btn btn-default luckysheet-model-close-btn">'+locale_button.cancel+'</button>', 
             "style": "z-index:100003" 
         }));
         let $t = $("#luckysheet-ifFormulaGenerator-dialog").find(".luckysheet-modal-dialog-content").css("min-width", 590).end(), 
@@ -417,6 +424,10 @@ const ifFormulaGenerator = {
         $("#luckysheet-ifFormulaGenerator-dialog").hide();
         $("#luckysheet-ifFormulaGenerator-singleRange-dialog").remove();
 
+        const _locale = locale();
+        const locale_formula = _locale.formula;
+        const locale_button = _locale.button;
+
         if(value == null){
             value = "";
         }
@@ -424,9 +435,9 @@ const ifFormulaGenerator = {
         $("body").append(replaceHtml(modelHTML, { 
             "id": "luckysheet-ifFormulaGenerator-singleRange-dialog", 
             "addclass": "luckysheet-ifFormulaGenerator-singleRange-dialog", 
-            "title": "选择单元格", 
-            "content": '<input readonly="readonly" placeholder="请选择单元格" value="'+ value +'">', 
-            "botton": '<button id="luckysheet-ifFormulaGenerator-singleRange-confirm" class="btn btn-primary">确认</button><button id="luckysheet-ifFormulaGenerator-singleRange-cancel" class="btn btn-default">取消</button>', 
+            "title": locale_formula.ifGenTipSelectCell, 
+            "content": '<input readonly="readonly" placeholder="'+locale_formula.ifGenTipSelectCellPlace+'" value="'+ value +'">', 
+            "botton": '<button id="luckysheet-ifFormulaGenerator-singleRange-confirm" class="btn btn-primary">'+locale_button.confirm+'</button><button id="luckysheet-ifFormulaGenerator-singleRange-cancel" class="btn btn-default">'+locale_button.cancel+'</button>', 
             "style": "z-index:100003" 
         }));
         let $t = $("#luckysheet-ifFormulaGenerator-singleRange-dialog").find(".luckysheet-modal-dialog-content").css("min-width", 400).end(), 
@@ -441,12 +452,16 @@ const ifFormulaGenerator = {
         $("#luckysheet-ifFormulaGenerator-dialog").hide();
         $("#luckysheet-ifFormulaGenerator-multiRange-dialog").remove();
 
+        const _locale = locale();
+        const locale_formula = _locale.formula;
+        const locale_button = _locale.button;
+
         $("body").append(replaceHtml(modelHTML, { 
             "id": "luckysheet-ifFormulaGenerator-multiRange-dialog", 
             "addclass": "luckysheet-ifFormulaGenerator-multiRange-dialog", 
-            "title": "选择范围", 
-            "content": '<input readonly="readonly" placeholder="请选择范围" value="">', 
-            "botton": '<button id="luckysheet-ifFormulaGenerator-multiRange-confirm" class="btn btn-primary">确认</button><button id="luckysheet-ifFormulaGenerator-multiRange-cancel" class="btn btn-default">取消</button>', 
+            "title": locale_formula.ifGenTipSelectRange, 
+            "content": '<input readonly="readonly" placeholder="'+locale_formula.ifGenTipSelectRangePlace+'" value="">', 
+            "botton": '<button id="luckysheet-ifFormulaGenerator-multiRange-confirm" class="btn btn-primary">'+locale_button.confirm+'</button><button id="luckysheet-ifFormulaGenerator-multiRange-cancel" class="btn btn-default">'+locale_button.cancel+'</button>', 
             "style": "z-index:100003" 
         }));
         let $t = $("#luckysheet-ifFormulaGenerator-multiRange-dialog").find(".luckysheet-modal-dialog-content").css("min-width", 400).end(), 
@@ -514,7 +529,7 @@ const ifFormulaGenerator = {
                                     '<option value="1" selected="selected"> < </option>'+
                                 '</select>'+
                                 '<input type="number" class="largeNum formulaInputFocus" value="'+ arr[j + 1] +'"/>'+
-                                '<span>标签：</span>'+
+                                '<span>'+locale_formula.ifGenTipLableTitile+'：</span>'+
                                 '<input type="text" class="markText formulaInputFocus" value="'+ markText +'">'+
                                 '<i class="fa fa-remove" aria-hidden="true"></i>'+
                             '</div>';
@@ -525,12 +540,15 @@ const ifFormulaGenerator = {
         $("#luckysheet-modal-dialog-mask").show();
         $("#luckysheet-ifFormulaGenerator-info").remove();
 
+        const _locale = locale();
+        const locale_button = _locale.button;
+
         $("body").append(replaceHtml(modelHTML, { 
             "id": "luckysheet-ifFormulaGenerator-info", 
             "addclass": "", 
             "title": title, 
             "content": "", 
-            "botton": '<button class="btn btn-default luckysheet-model-close-btn">&nbsp;&nbsp;关闭&nbsp;&nbsp;</button>', 
+            "botton": '<button class="btn btn-default luckysheet-model-close-btn">&nbsp;&nbsp;'+locale_button.close+'&nbsp;&nbsp;</button>', 
             "style": "z-index:100003" 
         }));
         let $t = $("#luckysheet-ifFormulaGenerator-info").find(".luckysheet-modal-dialog-content").css("min-width", 300).end(), 

src/controllers/insertFormula.js

@@ -7,11 +7,15 @@ import { modelHTML } from './constant';
 import { luckysheet_count_show } from './select';
 import { replaceHtml, getObjType } from '../utils/util';
 import Store from '../store';
+import locale from '../locale/locale';
 
 //插入函数
 const insertFormula = {
     init: function(){
         let _this = this;
+        let _locale = locale();
+        let locale_formulaMore = _locale.formulaMore;
+        let locale_button = _locale.button
 
         $(document).off("keyup.fxSFLI").on("keyup.fxSFLI", "#searchFormulaListInput", function(){
             $("#formulaTypeList").empty();
@@ -92,7 +96,7 @@ const insertFormula = {
                 let parmCount = $("#luckysheet-search-formula-parm .parmBox").length;
 
                 if(parmCount < 5 && parmIndex == (parmCount - 1)){
-                    $('<div class="parmBox"><div class="name">值'+ (parmCount + 1) +'</div><div class="txt"><input class="formulaInputFocus" /><i class="fa fa-table" aria-hidden="true" title="点击选择数据范围"></i></div><div class="val">=</div></div>').appendTo($("#luckysheet-search-formula-parm .parmListBox"));
+                    $('<div class="parmBox"><div class="name">'+ locale_formulaMore.valueTitle +''+ (parmCount + 1) +'</div><div class="txt"><input class="formulaInputFocus" /><i class="fa fa-table" aria-hidden="true" title="'+locale_formulaMore.tipSelectDataRange+'"></i></div><div class="val">=</div></div>').appendTo($("#luckysheet-search-formula-parm .parmListBox"));
                 }
             }
         });
@@ -133,9 +137,9 @@ const insertFormula = {
                 $("body").append(replaceHtml(modelHTML, { 
                     "id": "luckysheet-search-formula-parm-select", 
                     "addclass": "luckysheet-search-formula-parm-select", 
-                    "title": "选取数据范围", 
-                    "content": "<input id='luckysheet-search-formula-parm-select-input' class='luckysheet-datavisual-range-container' style='font-size: 14px;padding:5px;max-width:none;' spellcheck='false' aria-label='数据范围' readonly='true' placeholder='数据范围'>", 
-                    "botton": '<button id="luckysheet-search-formula-parm-select-confirm" class="btn btn-primary">确认</button>', 
+                    "title": locale_formulaMore.tipSelectDataRange, 
+                    "content": "<input id='luckysheet-search-formula-parm-select-input' class='luckysheet-datavisual-range-container' style='font-size: 14px;padding:5px;max-width:none;' spellcheck='false' aria-label='"+ locale_formulaMore.tipDataRangeTile +"' readonly='true' placeholder='"+ locale_formulaMore.tipDataRangeTile +"'>", 
+                    "botton": '<button id="luckysheet-search-formula-parm-select-confirm" class="btn btn-primary">'+locale_button.confirm+'</button>', 
                     "style": "z-index:100003" 
                 }));
             }
@@ -143,9 +147,9 @@ const insertFormula = {
                 $("body").append(replaceHtml(modelHTML, { 
                     "id": "luckysheet-search-formula-parm-select", 
                     "addclass": "luckysheet-search-formula-parm-select", 
-                    "title": "选取数据范围", 
-                    "content": "<input id='luckysheet-search-formula-parm-select-input' class='luckysheet-datavisual-range-container' style='font-size: 14px;padding:5px;max-width:none;' spellcheck='false' aria-label='数据范围' readonly='true' value='"+ $(this).parents(".parmBox").find(".txt input").val() +"'>", 
-                    "botton": '<button id="luckysheet-search-formula-parm-select-confirm" class="btn btn-primary">确认</button>', 
+                    "title": locale_formulaMore.tipSelectDataRange, 
+                    "content": "<input id='luckysheet-search-formula-parm-select-input' class='luckysheet-datavisual-range-container' style='font-size: 14px;padding:5px;max-width:none;' spellcheck='false' aria-label='"+ locale_formulaMore.tipDataRangeTile +"' readonly='true' value='"+ $(this).parents(".parmBox").find(".txt input").val() +"'>", 
+                    "botton": '<button id="luckysheet-search-formula-parm-select-confirm" class="btn btn-primary">'+locale_button.confirm+'</button>', 
                     "style": "z-index:100003" 
                 }));
             }
@@ -178,6 +182,10 @@ const insertFormula = {
     formulaListDialog: function(){
         let _this = this;
 
+        let _locale = locale();
+        let locale_formulaMore = _locale.formulaMore;
+        let locale_button = _locale.button
+
         $("#luckysheet-modal-dialog-mask").show();
         $("#luckysheet-search-formula").remove();
 
@@ -185,8 +193,8 @@ const insertFormula = {
             "id": "luckysheet-search-formula", 
             "addclass": "luckysheet-search-formula", 
             "title": "", 
-            "content": "<div class='inpbox'><label for='searchFormulaListInput'>查找函数：</label><input class='formulaInputFocus' id='searchFormulaListInput' placeholder='请输入您要查找的函数名称或函数功能的简要描述' spellcheck='false'/></div><div class='selbox'><label>或选择类别：</label><select id='formulaTypeSelect'><option value='0'>数学</option><option value='1'>统计</option><option value='2'>查找</option><option value='3'>Luckysheet内置</option><option value='4'>数据挖掘</option><option value='5'>数据源</option><option value='6'>日期</option><option value='7'>过滤器</option><option value='8'>财务</option><option value='9'>工程计算</option><option value='10'>逻辑</option><option value='11'>运算符</option><option value='12'>文本</option><option value='13'>转换工具</option><option value='14'>数组</option><option value='-1'>其它</option></select></div><div class='listbox'><label>选择函数：</label><div id='formulaTypeList'></div></div>", 
-            "botton": '<button id="luckysheet-search-formula-confirm" class="btn btn-primary">确认</button><button class="btn btn-default luckysheet-model-close-btn">取消</button>', 
+            "content": "<div class='inpbox'><label for='searchFormulaListInput'>"+ locale_formulaMore.findFunctionTitle +"：</label><input class='formulaInputFocus' id='searchFormulaListInput' placeholder='"+ locale_formulaMore.tipInputFunctionName +"' spellcheck='false'/></div><div class='selbox'><label>或选择类别：</label><select id='formulaTypeSelect'><option value='0'>"+locale_formulaMore.Math+"</option><option value='1'>"+locale_formulaMore.Statistical+"</option><option value='2'>"+locale_formulaMore.Lookup+"</option><option value='3'>"+locale_formulaMore.luckysheet+"</option><option value='4'>"+locale_formulaMore.dataMining+"</option><option value='5'>"+locale_formulaMore.Database+"</option><option value='6'>"+locale_formulaMore.Date+"</option><option value='7'>"+locale_formulaMore.Filter+"</option><option value='8'>"+locale_formulaMore.Financial+"</option><option value='9'>"+locale_formulaMore.Engineering+"</option><option value='10'>"+locale_formulaMore.Logical+"</option><option value='11'>"+locale_formulaMore.Operator+"</option><option value='12'>"+locale_formulaMore.Text+"</option><option value='13'>"+locale_formulaMore.Parser+"</option><option value='14'>"+locale_formulaMore.Array+"</option><option value='-1'>"+locale_formulaMore.other+"</option></select></div><div class='listbox'><label>"+locale_formulaMore.selectFunctionTitle+"：</label><div id='formulaTypeList'></div></div>", 
+            "botton": '<button id="luckysheet-search-formula-confirm" class="btn btn-primary">'+locale_button.confirm+'</button><button class="btn btn-default luckysheet-model-close-btn">'+locale_button.cancel+'</button>', 
             "style": "z-index:100003" 
         }));
         let $t = $("#luckysheet-search-formula").find(".luckysheet-modal-dialog-content").css("min-width", 300).end(), 
@@ -215,6 +223,10 @@ const insertFormula = {
             parm_content = '',
             parm_list_content = '';
 
+        let _locale = locale();
+        let locale_formulaMore = _locale.formulaMore;
+        let locale_button = _locale.button
+
         for(let i = 0; i < functionlist.length; i++){
             if(functionlist[i].n == formulaTxt.toUpperCase()){
                 parm_title = functionlist[i].n;
@@ -226,7 +238,7 @@ const insertFormula = {
                                                 '<div class="name">'+ functionlist[i].p[j].name +'</div>'+
                                                 '<div class="txt">'+
                                                     '<input class="formulaInputFocus" spellcheck="false"/>' +
-                                                    '<i class="fa fa-table" aria-hidden="true" title="点击选择数据范围"></i>'+
+                                                    '<i class="fa fa-table" aria-hidden="true" title="'+locale_formulaMore.tipSelectDataRange+'"></i>'+
                                                 '</div>'+
                                                 '<div class="val">=</div>'+
                                              '</div>';
@@ -241,7 +253,7 @@ const insertFormula = {
                                                 '<div class="name">'+ functionlist[i].p[j].name +'</div>'+
                                                 '<div class="txt">'+
                                                     '<input class="formulaInputFocus" value="'+ parm[j] +'" spellcheck="false"/>'+
-                                                    '<i class="fa fa-table" aria-hidden="true" title="点击选择数据范围"></i>'+
+                                                    '<i class="fa fa-table" aria-hidden="true" title="'+locale_formulaMore.tipSelectDataRange+'"></i>'+
                                                 '</div>'+
                                                 '<div class="val">=</div>'+
                                              '</div>';
@@ -252,7 +264,7 @@ const insertFormula = {
                                     '<div class="parmListBox">'+ parm_list_content +'</div>'+
                                     '<div class="formulaDetails">'+ functionlist[i].d +'</div>'+
                                     '<div class="parmDetailsBox"></div>'+
-                                    '<div class="result">计算结果 = <span></span></div>'+
+                                    '<div class="result">'+locale_formulaMore.calculationResult+' = <span></span></div>'+
                                 '</div>';
             }
         }
@@ -266,7 +278,7 @@ const insertFormula = {
             "addclass": "luckysheet-search-formula-parm", 
             "title": parm_title, 
             "content": parm_content, 
-            "botton": '<button id="luckysheet-search-formula-parm-confirm" class="btn btn-primary">确认</button><button class="btn btn-default luckysheet-model-close-btn">取消</button>', 
+            "botton": '<button id="luckysheet-search-formula-parm-confirm" class="btn btn-primary">'+locale_button.confirm+'</button><button class="btn btn-default luckysheet-model-close-btn">'+locale_button.cancel+'</button>', 
             "style": "z-index:100003" 
         }));
         let $t = $("#luckysheet-search-formula-parm").find(".luckysheet-modal-dialog-content").css("min-width", 300).end(), 

src/controllers/menuButton.js

@@ -1933,17 +1933,20 @@ const menuButton = {
         $("#luckysheet-icon-function-menu").click(function(){
             let menuButtonId = $(this).attr("id") + "-menuButton";
             let $menuButton = $("#" + menuButtonId);
+
+            const _locale = locale();
+            const locale_formula = _locale.formula;
             
             if($menuButton.length == 0){
                 let itemdata = [
-                    {"text": "求和", "value": "SUM", "example": 'SUM'},
-                    {"text": "平均值", "value": "AVERAGE", "example": 'AVERAGE'},
-                    {"text": "计数", "value": "COUNT", "example": 'COUNT'},
-                    {"text": "最大值", "value": "MAX", "example": 'MAX'},
-                    {"text": "最小值", "value": "MIN", "example": 'MIN'},
+                    {"text": locale_formula.sum, "value": "SUM", "example": 'SUM'},
+                    {"text": locale_formula.average, "value": "AVERAGE", "example": 'AVERAGE'},
+                    {"text": locale_formula.count, "value": "COUNT", "example": 'COUNT'},
+                    {"text": locale_formula.max, "value": "MAX", "example": 'MAX'},
+                    {"text": locale_formula.min, "value": "MIN", "example": 'MIN'},
                     {"text": "", "value": "split", "example": ""},
-                    {"text": "if公式生成器", "value": "if", "example": 'IF'},
-                    {"text": "函数查找 ...", "value": "formula", "example": ""}
+                    {"text": locale_formula.ifGenerate, "value": "if", "example": 'IF'},
+                    {"text": locale_formula.find+" ...", "value": "formula", "example": ""}
                 ];
 
                 let itemset = _this.createButtonMenu(itemdata);
@@ -1951,7 +1954,7 @@ const menuButton = {
                 let menu = replaceHtml(_this.menu, { "id": "function-menu", "item": itemset, "subclass": "", "sub": "" });
 
                 $("body").append(menu);
-                $menuButton = $("#" + menuButtonId).width(150);
+                $menuButton = $("#" + menuButtonId).width(180);
 
                 $menuButton.find(".luckysheet-cols-menuitem").click(function(){
                     $menuButton.hide();
@@ -1972,10 +1975,10 @@ const menuButton = {
                             }
                             else{
                                 if(isEditMode()){
-                                    alert("该单元格函数不属于if公式！");
+                                    alert(locale_formula.tipNotBelongToIf);
                                 }
                                 else{
-                                    tooltip.info("该单元格函数不属于if公式！","");
+                                    tooltip.info(locale_formula.tipNotBelongToIf,"");
                                 }
                                 return;
                             }
@@ -1990,10 +1993,10 @@ const menuButton = {
                         //点击函数查找弹出框
                         if(Store.luckysheet_select_save.length == 0){
                             if(isEditMode()){
-                                alert("请选择单元格插入函数");
+                                alert(locale_formula.tipSelectCell);
                             }
                             else{
-                                tooltip.info("请选择单元格插入函数","");
+                                tooltip.info(locale_formula.tipSelectCell,"");
                             }
 
                             return;

src/css/luckysheet-core.css

@@ -5752,7 +5752,7 @@ fieldset[disabled] a.btn {
 }
 #luckysheet-ifFormulaGenerator-dialog .ifAttr .attrBox label{
     display: block;
-    width: 50px;
+    width: 100px;
     height: 100%;
     line-height: 30px;
     padding: 0 5px;

src/locale/en.js

@@ -71,11 +71,11 @@ export default {
     button: {
         confirm: 'OK',
         cancel: 'Cancel',
-        colse:"close"
+        close:"Close"
     },
     paint:{
         start: 'Paint format start',
-        end: 'ESC key to exit',
+        end: 'ESC',
 
         tipSelectRange:"Please select the range to be copied",
         tipNotMulti:"Cannot perform this operation on multiple selection range",
@@ -676,5 +676,68 @@ export default {
         rimless: 'Rimless',
         bordered: 'Bordered',
     },
+    formula:{
+        sum:"Sum",
+        average:"Average",
+        count:"Count",
+        max:"Max",
+        min:"Min",
+        ifGenerate:"If formula generator",
+        find:"Learn more",
+
+        tipNotBelongToIf:"This cell function does not belong to the if formula!",
+        tipSelectCell:"Please select the cell to insert the function",
+
+        ifGenCompareValueTitle:"Comparison value",
+        ifGenSelectCellTitle:"Click to select cell",
+        ifGenRangeTitle:"Range",
+        ifGenRangeTo:"to",
+        ifGenRangeEvaluate:"Range evaluate",
+        ifGenSelectRangeTitle:"Click to select range",
+        ifGenCutWay:"Partition way",
+        ifGenCutSame:"Same Partition value",
+        ifGenCutNpiece:"Partition by N",
+        ifGenCutCustom:"Custom",
+        ifGenCutConfirm:"Confirm",
+
+        ifGenTipSelectCell:"Select cells",
+        ifGenTipSelectCellPlace:"Please select cells",
+
+        ifGenTipSelectRange:"Select range",
+        ifGenTipSelectRangePlace:"Please select range",
+
+        ifGenTipNotNullValue:"The comparison value cannot be empty!",
+        ifGenTipLableTitile:"Label",
+        ifGenTipRangeNotforNull:"The range cannot be empty!",
+        ifGenTipCutValueNotforNull:"The partition value cannot be empty!",
+        ifGenTipNotGenCondition:"No conditions are available for generation!",
+    },
+    formulaMore:{
+        valueTitle:"Value",
+        tipSelectDataRange:"Select data range",
+        tipDataRangeTile:"Data range",
+        findFunctionTitle:"Search function",
+        tipInputFunctionName:"Function name or brief description of function",
+
+        "Array":"Array",
+        "Database":"Database",
+        "Date":"Date",
+        "Engineering":"Engineering",
+        "Filter":"Filter",
+        "Financial":"Financial",
+        "luckysheet":"Luckysheet",
+        "other":"Other",
+        "Logical":"Logical",
+        "Lookup":"Lookup",
+        "Math":"Math",
+        "Operator":"Operator",
+        "Parser":"Parser",
+        "Statistical":"Statistical",
+        "Text":"Text",
+        "dataMining":"DataMining",
+
+        "selectFunctionTitle":"Select a function",
+        "calculationResult":"Result",
+    }
   };
   

src/locale/zh.js

@@ -71,7 +71,7 @@ export default {
     button: {
         confirm: '确定',
         cancel: '取消',
-        colse:"关闭"
+        close:"关闭"
     },
     paint: {
         start: '格式刷开启',
@@ -685,4 +685,67 @@ export default {
         rimless: '无边框',
         bordered: '有边框',
     },
+    formula:{
+        sum:"求和",
+        average:"平均值",
+        count:"计数",
+        max:"最大值",
+        min:"最小值",
+        ifGenerate:"if公式生成器",
+        find:"更多函数",
+
+        tipNotBelongToIf:"该单元格函数不属于if公式！",
+        tipSelectCell:"请选择单元格插入函数",
+
+        ifGenCompareValueTitle:"比较值",
+        ifGenSelectCellTitle:"点击选择单元格",
+        ifGenRangeTitle:"范围",
+        ifGenRangeTo:"至",
+        ifGenRangeEvaluate:"范围评估",
+        ifGenSelectRangeTitle:"点击选择范围",
+        ifGenCutWay:"划分方式",
+        ifGenCutSame:"划分值相同",
+        ifGenCutNpiece:"划分为N份",
+        ifGenCutCustom:"自定义输入",
+        ifGenCutConfirm:"生成",
+
+        ifGenTipSelectCell:"选择单元格",
+        ifGenTipSelectCellPlace:"请选择单元格",
+
+        ifGenTipSelectRange:"选择单范围",
+        ifGenTipSelectRangePlace:"请选择范围",
+
+        ifGenTipNotNullValue:"比较值不能为空！",
+        ifGenTipLableTitile:"标签",
+        ifGenTipRangeNotforNull:"范围不能为空！",
+        ifGenTipCutValueNotforNull:"划分值不能为空！",
+        ifGenTipNotGenCondition:"没有生成可用的条件！",
+    },
+    formulaMore:{
+        valueTitle:"值",
+        tipSelectDataRange:"选取数据范围",
+        tipDataRangeTile:"数据范围",
+        findFunctionTitle:"查找函数",
+        tipInputFunctionName:"请输入您要查找的函数名称或函数功能的简要描述",
+
+        "Array":"数组",
+        "Database":"数据源",
+        "Date":"日期",
+        "Engineering":"工程计算",
+        "Filter":"过滤器",
+        "Financial":"财务",
+        "luckysheet":"Luckysheet内置",
+        "other":"其它",
+        "Logical":"逻辑",
+        "Lookup":"查找",
+        "Math":"数学",
+        "Operator":"运算符",
+        "Parser":"转换工具",
+        "Statistical":"统计",
+        "Text":"文本",
+        "dataMining":"数据挖掘",
+
+        "selectFunctionTitle":"选择函数",
+        "calculationResult":"计算结果",
+    }
 };