coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add config and update locale

This commit is contained in:
Unknwon 2015-10-24 15:35:26 -04:00
parent 2be5837cb0
commit 63e6e31271
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/app.ini
View File

@ -11,6 +11,8 @@ RUN_MODE = dev
[repository] [repository]
ROOT = ROOT =
SCRIPT_TYPE = bash SCRIPT_TYPE = bash
; Patch test queue length, make it as large as possible.
PULL_REQUEST_QUEUE_LENGTH = 10000
[ui] [ui]
; Number of repositories that are showed in one explore page ; Number of repositories that are showed in one explore page

2
conf/locale/locale_en-US.ini
View File

@ -498,7 +498,7 @@ pulls.reopen_to_merge = Please reopen this pull request to perform merge operati
pulls.merged = Merged pulls.merged = Merged
pulls.has_merged = This pull request has been merged successfully! pulls.has_merged = This pull request has been merged successfully!
pulls.data_broken = Data of this pull request has been broken due to deletion of fork information. pulls.data_broken = Data of this pull request has been broken due to deletion of fork information.
pulls.is_checking = The conflit checking is still in progress, please refresh page in few moments. pulls.is_checking = The conflict checking is still in progress, please refresh page in few moments.
pulls.can_auto_merge_desc = You can perform auto-merge operation on this pull request. pulls.can_auto_merge_desc = You can perform auto-merge operation on this pull request.
pulls.cannot_auto_merge_desc = You can't perform auto-merge operation because there are conflicts between commits. pulls.cannot_auto_merge_desc = You can't perform auto-merge operation because there are conflicts between commits.
pulls.cannot_auto_merge_helper = Please use command line tool to solve it. pulls.cannot_auto_merge_helper = Please use command line tool to solve it.

1
conf/locale/locale_zh-CN.ini
View File

@ -498,6 +498,7 @@ pulls.reopen_to_merge=请重新开启合并请求来完成合并操作。
pulls.merged=已合并 pulls.merged=已合并
pulls.has_merged=该合并请求已经成功合并！ pulls.has_merged=该合并请求已经成功合并！
pulls.data_broken=该合并请求的数据由于派生仓库的相关信息被删除而被破坏。 pulls.data_broken=该合并请求的数据由于派生仓库的相关信息被删除而被破坏。
pulls.is_checking=该合并请求正在进行冲突检查，请稍后再刷新页面。
pulls.can_auto_merge_desc=您可以实现该合并请求的自动合并操作。 pulls.can_auto_merge_desc=您可以实现该合并请求的自动合并操作。
pulls.cannot_auto_merge_desc=因为代码提交存在冲突，您无法对该合并请求执行自动合并操作。 pulls.cannot_auto_merge_desc=因为代码提交存在冲突，您无法对该合并请求执行自动合并操作。
pulls.cannot_auto_merge_helper=请使用命令行工具来解决冲突。 pulls.cannot_auto_merge_helper=请使用命令行工具来解决冲突。

12
modules/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long

2
modules/setting/setting.go
View File

@ -360,7 +360,7 @@ func NewContext() {
homeDir = strings.Replace(homeDir, "\\", "/", -1) homeDir = strings.Replace(homeDir, "\\", "/", -1)
sec = Cfg.Section("repository") sec = Cfg.Section("repository")
Repository.PullRequestQueueLength = 10000 Repository.PullRequestQueueLength = sec.Key("PULL_REQUEST_QUEUE_LENGTH").MustInt(10000)
RepoRootPath = sec.Key("ROOT").MustString(path.Join(homeDir, "gogs-repositories")) RepoRootPath = sec.Key("ROOT").MustString(path.Join(homeDir, "gogs-repositories"))
forcePathSeparator(RepoRootPath) forcePathSeparator(RepoRootPath)
if !filepath.IsAbs(RepoRootPath) { if !filepath.IsAbs(RepoRootPath) {