Unknwon лет назад: 8
Родитель
Сommit
c7d5e1f182

+ 5 - 5
conf/locale/locale_en-US.ini

@@ -402,12 +402,12 @@ issues.filter_type.assigned_to_you = Assigned to you
 issues.filter_type.created_by_you = Created by you
 issues.filter_type.mentioning_you = Mentioning you
 issues.filter_sort = Sort
-issues.filter_sort.latest = Latest
+issues.filter_sort.latest = Newest
 issues.filter_sort.oldest = Oldest
-issues.filter_sort.recentupdate = Recent updated
-issues.filter_sort.leastupdate = Least updated
-issues.filter_sort.mostcomment = Most comments
-issues.filter_sort.leastcomment = Least comments
+issues.filter_sort.recentupdate = Recently updated
+issues.filter_sort.leastupdate = Least recently updated
+issues.filter_sort.mostcomment = Most commented
+issues.filter_sort.leastcomment = Least commented
 issues.opened_by = opened %[1]s by <a href="/%[2]s">%[2]s</a>
 issues.opened_by_fake = opened %[1]s by %[2]s
 issues.previous = Previous

+ 2 - 1
conf/locale/locale_zh-CN.ini

@@ -324,9 +324,10 @@ form.name_pattern_not_allowed=仓库名称不允许 '%s' 的格式。
 
 need_auth=需要授权验证
 migrate_type=迁移类型
-migrate_type_helper=本仓库将是 <span class="label label-blue label-radius">镜像</span>
+migrate_type_helper=该仓库将是一个 <span class="text blue">镜像</span>
 migrate_repo=迁移仓库
 migrate.clone_address=克隆地址
+migrate.clone_address_desc=该地址可以是 HTTP/HTTPS/GIT URL 或本地服务器路径。
 migrate.invalid_local_path=无效的本地路径,不存在或不是一个目录!
 
 forked_from=派生自

Разница между файлами не показана из-за своего большого размера
+ 2 - 2
modules/bindata/bindata.go


+ 0 - 82
templates/repo/migrate_old.tmpl

@@ -1,82 +0,0 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="repo-wrapper">
-    <form id="repo-migrate-form" class="form form-align panel panel-radius" action="{{AppSubUrl}}/repo/migrate" method="post">
-        {{.CsrfTokenHtml}}
-        <div class="panel-header"><h2>{{.i18n.Tr "new_migrate"}}</h2></div>
-        <div class="panel-content">
-            {{template "ng/base/alert" .}}
-            <div class="field">
-                <label class="req" for="clone_addr">{{.i18n.Tr "repo.migrate.clone_address"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_CloneAddr}}ipt-error{{end}}" id="clone_addr" name="clone_addr" type="text" value="{{.clone_addr}}" required />
-            </div>
-            <div class="field">
-                <span class="form-label"></span>
-                <button class="btn btn-large btn-gray btn-radius" id="auth-button" data-toggle="collapse" data-target="#repo-import-auth">{{.i18n.Tr "repo.need_auth"}}</button>
-                <div id="repo-migrate-auth" {{if not .Err_Auth}}class="hide"{{end}}>
-                    <div class="field">
-                        <label for="auth_username">{{.i18n.Tr "username"}}</label>
-                        <input class="ipt ipt-large ipt-radius {{if .Err_Auth}}ipt-error{{end}}" id="auth_username" name="auth_username" type="text" value="{{.auth_username}}"  />
-                    </div>
-                    <div class="field">
-                        <label for="auth_password">{{.i18n.Tr "password"}}</label>
-                        <input class="ipt ipt-large ipt-radius {{if .Err_Auth}}ipt-error{{end}}" id="auth_password" name="auth_password" type="password" value="{{.auth_password}}"  />
-                    </div>
-                </div>
-            </div>
-            <hr/>
-            <div class="field">
-                <label for="owner" class="req">{{.i18n.Tr "repo.owner"}}</label>
-                <input id="repo-owner-id" type="hidden" name="uid" value="{{.ContextUser.Id}}" />
-                <div class="inline-block drop">
-                    <a href="#" class="drop-bottom">
-                        <img class="avatar" src="{{.ContextUser.AvatarLink}}" id="repo-owner-avatar" alt="user-avatar">
-                        <strong id="repo-owner-name">{{.ContextUser.Name}}</strong>
-                    </a>
-                    <ul class="drop-down menu menu-vertical menu-radius switching-list" id="repo-create-owner-list">
-                        <li {{if eq $.ContextUser.Id .SignedUser.Id}}class="checked"{{end}} data-uid="{{.SignedUser.Id}}">
-                            <a>
-                                <i class="octicon octicon-check"></i>
-                                <img class="avatar" src="{{.SignedUser.AvatarLink}}" alt="user-avatar">
-                                <strong>{{.SignedUser.Name}}</strong>
-                            </a>
-                        </li>
-                        {{range .Orgs}}
-                        <li {{if eq $.ContextUser.Id .Id}}class="checked"{{end}} data-uid="{{.Id}}">
-                            <a>
-                                <i class="octicon octicon-check"></i>
-                                <img class="avatar" src="{{.AvatarLink}}" alt="user-avatar">
-                                <strong>{{.Name}}</strong>
-                            </a>
-                        </li>
-                        {{end}}
-                    </ul>
-                </div>
-            </div>
-            <div class="field">
-                <label class="req" for="repo-name">{{.i18n.Tr "repo.repo_name"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_RepoName}}ipt-error{{end}}" id="repo-name" name="repo_name" type="text" value="{{.repo_name}}" required />
-            </div>
-            <div class="field">
-                <label for="visibility">{{.i18n.Tr "repo.visibility"}}</label>
-                <input class="ipt-chk" id="visibility" name="private" type="checkbox" {{if .private}}checked{{end}} />
-                <span>{{.i18n.Tr "repo.visiblity_helper" | Str2html}}</span>
-            </div>
-            <div class="field">
-                <label for="migrate_type">{{.i18n.Tr "repo.migrate_type"}}</label>
-                <input class="ipt-chk" id="migrate_type" name="mirror" type="checkbox" {{if .mirror}}checked{{end}} />
-                <span>{{.i18n.Tr "repo.migrate_type_helper" | Str2html}}</span>
-            </div>
-            <div class="field clear">
-                <label class="left" for="description">{{.i18n.Tr "repo.repo_desc"}}</label>
-                <textarea class="ipt ipt-large ipt-radius {{if .Err_Description}}ipt-error{{end}}" id="description" name="description">{{.description}}</textarea>
-            </div>
-            <div class="field">
-                <label for="repo-create-submit"></label>
-                <button class="btn btn-large btn-blue btn-radius" id="repo-create-submit">{{.i18n.Tr "repo.migrate_repo"}}</button>
-                <a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a>
-            </div>
-        </div>
-    </form>
-</div>
-{{template "ng/base/footer" .}}