From 5c092c45e57672d03b475fd21e0ce2ec660908ce Mon Sep 17 00:00:00 2001
From: iapyang <yklorse@gmail.com>
Date: Fri, 8 Mar 2019 14:43:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E5=88=B0i18n?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gruntfile.js                                | 5 ++---
 utils/date.i18n.js => i18n/date.i18n.cn.js  | 4 ++--
 public/js/fineui.i18n.js => i18n/i18n.cn.js | 5 +++--
 {dist/i18n => i18n}/i18n.en.js              | 0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename utils/date.i18n.js => i18n/date.i18n.cn.js (94%)
 rename public/js/fineui.i18n.js => i18n/i18n.cn.js (99%)
 rename {dist/i18n => i18n}/i18n.en.js (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index e098fa4302..42caf8a376 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 926dc621e3..79e294934f 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 ac34376c7c..f6db1c3515 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