Skip to content

Commit

Permalink
internationalization
Browse files Browse the repository at this point in the history
  • Loading branch information
littlehz committed Mar 16, 2016
1 parent 742af1b commit 8f849d0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ support git/svn Version control system, no matter what language you are, php/jav

[Home Page](https://www.walle-web.io) | [官方主页](https://www.walle-web.io) | [中文说明](https://github.com/meolu/walle-web/blob/master/docs/README-zh.md) | [文档手册](https://www.walle-web.io/docs/).

Now, there are more than ten companies hosted walle for deployment, star walle if you like : )
Now, there are more than hundreds of companies hosted walle for deployment, star walle if you like : )

* Support git/svn Version control system.
* User signup by admin/develop identity.
Expand All @@ -26,6 +26,7 @@ Now, there are more than ten companies hosted walle for deployment, star walle i
* Task of pre-release(e.g: stop service).
* Task of post-release(e.g: restart service).
* Check up file md5.
* Multi-process multi-server file transfer (Ansible).


Requirements
Expand All @@ -34,6 +35,7 @@ Requirements
* Bash(git、ssh)
* LNMP/LAMP(php5.4+)
* Composer
* Ansible(Optional)

That's all. It's base package of PHP environment!

Expand Down Expand Up @@ -121,8 +123,7 @@ To Do List
Update
-----------------
```
git pull
./yii migrate # update db
./yii walle/upgrade # upgrade walle
```
Expand Down
9 changes: 5 additions & 4 deletions docs/README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ Walle 一个web部署系统工具,可能也是个持续发布工具,配置

[官网主页](https://www.walle-web.io) | [文档手册](https://www.walle-web.io/docs) | [English Readme](https://github.com/meolu/walle-web/blob/master/README.md).

目前,超过十家企业生产环境部署使用,欢迎star、fork、试用 :)
目前,超过百家企业生产环境部署使用,欢迎star、fork、试用 :)

* 支持git、svn版本管理
* 用户分身份注册、登录
* 开发者发起上线任务申请、部署
* 管理者审核上线任务
Expand All @@ -25,7 +26,7 @@ Walle 一个web部署系统工具,可能也是个持续发布工具,配置
* 发布完毕后收尾任务post-release(如重启)
* 执行sql构建(不要担心忘记测试环境sql同步)
* 线上文件指纹确认
* 支持git、svn版本管理
* 多机器并发传输文件(Ansible)



Expand All @@ -35,6 +36,7 @@ Walle 一个web部署系统工具,可能也是个持续发布工具,配置
* Bash(git、ssh)
* LNMP/LAMP(php5.4+)
* Composer
* Ansible(可选)

安装
----
Expand Down Expand Up @@ -121,8 +123,7 @@ To Do List
持续更新开启更多功能
-----------------
```
git pull
./yii migrate # 更新数据库
./yii walle/upgrade # 升级walle
```
截图
Expand Down
4 changes: 2 additions & 2 deletions messages/en/conf.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
'branch tip' => 'Recommended options of test,maybe you would chose branch+commit',
'tag tip' => 'Recommended options of production',
'audit tip' => 'development bill should be audited before deploying',
'ansible tip' => '',
'ansible hosts save error' => '{path}',
'ansible tip' => 'use ansible to accelerate the speed of deploying, you need to have installed ansible on "Hosted Server"',
'ansible hosts save error' => 'Unable to save ansible hosts file: "{path}"',
'open tip' => "developer can't see this project while it is close",

'group' => "Project's users",
Expand Down
4 changes: 2 additions & 2 deletions messages/en/walle.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
'hosted server is not writable error' => 'hosted server error: please make sure the user {user} of php process have the access permission of {path}, and {ssh_passwd}.<br>',
'hosted server ssh error' => 'hosted server error: please make sure {ssh_passwd}.<br>',
'hosted server sys error' => 'error happens when detecting on hosted server:{error}<br>',
'hosted server ansible error' => 'hosted server error: please install ansible or disable ansible.<br>',
'hosted server ansible error' => 'hosted server error: please install ansible on hosted server or disable ansible in current project.<br>',
'target server ssh error' => 'target server error: please make sure the ssh-key of user {local_user} of php process is added to target servers\'s user {remote_user}\'s authorized_keys.<br>',
'target server is not writable error' => 'target server error: please make sure {remote_user} have the access permission of {path} on target servers.<br>',
'target server sys error' => 'error happens when detecting on target servers:{error}<br>',
'target server ansible ping error' => 'ansible ping error',
'target server ansible ping error' => 'ansible ping error: please check ~/.ssh/config file and ssh-key',
'unknown config' => 'unknown configuration',
'you are not the manager' => 'you are not the manager',
'get branches failed' => 'get branches failed:',
Expand Down

0 comments on commit 8f849d0

Please sign in to comment.