 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 |
|
Alex.Sung
|
e6e647f015
|
Merge pull request #67 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
继续修改国际化
* commit 'd85c276f1b19c3d68451781af177e7852e1a0b76':
继续提交国际化
|
6 years ago |
|
3dot141
|
0fb17ea337
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
alex.sung
|
d85c276f1b
|
继续提交国际化
|
6 years ago |
|
Wim.Zhai
|
8ec86470fb
|
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
|
0678437085
|
change0807
|
6 years ago |
|
Alex.Sung
|
f51b891ac7
|
Merge pull request #66 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
继续补充国际化。
* commit 'efee61822d495cb5366bcb97fabcfd69c04205a6':
继续提交国际化
|
6 years ago |
|
alex.sung
|
efee61822d
|
继续提交国际化
|
6 years ago |
ju
|
2cd88f3358
|
Merge pull request #65 in DESIGN/design-i18n from release/10.0 to 10.0
* commit '2aafdf3f09b5222e19c9a526101bfcb89d371061':
根据规范，修改不合理的地方。
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
规范国际化文件及国际化定义。
change external
调整了一些key的位置和命名
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
modify keys
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
更新了部分
|
6 years ago |
|
ju
|
2aafdf3f09
|
Merge pull request #63 in DESIGN/design-i18n from ~ALEX.SUNG/design-i18n:release/10.0 to release/10.0
* commit 'fc9fe0f970d9c8b968d87537d499a2282482d8c7':
根据规范，修改不合理的地方。
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
fc9fe0f970
|
根据规范，修改不合理的地方。
|
6 years ago |
|
Harrison
|
c2117198ff
|
Merge pull request #64 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit 'a3a8cb72b1d62d38001d24747b42006538f495c6':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
3dot141
|
a3a8cb72b1
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
alex.sung
|
d8ff55edd3
|
规范国际化文件及国际化定义。
|
6 years ago |
|
alex.sung
|
24b7625f2c
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design-i18n into release/10.0
|
6 years ago |
|
ju
|
8cb63edde8
|
Merge pull request #62 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
* commit '8cebab64ea0ea035a24a91644c76ef3eef7580b6':
change external
|
6 years ago |
|
Wim.Zhai
|
8cebab64ea
|
change external
|
6 years ago |
|
alex.sung
|
191cc8b688
|
Merge remote-tracking branch 'remotes/origin/10.0' into release/10.0
|
6 years ago |
|
Wim.Zhai
|
3ff2d94984
|
Merge pull request #61 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
与刘珂有交流，这边主攻chart部分的修改，恢复了一些应为report命名的key
* commit '8790f2c4ed137f166d166c4c932d6a0ae72dd37c':
调整了一些key的位置和命名
modify keys
更新了部分
|
6 years ago |
|
Wim.Zhai
|
8790f2c4ed
|
change main.properties
|
6 years ago |
