From 6f4c259f6a37d55b2a02f75e3b2ce04e18d486c1 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 3 Aug 2020 23:06:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CHART-11549=20=E4=BF=AE=E6=94=B9=E7=AE=B1?= =?UTF-8?q?=E5=9E=8B=E5=9B=BE=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/chart.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/chart_en.properties | 2 ++ .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 2 ++ .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 2 ++ .../src/main/resources/com/fr/design/i18n/chart_zh.properties | 2 ++ .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 2 ++ 6 files changed, 12 insertions(+) diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties index 1c3c5cb..14a7291 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= Fine-Design_Chart_Data_Q3= Fine-Design_Chart_Data_Q1= +Fine-Design_Chart_Normal_Value= +Fine-Design_Chart_Outlier_Value= Fine-Design_Chart_Data_Not_Show_Cate= Fine-Design_Chart_Data_Not_Show_Series= Fine-Design_Chart_Data_Point_Tooltip= diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties index 0237505..142fd75 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum Fine-Design_Chart_Data_Q3=Upper quartile Fine-Design_Chart_Data_Q1=Lower quartile +Fine-Design_Chart_Normal_Value=Normal value +Fine-Design_Chart_Outlier_Value=Outliers Fine-Design_Chart_Data_Not_Show_Cate=No Display If Category Is Empty Fine-Design_Chart_Data_Not_Show_Series=No Display If Series Is Empty Fine-Design_Chart_Data_Point_Tooltip=Data Point Tips diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties index 85ae7d9..2aa3b1d 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D +Fine-Design_Chart_Normal_Value=\u901A\u5E38\u5024 +Fine-Design_Chart_Outlier_Value=\u5916\u308C\u5024 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Point_Tooltip=\u30C7\u30FC\u30BF\u30DD\u30A4\u30F3\u30C8\u306E\u30D2\u30F3\u30C8 diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties index 38071f8..e682365 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 Fine-Design_Chart_Data_Q3=\uC704 \uC0AC \uBD84\uC704 Fine-Design_Chart_Data_Q1=\uB0AE\uC740 \uC0AC \uBD84\uC704\uC218 +Fine-Design_Chart_Normal_Value=\uC815\uC0C1 \uAC12 +Fine-Design_Chart_Outlier_Value=\uD2B9\uC774 \uCE58 Fine-Design_Chart_Data_Not_Show_Cate=\uCE74\uD14C\uACE0\uB9AC\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Not_Show_Series=\uC2DC\uB9AC\uC988\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Point_Tooltip=\uB370\uC774\uD130 \uD234\uD301 diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties index 00154f1..0fa6380 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6570 Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6570 +Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C +Fine-Design_Chart_Outlier_Value=\u5F02\u5E38\u503C Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u7C7B\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u5206\u7C7B Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u7CFB\u5217 Fine-Design_Chart_Data_Point_Tooltip=\u6570\u636E\u70B9\u63D0\u793A diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties index 40faf8f..1e710a1 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties @@ -158,6 +158,8 @@ Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6578 Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6578 +Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C +Fine-Design_Chart_Outlier_Value=\u7570\u5E38\u503C Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u70BA\u7A7A\u6642\uFF0C\u4E0D\u986F\u793A\u8A72\u5206\u985E Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u70BA\u7A7A\u6642,\u4E0D\u986F\u793A\u8A72\u7CFB\u5217 Fine-Design_Chart_Data_Point_Tooltip=\u8CC7\u6599\u9EDE\u63D0\u793A From 12b09c6c25d58b8004baea8d80f2c51579632991 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 3 Aug 2020 23:16:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/com/fr/design/i18n/chart.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_en.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_ja_JP.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_ko_KR.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_zh.properties | 5 ----- .../main/resources/com/fr/design/i18n/chart_zh_TW.properties | 5 ----- 6 files changed, 30 deletions(-) diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties index c632145..c244a6d 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart.properties @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide= Fine-Design_Chart_Data_Max= Fine-Design_Chart_Data_Median= Fine-Design_Chart_Data_Min= -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3= -Fine-Design_Chart_Data_Q1= Fine-Design_Chart_Normal_Value= Fine-Design_Chart_Outlier_Value= -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate= Fine-Design_Chart_Data_Not_Show_Series= Fine-Design_Chart_Data_Number= diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties index f4f5d7d..3899988 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_en.properties @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=Datalabel Outside Fine-Design_Chart_Data_Max=Maximum Fine-Design_Chart_Data_Median=Median Fine-Design_Chart_Data_Min=Minimum -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=Upper quartile -Fine-Design_Chart_Data_Q1=Lower quartile Fine-Design_Chart_Normal_Value=Normal value Fine-Design_Chart_Outlier_Value=Outliers -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=No Display If Category Is Empty Fine-Design_Chart_Data_Not_Show_Series=No Display If Series Is Empty Fine-Design_Chart_Data_Number=Number of data diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties index 898aa98..d145d55 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ja_JP.properties @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\u30C7\u30FC\u30BF\u30E9\u30D9\u30EB\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u5024 Fine-Design_Chart_Data_Median=\u4E2D\u592E\u5024 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D -Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D Fine-Design_Chart_Normal_Value=\u901A\u5E38\u5024 Fine-Design_Chart_Outlier_Value=\u5916\u308C\u5024 -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u306F\u7A7A\u306E\u6642\u8868\u793A\u3055\u308C\u307E\u305B\u3093 Fine-Design_Chart_Data_Number=\u30C7\u30FC\u30BF\u6570 diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties index 7209da3..238f232 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_ko_KR.properties @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\uB77C\uBCA8 \uBC14\uAE65\uCABD Fine-Design_Chart_Data_Max=\uCD5C\uB300\uAC12 Fine-Design_Chart_Data_Median=\uC911\uC559\uAC12 Fine-Design_Chart_Data_Min=\uCD5C\uC18C\uAC12 -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=\uC704 \uC0AC \uBD84\uC704 -Fine-Design_Chart_Data_Q1=\uB0AE\uC740 \uC0AC \uBD84\uC704\uC218 Fine-Design_Chart_Normal_Value=\uC815\uC0C1 \uAC12 Fine-Design_Chart_Outlier_Value=\uD2B9\uC774 \uCE58 -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=\uCE74\uD14C\uACE0\uB9AC\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Not_Show_Series=\uC2DC\uB9AC\uC988\uAC00 \uBE44\uC600\uC744\uC2DC \uBCF4\uC5EC\uC8FC\uC9C0 \uC54A\uC74C Fine-Design_Chart_Data_Number=\uB370\uC774\uD130 \uC218 diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties index b539f90..bffadd4 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh.properties @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\u6570\u636E\u6807\u7B7E\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6570 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u503C -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6570 -Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6570 Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C Fine-Design_Chart_Outlier_Value=\u5F02\u5E38\u503C -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u7C7B\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u5206\u7C7B Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u4E3A\u7A7A\u65F6,\u4E0D\u663E\u793A\u8BE5\u7CFB\u5217 Fine-Design_Chart_Data_Number=\u6570\u636E\u4E2A\u6570 diff --git a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties index 9b6a0fa..b546315 100644 --- a/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties +++ b/design-i18n-chart/src/main/resources/com/fr/design/i18n/chart_zh_TW.properties @@ -155,13 +155,8 @@ Fine-Design_Chart_Data_Label_OutSide=\u8CC7\u6599\u6A19\u7C64\u5916 Fine-Design_Chart_Data_Max=\u6700\u5927\u503C Fine-Design_Chart_Data_Median=\u4E2D\u4F4D\u6578 Fine-Design_Chart_Data_Min=\u6700\u5C0F\u5024 -<<<<<<< HEAD -Fine-Design_Chart_Data_Q3=\u4E0A\u56DB\u5206\u4F4D\u6578 -Fine-Design_Chart_Data_Q1=\u4E0B\u56DB\u5206\u4F4D\u6578 Fine-Design_Chart_Normal_Value=\u6B63\u5E38\u503C Fine-Design_Chart_Outlier_Value=\u7570\u5E38\u503C -======= ->>>>>>> b01bae16a8029ecb8472bf98f05cd64426800563 Fine-Design_Chart_Data_Not_Show_Cate=\u5206\u985E\u70BA\u7A7A\u6642\uFF0C\u4E0D\u986F\u793A\u8A72\u5206\u985E Fine-Design_Chart_Data_Not_Show_Series=\u7CFB\u5217\u70BA\u7A7A\u6642,\u4E0D\u986F\u793A\u8A72\u7CFB\u5217 Fine-Design_Chart_Data_Number=\u6578\u64DA\u500B\u6578