diff --git a/Gruntfile.js b/Gruntfile.js index e098fa430..42caf8a37 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -197,9 +197,8 @@ module.exports = function (grunt) { "src/core/alias.js", "src/core/inject.js", "src/core/utils/*.js", - - "utils/date.i18n.js", - "public/js/fineui.i18n.js", + "i18n/date.i18n.cn.js", + "i18n/i18n.cn.js", "src/data/data.js", "src/data/**/*.js" ], diff --git a/utils/date.i18n.js b/i18n/date.i18n.cn.js similarity index 94% rename from utils/date.i18n.js rename to i18n/date.i18n.cn.js index 926dc621e..79e294934 100644 --- a/utils/date.i18n.js +++ b/i18n/date.i18n.cn.js @@ -39,7 +39,7 @@ BI.Date._MN = [ "九月", "十月", "十一月", - "十二月",]; + "十二月"]; // short month names BI.Date._SMN = [0, @@ -64,4 +64,4 @@ BI.Date._QN = ["", "第1季度", BI.Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; // 实际上无论周几作为一周的第一天,周初周末都是在-6-0间做偏移,用一个数组就可以 -BI.Date._OFFSET = [0, -1, -2, -3, -4, -5, -6]; \ No newline at end of file +BI.Date._OFFSET = [0, -1, -2, -3, -4, -5, -6]; diff --git a/public/js/fineui.i18n.js b/i18n/i18n.cn.js similarity index 99% rename from public/js/fineui.i18n.js rename to i18n/i18n.cn.js index ac34376c7..f6db1c351 100644 --- a/public/js/fineui.i18n.js +++ b/i18n/i18n.cn.js @@ -144,9 +144,9 @@ BI.i18n = { "BI-Basic_Current_Quarter": "本季度", "BI-Basic_Year_Month": "年月", "BI-Basic_Year_Quarter": "年季度", - "BI-Basic_Input_From_To_Number": "请输入{R1}的数值", "BI-Basic_Input_Can_Not_Null": "输入框不能为空", "BI-Basic_Date_Time_Error_Text": "日期格式示例:2015-3-11 00:00:00", + "BI-Basic_Input_From_To_Number": "请输入{R1}的数值", "BI-Basic_Or": "或", "BI-Basic_And": "且", "BI-Conf_Add_Formula": "添加公式", @@ -185,5 +185,6 @@ BI.i18n = { "BI-Basic_Million": "百万", "BI-Basic_Billion": "亿", "BI-Basic_Quarter": "季度", - "BI-Basic_No_Select": "不选" + "BI-Basic_No_Select": "不选", + "BI-Basic_Now": "此刻" }; \ No newline at end of file diff --git a/dist/i18n/i18n.en.js b/i18n/i18n.en.js similarity index 100% rename from dist/i18n/i18n.en.js rename to i18n/i18n.en.js