forked from gitea/gitea
		
	fix dashboard 500 when no issues at all
- update locales - update README
This commit is contained in:
		
							parent
							
								
									6c7a93a3ac
								
							
						
					
					
						commit
						17c2d1fc7c
					
				| @ -29,7 +29,7 @@ Gogs (Go Git Service) is a painless self-hosted Git service. | ||||
| 
 | ||||
| - Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) has been reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site. | ||||
| - The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch. | ||||
| - You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) before you start filing an issue or making a Pull Request, and **MUST** discuss with us on [Gitter](https://gitter.im/gogits/gogs) for UI changes and feature Pull Requests, otherwise it's high possibilities that we are not going to merge it. | ||||
| - <span style="color: red">You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) before you start filing an issue or making a Pull Request, and **MUST** discuss with us on [Gitter](https://gitter.im/gogits/gogs) for UI changes and feature Pull Requests, otherwise it's high possibilities that we are not going to merge it.</span> | ||||
| - If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks! | ||||
| 
 | ||||
| #### Other language version | ||||
|  | ||||
| @ -95,6 +95,8 @@ mail_notify=E-Mail-Benachrichtgung aktivieren | ||||
| server_service_title=Server- und sonstige Diensteinstellungen | ||||
| offline_mode=Offline-Modus aktivieren | ||||
| offline_mode_popup=Deaktiviere das CDN auch im Produktionsmodus, alle Dateien werden von diesem Server ausgeliefert. | ||||
| disable_gravatar=Disable Gravatar Service | ||||
| disable_gravatar_popup=Disable Gravatar and custom sources, all avatars are uploaded by users or default. | ||||
| disable_registration=Benutzerregistrierung deaktivieren | ||||
| disable_registration_popup=Deaktiviere die Benutzerregistrierung, nur Administratoren können Benutzerkonten anlegen. | ||||
| require_sign_in_view=Erfordere Anmeldung, um Inhalte anzusehen | ||||
| @ -322,10 +324,12 @@ fork_from=Abspaltung von | ||||
| fork_visiblity_helper=Sichtbarkeit von abgespalteten Repositories ist nicht veränderbar | ||||
| repo_desc=Beschreibung | ||||
| repo_lang=Sprache | ||||
| repo_lang_helper=Wähle eine .gitignore Datei | ||||
| repo_lang_helper=.gitignore Dateien auswählen | ||||
| license=Lizenz | ||||
| license_helper=Wähle eine Lizenz aus | ||||
| init_readme=Repository mit README.md initialisieren | ||||
| readme=Readme | ||||
| readme_helper=Readme Vorlage auswählen | ||||
| auto_init=Repository mit ausgewählten Dateien und Vorlagen initialisieren | ||||
| create_repo=Repository erstellen | ||||
| default_branch=Standard-Branch | ||||
| mirror_interval=Spiegel-Intervall (in Stunden) | ||||
| @ -435,6 +439,7 @@ issues.reopen_comment_issue=Wiedereröffnen und kommentieren | ||||
| issues.create_comment=Kommentieren | ||||
| issues.closed_at=`geschlossen in <a id="%[1]s" href="#%[1]s">%[2]s</a>` | ||||
| issues.reopened_at=`wiedereröffnet in <a id="%[1]s" href="#%[1]s">%[2]s</a>` | ||||
| issues.commit_ref_at=`referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>` | ||||
| issues.poster=Ersteller | ||||
| issues.admin=Admin | ||||
| issues.owner=Besitzer | ||||
| @ -457,6 +462,7 @@ issues.label_deletion_success=Label wurde erfolgreich gelöscht! | ||||
| pulls.compare_changes=Änderungen vergleichen | ||||
| pulls.compare_changes_desc=Vergleiche zwei Branches und erstelle einen Pull Request für die Änderungen. | ||||
| pulls.no_results=Keine Ergebnisse verfügbar. | ||||
| pulls.create=Create Pull Request | ||||
| 
 | ||||
| milestones.new=Neuer Meilenstein | ||||
| milestones.open_tab=%d offen | ||||
| @ -491,14 +497,17 @@ settings.basic_settings=Grundeinstellungen | ||||
| settings.danger_zone=Gefahrenzone | ||||
| settings.site=Offizielle Webseite | ||||
| settings.update_settings=Aktualisierungseinstellungen | ||||
| settings.change_reponame=Name des Repositories geändert | ||||
| settings.change_reponame_desc=Repository-Name wurde geändert, möchtest du fortfahren? Dies beeinträchtigt sämtliche Links, die dieses Repository betreffen. | ||||
| settings.change_reponame_prompt=This change will affect how links relate to the repository. | ||||
| settings.transfer=Besitz übertragen | ||||
| settings.transfer_desc=Übertrage dieses Repository einem anderen Benutzer oder einer Organisation in der du Admin-Rechte hast. | ||||
| settings.new_owner_has_same_repo=Neuer Eigentümer hat bereits ein Repository mit dem gleichen Namen. | ||||
| settings.delete=Repository löschen | ||||
| settings.delete_desc=Wenn dieses Repository gelöscht ist, gibt es keinen Weg zurück. Sei dir sicher! | ||||
| settings.transfer_notices=<p>- Du wirst den Zugriff verlieren, falls der neue Besitzer ein einzelner Benutzer ist.</p><p>- Du wirst deinen Zugang behalten, falls der neue Besitzer eine Organisation ist, und du zu ihren Besitzern gehörst.</p> | ||||
| settings.transfer_notices_1=- You will lose access if new owner is a individual user. | ||||
| settings.transfer_notices_2=- You will conserve access if new owner is an organization and if you're one of the owners. | ||||
| settings.transfer_form_title=Please enter following information to confirm your operation: | ||||
| settings.delete_notices_1=- This operation <strong>CANNOT</strong> be undone. | ||||
| settings.delete_notices_2=- This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators. | ||||
| settings.update_settings_success=Repository-Optionen aktualisiert | ||||
| settings.transfer_owner=Neuer Besitzer | ||||
| settings.make_transfer=übertragen | ||||
| @ -511,13 +520,13 @@ settings.user_is_org_member=Benutzer ist ein Organisationsmitglied und kann nich | ||||
| settings.add_webhook=Webhook hinzufügen | ||||
| settings.hooks_desc=Webhooks erlauben es dir, externe Dienste zu informieren, wenn etwas bestimmtes in deinem Repository passiert. Gogs sendet dann einen POST-Request an alle angegebenen URLs. Erfahre mehr in unserem <a target="_blank" href="%s">Webhooks Guide</a>. | ||||
| settings.webhook_deletion=Webhook entfernen | ||||
| settings.webhook_deletion_desc=Delete this webhook will remove its information and all delivery history. Do you want to continue? | ||||
| settings.webhook_deletion_desc=Löschen dieses Webhooks wird alle zugehörigen Informationen und den Übertragungsverlauf entfernen. Soll fortgefahren werden? | ||||
| settings.webhook_deletion_success=Webhook wurde erfolgreich entfernt! | ||||
| settings.webhook.request=Request | ||||
| settings.webhook.response=Response | ||||
| settings.webhook.headers=Headers | ||||
| settings.webhook.payload=Payload | ||||
| settings.webhook.body=Body | ||||
| settings.webhook.request=Anfrage | ||||
| settings.webhook.response=Rückmeldung | ||||
| settings.webhook.headers=Kopfzeilen | ||||
| settings.webhook.payload=Nutzdaten | ||||
| settings.webhook.body=Inhalt | ||||
| settings.githooks_desc=Git-Hooks werden von Git selbst bereitgestellt. Du kannst die Dateien der unterstützten Hooks in der Liste unten bearbeiten, um eigene Operationen einzubinden. | ||||
| settings.githook_edit_desc=Wenn ein Hook nicht aktiv ist, wird der Standardinhalt benutzt. Lasse den Inhalt leer, um den Hook zu deaktivieren. | ||||
| settings.githook_name=Hook-Name | ||||
| @ -527,8 +536,17 @@ settings.add_webhook_desc=Gogs sendet einen <code>POST</code>-Request an die unt | ||||
| settings.payload_url=Payload-URL | ||||
| settings.content_type=Inhaltstyp | ||||
| settings.secret=Secret | ||||
| settings.slack_username=Benutzername | ||||
| settings.slack_icon_url=Icon URL | ||||
| settings.slack_color=Farbe | ||||
| settings.event_desc=Welche Ereignisse sollen diesen Webhook auslösen? | ||||
| settings.event_push_only=Nur das <code>push</code>-Ereignis. | ||||
| settings.event_send_everything=Ich brauche <strong>alles</strong>. | ||||
| settings.event_choose=Lass mich auswählen, was ich brauche. | ||||
| settings.event_create=Erstellen | ||||
| settings.event_create_desc=Branch/Tag erstellt | ||||
| settings.event_push=Push | ||||
| settings.event_push_desc=Git push auf ein Repository | ||||
| settings.active=Aktiv | ||||
| settings.active_helper=Ereignisdetails werden ausgeliefert, wenn dieser Webhook ausgelöst wird. | ||||
| settings.add_hook_success=Webhook hinzugefügt | ||||
| @ -783,6 +801,7 @@ auths.smtp_auth=SMTP-Authentifizierungstyp | ||||
| auths.smtphost=SMTP-Host | ||||
| auths.smtpport=SMTP-Port | ||||
| auths.enable_tls=TLS-Verschlüsselung aktivieren | ||||
| auths.skip_tls_verify=Skip TLS Verify | ||||
| auths.pam_service_name=PAM Dienstname | ||||
| auths.enable_auto_register=Automatische Registrierung aktivieren | ||||
| auths.tips=Tipps | ||||
|  | ||||
| @ -503,9 +503,11 @@ settings.transfer_desc = Transfer this repository to another user or to an organ | ||||
| settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name. | ||||
| settings.delete = Delete This Repository | ||||
| settings.delete_desc = Once you delete a repository, there is no going back. Please be certain. | ||||
| settings.transfer_notices = - You will lose access if new owner is a individual user.<br>- You will conserve access if new owner is an organization and if you're one of the owners. | ||||
| settings.transfer_notices_1 = - You will lose access if new owner is a individual user. | ||||
| settings.transfer_notices_2 = - You will conserve access if new owner is an organization and if you're one of the owners. | ||||
| settings.transfer_form_title = Please enter following information to confirm your operation:  | ||||
| settings.delete_notices = - This operation <strong>CANNOT</strong> be undone.<br>- This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators. | ||||
| settings.delete_notices_1 = - This operation <strong>CANNOT</strong> be undone. | ||||
| settings.delete_notices_2 = - This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators. | ||||
| settings.update_settings_success = Repository options has been updated successfully. | ||||
| settings.transfer_owner = New Owner | ||||
| settings.make_transfer = Make Transfer | ||||
|  | ||||
| @ -95,6 +95,8 @@ mail_notify=启用邮件通知提醒 | ||||
| server_service_title=服务器和其它服务设置 | ||||
| offline_mode=启用离线模式 | ||||
| offline_mode_popup=在部署模式下也禁用从 CDN 获取文件,所以的资源都将从本地服务器获取。 | ||||
| disable_gravatar=禁用 Gravatar 服务 | ||||
| disable_gravatar_popup=禁用 Gravatar 和自定义源,仅使用由用户上传的或默认的头像。 | ||||
| disable_registration=禁止用户自主注册 | ||||
| disable_registration_popup=禁止用户自行注册功能,只有管理员可以添加帐号。 | ||||
| require_sign_in_view=启用登录访问限制 | ||||
| @ -437,6 +439,7 @@ issues.reopen_comment_issue=重新开启并评论 | ||||
| issues.create_comment=评论 | ||||
| issues.closed_at=`于 <a id="%[1]s" href="#%[1]s">%[2]s</a> 关闭` | ||||
| issues.reopened_at=`于 <a id="%[1]s" href="#%[1]s">%[2]s</a> 重新开启` | ||||
| issues.commit_ref_at=`在代码提交 <a id="%[1]s" href="#%[1]s">%[2]s</a> 中引用了该工单` | ||||
| issues.poster=发布者 | ||||
| issues.admin=管理员 | ||||
| issues.owner=所有者 | ||||
| @ -459,6 +462,7 @@ issues.label_deletion_success=标签删除成功! | ||||
| pulls.compare_changes=对比文件变化 | ||||
| pulls.compare_changes_desc=对比两个分支间的文件变化并发起一个合并请求。 | ||||
| pulls.no_results=未找到结果 | ||||
| pulls.create=创建合并请求 | ||||
| 
 | ||||
| milestones.new=新的里程碑 | ||||
| milestones.open_tab=%d 开启中 | ||||
| @ -493,14 +497,17 @@ settings.basic_settings=基本设置 | ||||
| settings.danger_zone=危险操作区 | ||||
| settings.site=官方网站 | ||||
| settings.update_settings=更新仓库设置 | ||||
| settings.change_reponame=仓库名称将被修改 | ||||
| settings.change_reponame_desc=仓库名称被修改,您确定要继续操作吗?这将会影响到所有与该仓库有关的链接。 | ||||
| settings.change_reponame_prompt=该操作将会影响到所有与该仓库有关的链接 | ||||
| settings.transfer=转移仓库所有权 | ||||
| settings.transfer_desc=您可以将仓库转移至您拥有管理员权限的帐户或组织。 | ||||
| settings.new_owner_has_same_repo=新的仓库拥有者已经存在同名仓库! | ||||
| settings.delete=删除本仓库 | ||||
| settings.delete_desc=删除仓库操作不可逆转,请三思而后行。 | ||||
| settings.transfer_notices=<p>- 如果您转移给个人用户,您将对仓库失去所有权限。</p><p>- 如果您转移给您作为拥有者的组织,则可继续保持操作权限。</p> | ||||
| settings.transfer_notices_1=- 如果您将仓库转移给个人用户,您将会丢失操作权限。 | ||||
| settings.transfer_notices_2=- 如果您将仓库转移给您是所有者的组织,您的操作权限将被保留。 | ||||
| settings.transfer_form_title=请输入以下信息以确认您的操作: | ||||
| settings.delete_notices_1=- 此操作 <strong>不可以</strong> 被回滚。 | ||||
| settings.delete_notices_2=- 此操作将永久删除该仓库,包括 Git 数据、 工单、 评论和协作者的操作权限。 | ||||
| settings.update_settings_success=仓库设置更新成功! | ||||
| settings.transfer_owner=新拥有者 | ||||
| settings.make_transfer=确认转移仓库 | ||||
| @ -794,6 +801,7 @@ auths.smtp_auth=SMTP 授权类型 | ||||
| auths.smtphost=SMTP 主机地址 | ||||
| auths.smtpport=SMTP 主机端口 | ||||
| auths.enable_tls=启用 TLS 加密 | ||||
| auths.skip_tls_verify=忽略 TLS 验证 | ||||
| auths.pam_service_name=PAM 服务名称 | ||||
| auths.enable_auto_register=允许授权用户自动注册 | ||||
| auths.tips=帮助提示 | ||||
|  | ||||
							
								
								
									
										2
									
								
								gogs.go
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gogs.go
									
									
									
									
									
								
							| @ -17,7 +17,7 @@ import ( | ||||
| 	"github.com/gogits/gogs/modules/setting" | ||||
| ) | ||||
| 
 | ||||
| const APP_VER = "0.6.7.0831 Beta" | ||||
| const APP_VER = "0.6.7.0901 Beta" | ||||
| 
 | ||||
| func init() { | ||||
| 	runtime.GOMAXPROCS(runtime.NumCPU()) | ||||
|  | ||||
| @ -410,6 +410,10 @@ func Issues(uid, assigneeID, repoID, posterID, milestoneID int64, repoIDs []int6 | ||||
| 	if repoID > 0 { | ||||
| 		sess.Where("issue.repo_id=?", repoID).And("issue.is_closed=?", isClosed) | ||||
| 	} else if repoIDs != nil { | ||||
| 		// In case repository IDs are provided but actually no repository has issue. | ||||
| 		if len(repoIDs) == 0 { | ||||
| 			return make([]*Issue, 0), nil | ||||
| 		} | ||||
| 		sess.Where("issue.repo_id IN ("+strings.Join(base.Int64sToStrings(repoIDs), ",")+")").And("issue.is_closed=?", isClosed) | ||||
| 	} else { | ||||
| 		sess.Where("issue.is_closed=?", isClosed) | ||||
|  | ||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -1 +1 @@ | ||||
| 0.6.7.0831 Beta | ||||
| 0.6.7.0901 Beta | ||||
| @ -100,7 +100,10 @@ | ||||
|     {{.i18n.Tr "repo.settings.transfer"}} | ||||
|   </div> | ||||
|   <div class="content"> | ||||
| 		<div class="ui warning message text left">{{.i18n.Tr "repo.settings.transfer_notices" | Str2html}}</div> | ||||
| 		<div class="ui warning message text left"> | ||||
| 			{{.i18n.Tr "repo.settings.transfer_notices_1" | Safe}} <br> | ||||
| 			{{.i18n.Tr "repo.settings.transfer_notices_2" | Safe}} | ||||
| 		</div> | ||||
|   	<form class="ui form" action="{{.Link}}" method="post"> | ||||
|       {{.CsrfTokenHtml}} | ||||
| 			<input type="hidden" name="action" value="transfer"> | ||||
| @ -132,7 +135,10 @@ | ||||
|     {{.i18n.Tr "repo.settings.delete"}} | ||||
|   </div> | ||||
|   <div class="content"> | ||||
| 		<div class="ui warning message text left">{{.i18n.Tr "repo.settings.delete_notices" | Str2html}}</div> | ||||
| 		<div class="ui warning message text left"> | ||||
| 			{{.i18n.Tr "repo.settings.delete_notices_1" | Safe}} <br> | ||||
| 			{{.i18n.Tr "repo.settings.delete_notices_2" | Safe}} | ||||
| 		</div> | ||||
|   	<form class="ui form" action="{{.Link}}" method="post"> | ||||
|       {{.CsrfTokenHtml}} | ||||
| 			<input type="hidden" name="action" value="delete"> | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Unknwon
						Unknwon