 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 |
|
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
|
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 |
|
Wim.Zhai
|
328251fdcb
|
调整了一些key的位置和命名
|
6 years ago |
|
Harrison
|
dc48551f13
|
Merge pull request #58 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit '1a9e0b1971265ba65f26820976fce53d475f8a60':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
3dot141
|
1a9e0b1971
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Wim.Zhai
|
49c0fb50d4
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design-i18n into release/10.0
|
6 years ago |
|
Harrison
|
19cd14385a
|
Merge pull request #56 in DESIGN/design-i18n from ~HARRISON/design-i18n:release/10.0 to release/10.0
* commit '4069425fe4bae690fc198217815d333e83064c01':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
|
Wim.Zhai
|
244dadd87c
|
modify keys
|
6 years ago |
|
3dot141
|
4069425fe4
|
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 |
|
ju
|
aed5cfb23c
|
Merge pull request #55 in DESIGN/design-i18n from release/10.0 to 10.0
* commit '243a087219ec95e8aec60233586433535882d5b8':
REPORT-10383 10.0设计器》移动端属性》其他功能“页面再现时刷新”和“表单未提交离开提示”英文显示
|
6 years ago |
|
3dot141
|
b415b1fd88
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
plough
|
243a087219
|
Merge pull request #54 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:release/10.0 to release/10.0
* commit '749b7a1f385af248d53402081f436a8798c7aa2f':
REPORT-10383 10.0设计器》移动端属性》其他功能“页面再现时刷新”和“表单未提交离开提示”英文显示
|
6 years ago |
plough
|
749b7a1f38
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design-i18n into release/10.0
|
6 years ago |
|
plough
|
92cebae9ee
|
REPORT-10383 10.0设计器》移动端属性》其他功能“页面再现时刷新”和“表单未提交离开提示”英文显示
|
6 years ago |
|
Wim.Zhai
|
62d4a5251f
|
更新了部分
|
6 years ago |
|
ju
|
b24ea6302e
|
Merge pull request #53 in DESIGN/design-i18n from release/10.0 to 10.0
* commit '10a371892603ac1a76e6e4dc0aa2bb33c0dbb872':
REPORT-10374 【10.0冒烟】激活码启动界面的control提示可以删掉了
modify i18n keys on 0803
|
6 years ago |
|
plough
|
10a3718926
|
Merge pull request #52 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:release/10.0 to release/10.0
* commit '7ec7340fb1aad886161008af50c6837d731a5c9b':
REPORT-10374 【10.0冒烟】激活码启动界面的control提示可以删掉了
|
6 years ago |
|
Wim.Zhai
|
efb644b8f6
|
Merge pull request #51 in DESIGN/design-i18n from ~WIM.ZHAI/design-i18n:release/10.0 to release/10.0
针对CHART-2735的修正和CHART-2659的完善
* commit 'b71cc8bba4e7379a0359281da21dac82f92bc1d1':
modify i18n keys on 0803
|
6 years ago |
|
plough
|
7ec7340fb1
|
REPORT-10374 【10.0冒烟】激活码启动界面的control提示可以删掉了
|
6 years ago |
|
Wim.Zhai
|
b71cc8bba4
|
modify i18n keys on 0803
|
6 years ago |
|
ju
|
13b1546053
|
Merge pull request #50 in DESIGN/design-i18n from release/10.0 to 10.0
* commit 'e15c9afde04975c30d2256d09cf8f0d7347bc917':
无任务，国际化规范
REPORT-10313
REPORT-9943 10.0 页面设置的“打印顺序”改名为“分页顺序”=>调整代码
REPORT-9943 10.0 页面设置的“打印顺序”改名为“分页顺序”
REPORT-9943 10.0 页面设置的“打印顺序”改名为“分页顺序”
改key
|
6 years ago |
 yaoh.wu
|
e15c9afde0
|
Merge pull request #49 in DESIGN/design-i18n from ~YAOH.WU/design-i18n:release/10.0 to release/10.0
* commit '358ca580b8b4d7de2d5e6d6f22ea4e6ac1239154':
无任务，国际化规范
|
6 years ago |
|
yaoh.wu
|
358ca580b8
|
无任务，国际化规范
|
6 years ago |
|
plough
|
b3d45577de
|
Merge pull request #47 in DESIGN/design-i18n from ~PLOUGH/10-design-i18n:release/10.0 to release/10.0
* commit 'd0ba3152dbaf88db76d3cf9cb8be0c659a3e5fd3':
REPORT-9943 10.0 页面设置的“打印顺序”改名为“分页顺序”=>调整代码
REPORT-9943 10.0 页面设置的“打印顺序”改名为“分页顺序”
REPORT-9943 10.0 页面设置的“打印顺序”改名为“分页顺序”
|
6 years ago |
neil
|
55cb194ab5
|
Merge pull request #48 in DESIGN/design-i18n from ~MATA.LI/design-i18n:release/10.0 to release/10.0
* commit '9a11967c8b20a0f06f80b3de54b3358f470839c6':
REPORT-10313
|
6 years ago |
 Mata.Li
|
9a11967c8b
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/design-i18n into release/10.0
|
6 years ago |
|
Mata.Li
|
2048ca81dc
|
REPORT-10313
|
6 years ago |
|
plough
|
d0ba3152db
|
REPORT-9943 10.0 页面设置的“打印顺序”改名为“分页顺序”=>调整代码
|
6 years ago |
