Wim.Zhai
|
c4a2380fa5
|
Merging in latest from upstream (DESIGN/design-i18n:refs/heads/release/10.0)
* commit '7b2b21e906c401141df5bcb717c6a827f4ea66da':
规范国际化
|
6 years ago |
 Alex.Sung
|
7b2b21e906
|
Merge pull request #80 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '0008a12a030d78b46bfd1ee4943653aaa44a1018':
规范国际化
|
6 years ago |
|
alex.sung
|
0008a12a03
|
规范国际化
|
6 years ago |
|
Wim.Zhai
|
ac8669c262
|
0810
|
6 years ago |
|
Wim.Zhai
|
5032b3af65
|
d0810
|
6 years ago |
 Harrison
|
7ffec0d1c5
|
Merge pull request #79 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit '07e1ddffccf84a7d240bd76408f40483aef2ac93':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
07e1ddffcc
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
Harrison
|
564ccb4e86
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
9fd77cecf7
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
|
6 years ago |
|
Alex.Sung
|
901c91710e
|
Merge pull request #78 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '60f1416f56c11ef3403025e0a1274b8b506826fa':
规范国际化文件及国际化定义。
|
6 years ago |
|
Harrison
|
545eb8feef
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
 Jinbokai
|
400a381e80
|
Merge pull request #77 in DESIGN/design-i18n from ~JINBOKAI/design-i18n:release/10.0 to release/10.0
* commit '4ec3fd98b2108daa8ab2cca2b5fb979568c07879':
chongtu
删除无用文件
designer-realize中i18nTextArray()替换为i18nText()方法
|
6 years ago |
|
Jinbokai
|
4ec3fd98b2
|
格式化
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
|
Jinbokai
|
7968582de9
|
chongtu
|
6 years ago |
|
alex.sung
|
60f1416f56
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design-i18n into release/10.0
|
6 years ago |
|
alex.sung
|
3ed5721d97
|
规范国际化文件及国际化定义。
|
6 years ago |
|
Jinbokai
|
f503f8b9bf
|
删除无用文件
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
|
Wim.Zhai
|
6398b46b76
|
Merge pull request #76 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
* commit '99b993e2b364b074ba7815af5191acfe2f30da6f':
modify on 0809
modify on 0809 change unit
modify on 0809
modify on 0808
|
6 years ago |
|
Wim.Zhai
|
99b993e2b3
|
change unit
|
6 years ago |
|
Jinbokai
|
ae9373bf7f
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
|
6 years ago |
|
Jinbokai
|
9ca5ae599d
|
designer-realize中i18nTextArray()替换为i18nText()方法
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
|
Harrison
|
9ba893c410
|
Merge pull request #75 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit 'c5901ab806c587c3106cc2a576a2a9dd8cfc6c51':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
c5901ab806
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
45d4f8c002
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Wim.Zhai
|
a2cc5180ba
|
modify on 0809
|
6 years ago |
|
Wim.Zhai
|
6f6af8e391
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design-i18n into release/10.0
|
6 years ago |
|
Alex.Sung
|
0a68cd4a47
|
Merge pull request #73 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '40d9a964263b6427a2b6e14a23c51594daf19ed0':
规范国际化
规范国际化
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
40d9a96426
|
规范国际化
|
6 years ago |
|
alex.sung
|
3541375d7a
|
规范国际化
|
6 years ago |
|
alex.sung
|
488ba152e3
|
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
70095f0f6c
|
规范国际化文件及国际化定义。
|
6 years ago |
|
Wim.Zhai
|
8f616cc1e0
|
modify on 0809 change unit
|
6 years ago |
|
Jinbokai
|
42416f0357
|
Merge pull request #71 in DESIGN/design-i18n from ~JINBOKAI/design-i18n:release/10.0 to release/10.0
* commit '8dde24bfaea50882fd2741e992c6a5d94700c107':
删除修改后多余的无用条目
删除无用条目
|
6 years ago |
|
Wim.Zhai
|
84c09663ac
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design-i18n into release/10.0
|
6 years ago |
|
Wim.Zhai
|
0c780a9090
|
modify on 0809
|
6 years ago |
|
Jinbokai
|
8dde24bfae
|
删除修改后多余的无用条目
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
|
Jinbokai
|
261904985b
|
删除无用条目
Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
|
6 years ago |
|
Alex.Sung
|
4112c07611
|
Merge pull request #70 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容
* commit '90747fc340cdf7239cf0ef3b83a4d9bffbbd2445':
规范国际化
规范国际化文件
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
90747fc340
|
规范国际化
|
6 years ago |
|
alex.sung
|
a13d352885
|
规范国际化文件
|
6 years ago |
|
alex.sung
|
edace93a94
|
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
0ef3b6b372
|
规范国际化文件及国际化定义。
|
6 years ago |
|
Harrison
|
f2c1da228c
|
Merge pull request #69 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit '2147720998a22036b4d757253e17ca7e9206a4e9':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Wim.Zhai
|
0d8d2e91d9
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design-i18n into release/10.0
|
6 years ago |
|
Wim.Zhai
|
e7ef1492bc
|
modify on 0808
|
6 years ago |
|
Harrison
|
2147720998
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Harrison
|
97771496ca
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# design-i18n-report/src/main/resources/com/fr/design/i18n/main.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_en_US.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ja_JP.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_ko_KR.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_CN.properties
# design-i18n-report/src/main/resources/com/fr/design/i18n/main_zh_TW.properties
|
6 years ago |
|
Wim.Zhai
|
33b617f72e
|
Merge pull request #68 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
针对CHART-2753发现的bug。在design-i18n-chart新增了些key定义（可能是原先以为engine-chart里有，就没有保留，但事后发现engine处的key无法被design处代码获得）
* commit '07611d49db603bdaf463965ae564c66f97fc641f':
modify on 2753
change0807
|
6 years ago |
|
Wim.Zhai
|
07611d49db
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design-i18n into release/10.0
|
6 years ago |
|
Wim.Zhai
|
d655dc32d4
|
modify on 2753
|
6 years ago |
