public/gitea
1
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-14 01:35:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

finish all new user settings UI

Browse Source
This commit is contained in:
Unknwon committed 2015-09-10 11:40:34 -04:00
1 parent c8d92fad30
commit 52ec80fa18
21 files changed
+295 -283
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmd/web.go
+3 -2
View File
@@ -267,8 +267,9 @@ func runWeb(ctx *cli.Context) {
m.Get("", user.Settings)
m.Post("", bindIgnErr(auth.UpdateProfileForm{}), user.SettingsPost)
m.Post("/avatar", binding.MultipartForm(auth.UploadAvatarForm{}), user.SettingsAvatar)
m.Get("/email", user.SettingsEmails)
m.Post("/email", bindIgnErr(auth.AddEmailForm{}), user.SettingsEmailPost)
m.Combo("/email").Get(user.SettingsEmails).
Post(bindIgnErr(auth.AddEmailForm{}), user.SettingsEmailPost)
m.Post("/email/delete", user.DeleteEmail)
m.Get("/password", user.SettingsPassword)
m.Post("/password", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsPasswordPost)
m.Combo("/ssh").Get(user.SettingsSSHKeys).
conf/locale/locale_de-DE.ini
+17 -14
View File
@@ -241,7 +241,7 @@ location=Standort
update_profile=Profil aktualisieren
update_profile_success=Profil aktualisiert
change_username=Benutzername geändert
change_username_desc=Benutzername wurde geändert, möchtest du fortfahren? Dies beeinträchtigt sämtliche Links, die dein Konto betreffen.
change_username_prompt=Diese Änderung wird sich auf die Linkbezüge zu deinem Account auswirken.
continue=Weiter
cancel=Abbrechen
@@ -256,6 +256,7 @@ update_avatar_success=Deine Avatar-Einstellung wurde aktualisiert.
change_password=Passwort ändern
old_password=Aktuelles Passwort
new_password=Neues Passwort
retype_new_password=Retype New Password
password_incorrect=Aktuelles Passwort ist nicht korrekt.
change_password_success=Passwort geändert. Du kannst dich jetzt mit dem neuen Passwort anmelden.
@@ -265,6 +266,9 @@ email_desc=Deine primäre E-Mail-Adresse wird für Benachrichtigungen und andere
primary=Primär
primary_email=Als primäre Adresse verwenden
delete_email=Löschen
email_deletion=E-mail Deletion
email_deletion_desc=Delete this e-mail address will remove related information from your account. Do you want to continue?
email_deletion_success=E-mail has been deleted successfully!
add_new_email=Neue E-Mail-Adresse hinzufügen
add_email=E-Mail-Adresse hinzufügen
add_email_confirmation_sent=Eine neue Bestätigungsmail wurde an <b>%s</b> gesendet, bitte überprüfen Sie Ihren Posteingang innerhalb von %d Stunden um die Bestätigung abzuschließen.
@@ -516,7 +520,7 @@ settings.githooks=Git-Hooks
settings.basic_settings=Grundeinstellungen
settings.danger_zone=Gefahrenzone
settings.site=Offizielle Webseite
settings.update_settings=Aktualisierungseinstellungen
settings.update_settings=Einstellungen speichern
settings.change_reponame_prompt=Diese Änderung wirkt sich darauf aus, wie sich Links auf das Repository beziehen.
settings.transfer=Besitz übertragen
settings.transfer_desc=Übertrage dieses Repository einem anderen Benutzer oder einer Organisation in der du Admin-Rechte hast.
@@ -630,7 +634,6 @@ release.tag_name_already_exist=Ein Release mit diesem Tag existiert bereits.
[org]
org_name_holder=Name der Organisation
org_name_helper=Gute Namen von Organisationen sind kurz und einprägsam.
org_email_helper=Die E-Mail-Adresse der Organisation erhält alle Benachrichtigungen und Bestätigungs-E-Mails.
create_org=Organisation erstellen
repo_updated=Aktualisiert
people=Personen
@@ -654,10 +657,10 @@ settings.options=Optionen
settings.full_name=Vollständiger Name
settings.website=Webseite
settings.location=Standort
settings.update_settings=Aktualisierungseinstellungen
settings.change_orgname=Organisationsname geändert
settings.change_orgname_desc=Organisationsname wurde geändert, möchtest du fortfahren? Dies beeinträchtigt sämtliche Links, die diese Organisation betreffen.
settings.update_settings=Einstellungen speichern
settings.update_setting_success=Organisationseinstellungen aktualisiert
settings.change_orgname_prompt=Diese Änderung wird sich auf die Linkbezüge zur Organisation auswirken.
settings.update_avatar_success=Avatareinstellung für die Organisation wurde erfolgreich aktualisiert.
settings.delete=Organisation löschen
settings.delete_account=Diese Organisation löschen
settings.delete_prompt=Die Organisation wird dauerhaft gelöscht. Dies kann <strong>NICHT</strong> rückgängig gemacht werden!
@@ -774,9 +777,9 @@ users.admin=Admin
users.repos=Repositorys
users.created=Erzeugt
users.edit=Bearbeiten
users.auth_source=Auth-Quelle
users.auth_source=Authentifizierungsquelle
users.local=Lokal
users.auth_login_name=Auth-Login-Name
users.auth_login_name=Authentifizierung-Loginnname
users.update_profile_success=Kontoprofil aktualisiert
users.edit_account=Konto bearbeiten
users.is_activated=Dieses Konto ist aktiviert
@@ -800,7 +803,7 @@ repos.watches=Beobachtungen
repos.stars=Markierungen
repos.issues=Issues
auths.auth_manage_panel=Authentifizierung
auths.auth_manage_panel=Verwaltungspanel für die Authentifizierung
auths.new=Neue Authentifizierungsquelle hinzufügen
auths.name=Name
auths.type=Typ
@@ -820,7 +823,7 @@ auths.attribute_mail=E-Mail Attribut
auths.filter=Benutzernamen Filter
auths.admin_filter=Admin Filter
auths.ms_ad_sa=Ms Ad SA
auths.smtp_auth=SMTP-Authentifizierungstyp
auths.smtp_auth=SMTP Authentifizierungstyp
auths.smtphost=SMTP-Host
auths.smtpport=SMTP-Port
auths.enable_tls=TLS-Verschlüsselung aktivieren
@@ -830,11 +833,11 @@ auths.enable_auto_register=Automatische Registrierung aktivieren
auths.tips=Tipps
auths.edit=Authentifizierungseinstellungen bearbeiten
auths.activated=Diese Authentifizierung ist aktiviert
auths.update_success=Authentifizierungseinstellungen aktualisiert
auths.update_success=Die Authentifizierungseinstellungen wurden erfolgreich aktualisiert.
auths.update=Authentifizierungseinstellungen aktualisieren
auths.delete=Authentifizierung löschen
auths.delete_auth_title=Authentifizierungsquelle löschen
auths.delete_auth_desc=Diese Authentifizierungsquelle wird gelöscht, möchtest du fortfahren?
auths.delete=Diese Authentifizierung löschen
auths.delete_auth_title=Löschen der Authentifizierung
auths.delete_auth_desc=Diese Authentifizierung wird gelöscht, möchtest du fortfahren?
config.server_config=Server-Konfiguration
config.app_name=Anwendungsname
conf/locale/locale_en-US.ini
+4
View File
@@ -256,6 +256,7 @@ update_avatar_success = Your avatar setting has been updated successfully.
change_password = Change Password
old_password = Current Password
new_password = New Password
retype_new_password = Retype New Password
password_incorrect = Current password is not correct.
change_password_success = Your password was successfully changed. You can now sign using this new password.
@@ -265,6 +266,9 @@ email_desc = Your primary e-mail address will be used for notifications and othe
primary = Primary
primary_email = Set as primary
delete_email = Delete
email_deletion = E-mail Deletion
email_deletion_desc = Delete this e-mail address will remove related information from your account. Do you want to continue?
email_deletion_success = E-mail has been deleted successfully!
add_new_email = Add new e-mail address
add_email = Add e-mail
add_email_confirmation_sent = A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete the confirmation process.
conf/locale/locale_lv-LV.ini
+38 -35
View File
@@ -241,7 +241,7 @@ location=Atrašanās vieta
update_profile=Mainīt profilu
update_profile_success=Jūsu profila dati ir veiksmīgi saglabāti.
change_username=Lietotāja vārds mainīts
change_username_desc=Lietotājvārds tiks mainīts, vai vēlaties turpināt? Tas ietekmēs visas saites, kas attiecas uz Jūsu kontu.
change_username_prompt=This change will affect the way how links relate to your account.
continue=Turpināt
cancel=Atcelt
@@ -256,6 +256,7 @@ update_avatar_success=Jūsu profila bilde tika veiksmīgi saglabāta.
change_password=Mainīt paroli
old_password=Pašreizējā parole
new_password=Jauna parole
retype_new_password=Retype New Password
password_incorrect=Ievadīta nepareiza pašreizējā parole.
change_password_success=Parole tika veiksmīgi nomainīta. Tagad jūs varat pieraksītites, izmantojot jauno paroli.
@@ -265,6 +266,9 @@ email_desc=Primārā e-pasta adrese tiks izmantota sūtot notifikācijas un cit
primary=Primārā
primary_email=Iestatīt kā primāro
delete_email=Dzēst
email_deletion=E-mail Deletion
email_deletion_desc=Delete this e-mail address will remove related information from your account. Do you want to continue?
email_deletion_success=E-mail has been deleted successfully!
add_new_email=Pievienot jaunu e-pasta adresi
add_email=Pievienot e-pastu
add_email_confirmation_sent=A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete the confirmation process.
@@ -418,9 +422,9 @@ issues.filter_type.all_issues=All issues
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=Newest
issues.filter_sort.oldest=Oldest
issues.filter_sort=Kārtot
issues.filter_sort.latest=Jaunākie
issues.filter_sort.oldest=Vecakie
issues.filter_sort.recentupdate=Recently updated
issues.filter_sort.leastupdate=Least recently updated
issues.filter_sort.mostcomment=Most commented
@@ -429,12 +433,12 @@ issues.opened_by=opened %[1]s by <a href="%[2]s">%[3]s</a>
issues.opened_by_fake=opened %[1]s by %[2]s
issues.previous=Previous
issues.next=Next
issues.open_title=Open
issues.closed_title=Closed
issues.num_comments=%d comments
issues.open_title=Atvērta
issues.closed_title=Slēgta
issues.num_comments=%d komentāri
issues.commented_at=`commented <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.no_content=There is no content yet.
issues.close_issue=Close
issues.close_issue=Aizvērt
issues.close_comment_issue=Close and comment
issues.reopen_issue=Reopen
issues.reopen_comment_issue=Reopen and comment
@@ -447,9 +451,9 @@ issues.admin=Admin
issues.owner=Owner
issues.sign_up_for_free=Sign up for free
issues.sign_in_require_desc=to join this conversation. Already have an account? <a href="%s">Sign in to comment</a>
issues.edit=Edit
issues.cancel=Cancel
issues.save=Save
issues.edit=Labot
issues.cancel=Atcelt
issues.save=Saglabāt
issues.label_title=Label name
issues.label_color=Label color
issues.label_count=%d labels
@@ -490,18 +494,18 @@ milestones.close_tab=%d Closed
milestones.closed=Closed %s
milestones.no_due_date=No due date
milestones.open=Open
milestones.close=Close
milestones.close=Aizvērt
milestones.new_subheader=Create milestones to organize your issues.
milestones.create=Create Milestone
milestones.title=Title
milestones.desc=Description
milestones.title=Virsraksts
milestones.desc=Apraksts
milestones.due_date=Due Date (optional)
milestones.clear=Clear
milestones.invalid_due_date_format=Due date format is invalid, must be 'year-mm-dd'.
milestones.create_success=Milestone '%s' has been created successfully!
milestones.edit=Edit Milestone
milestones.edit_subheader=Use better description for milestones so people won't be confused.
milestones.cancel=Cancel
milestones.cancel=Atcelt
milestones.modify=Modify Milestone
milestones.edit_success=Changes of milestone '%s' has been saved successfully!
milestones.deletion=Milestone Deletion
@@ -585,8 +589,8 @@ settings.slack_channel=Kanāls
settings.deploy_keys=Izvietot atslēgas
settings.add_deploy_key=Add Deploy Key
settings.no_deploy_keys=You haven't added any deploy key.
settings.title=Title
settings.deploy_key_content=Content
settings.title=Virsraksts
settings.deploy_key_content=Saturs
settings.key_been_used=Deploy key content has been used.
settings.key_name_used=Deploy key with same name has already existed.
settings.add_key_success=New deploy key '%s' has been added successfully!
@@ -630,7 +634,6 @@ release.tag_name_already_exist=Laidiens ar šādu taga nosaukumu jau eksistē.
[org]
org_name_holder=Organizācijas nosaukums
org_name_helper=Labi organizāciju nosaukumi ir īsi un tādi, kurus viegli atcerēties.
org_email_helper=Uz organizācijas e-pastu tiks sūtītas visas notifikācias un apstiprinājumi.
create_org=Izveidot organizāciju
repo_updated=Atjaunināts
people=Personas
@@ -655,9 +658,9 @@ settings.full_name=Pilns vārds, uzvārds
settings.website=Mājas lapa
settings.location=Atrašanās vieta
settings.update_settings=Mainīt iestatījumus
settings.change_orgname=Mainīts organizācijas nosaukums
settings.change_orgname_desc=Organizācijas nosaukums tiks mainīts, vai vēlaties turpinat? Tas ietekmēs saites, kas attiecas uz šo organizāciju.
settings.update_setting_success=Organizācijas iestatījumi tika veiksmīgi saglabāti.
settings.change_orgname_prompt=This change will affect how links relate to the organization.
settings.update_avatar_success=Organization avatar setting has been updated successfully.
settings.delete=Dzēst organizāciju
settings.delete_account=Dzēst šo organizāciju
settings.delete_prompt=Šī darbība pilnībā dzēsīs šo organizāciju, kā arī tā ir <strong>NEATGRIEZENISKA</strong>!
@@ -774,9 +777,9 @@ users.admin=Administrators
users.repos=Repozitoriji
users.created=Izveidots
users.edit=Labot
users.auth_source=Autorizācijas avots
users.auth_source=Authentication Source
users.local=Iebūvētā
users.auth_login_name=Autorizāciju, pietiekšanās vārds
users.auth_login_name=Authentication Login Name
users.update_profile_success=Konta profils tika veiksmīgi saglabāts.
users.edit_account=Labot kontu
users.is_activated=Konts ir aktivizēts
@@ -800,14 +803,14 @@ repos.watches=Vērošana
repos.stars=Atzīmētās zvaigznītes
repos.issues=Problēmas
auths.auth_manage_panel=Autorizāciju pārvaldības panelis
auths.new=Pievienot jaunu autorizācijas veidu
auths.auth_manage_panel=Authentication Manage Panel
auths.new=Add New Authentication Source
auths.name=Nosaukums
auths.type=Veids
auths.enabled=Iespējota
auths.updated=Atjaunināta
auths.auth_type=Autorizācijas veids
auths.auth_name=Autorizācijas nosaukums
auths.auth_type=Authentication Type
auths.auth_name=Authentication Name
auths.domain=Domēns
auths.host=Resursdators
auths.port=Ports
@@ -820,7 +823,7 @@ auths.attribute_mail=E-mail attribute
auths.filter=User Filter
auths.admin_filter=Admin Filter
auths.ms_ad_sa=MS Ad SA
auths.smtp_auth=SMTP autorizācijas veids
auths.smtp_auth=SMTP Authentication Type
auths.smtphost=SMTP resursdators
auths.smtpport=SMTP ports
auths.enable_tls=Iespējot TLS šifrēšanu
@@ -828,13 +831,13 @@ auths.skip_tls_verify=Skip TLS Verify
auths.pam_service_name=PAM Service Name
auths.enable_auto_register=Iespējot automātisko reģistrāciju
auths.tips=Padomi
auths.edit=Labot autorizācijas iestatījumus
auths.edit=Edit Authentication Setting
auths.activated=Autentifikācija ir aktivizēta
auths.update_success=Autorizācijas iestatījumi tika veiksmīgi saglabāti.
auths.update=Mainīt autorizācijas iestatījumus
auths.delete=Dzēst šo autorizāciju
auths.delete_auth_title=Autorizācijas dzēšana
auths.delete_auth_desc=Šī autorizācija tiks dzēsta, vai vēlaties turpināt?
auths.update_success=Authentication setting has been updated successfully.
auths.update=Update Authentication Setting
auths.delete=Delete This Authentication
auths.delete_auth_title=Authentication Deletion
auths.delete_auth_desc=This authentication is going to be deleted, do you want to continue?
config.server_config=Servera konfigurācija
config.app_name=Lietotnes nosaukums
@@ -953,6 +956,6 @@ raw_minutes=minūtes
[dropzone]
default_message=Drop files here or click to upload.
invalid_input_type=You can't upload files of this type.
file_too_big=File size({{filesize}} MB) exceeds maximum size({{maxFilesize}} MB).
remove_file=Remove file
file_too_big=Faila izmērs ({{filesize}} MB) pārsniedz maksimālo atļauto izmēru ({{maxFilesize}} MB).
remove_file=Noņemt failu
conf/locale/locale_zh-CN.ini
+22 -19
View File
@@ -241,7 +241,7 @@ location=所在地区
update_profile=更新信息
update_profile_success=您的个人信息更新成功！
change_username=用户名将被修改
change_username_desc=用户名被修改，您确定要继续操作吗？这将会影响到所有与您帐户有关的链接。
change_username_prompt=该操作将会影响到所有与您帐户有关的链接
continue=继续操作
cancel=取消操作
@@ -256,6 +256,7 @@ update_avatar_success=您的头像设置更新成功！
change_password=修改密码
old_password=当前密码
new_password=新的密码
retype_new_password=重新输入新的密码
password_incorrect=当前密码不正确！
change_password_success=密码修改成功！您现在可以使用新的密码登录。
@@ -265,6 +266,9 @@ email_desc=您的主要邮箱地址将被用于通知提醒和其它操作。
primary=主要
primary_email=设为主要
delete_email=删除
email_deletion=邮箱删除操作
email_deletion_desc=删除该邮箱地址将会移除所有相关的信息。是否继续?
email_deletion_success=邮箱删除成功！
add_new_email=添加新的邮箱地址
add_email=添加邮箱
add_email_confirmation_sent=一封待确认的电子邮件已发送到 <b>%s</b>，请在 %d 小时内检查您的收件箱，并完成确认过程。
@@ -281,7 +285,7 @@ key_name=密钥名称
key_content=密钥内容
add_key_success=新的 SSH 密钥 '%s' 添加成功！
delete_key=删除
ssh_key_deletion=删除 SSH 公钥
ssh_key_deletion=删除 SSH 公钥操作
ssh_key_deletion_desc=删除该 SSH 公钥将删除所有与您帐户相关的访问权限。是否继续?
ssh_key_deletion_success=SSH 公钥删除成功！
add_on=增加于
@@ -303,7 +307,7 @@ token_name=令牌名称
generate_token=生成令牌
generate_token_succees=新的操作令牌生成成功！您必须立即复制到一个安全的地方，因为该令牌只会显示一次！
delete_token=删除令牌
access_token_deletion=删除个人操作令牌
access_token_deletion=删除个人操作令牌操作
access_token_deletion_desc=删除该个人操作令牌将删除所有相关的应用程序的访问权限。是否继续?
delete_token_success=个人操作令牌删除成功！请更新与该令牌有关的所有应用。
@@ -457,7 +461,7 @@ issues.label_open_issues=%d 个开启的工单
issues.label_edit=编辑
issues.label_delete=删除
issues.label_modify=修改标签
issues.label_deletion=删除标签
issues.label_deletion=删除标签操作
issues.label_deletion_desc=删除该标签将会移除所有工单中相关的信息。是否继续？
issues.label_deletion_success=标签删除成功！
@@ -504,7 +508,7 @@ milestones.edit_subheader=使用更加清晰的描述来帮助人们更好地理
milestones.cancel=取消
milestones.modify=修改里程碑
milestones.edit_success=里程碑 '%s' 的修改内容已经生效！
milestones.deletion=删除里程碑
milestones.deletion=删除里程碑操作
milestones.deletion_desc=删除该里程碑将会移除所有工单中相关的信息。是否继续？
milestones.deletion_success=里程碑删除成功！
@@ -630,7 +634,6 @@ release.tag_name_already_exist=已经存在使用相同标签进行发布的版
[org]
org_name_holder=组织名称
org_name_helper=伟大的组织都有一个简短而寓意深刻的名字。
org_email_helper=组织的邮箱用于接收所有通知和确认邮件。
create_org=创建组织
repo_updated=最后更新于
people=组织成员
@@ -655,9 +658,9 @@ settings.full_name=组织全名
settings.website=官方网站
settings.location=所在地区
settings.update_settings=更新组织设置
settings.change_orgname=组织名称将被修改
settings.change_orgname_desc=组织名称被修改，您确定要继续操作吗？这将会影响到所有与该组织有关的链接。
settings.update_setting_success=组织设置更新成功！
settings.change_orgname_prompt=该操作将会影响到所有与该组织有关的链接
settings.update_avatar_success=组织头像更新成功！
settings.delete=删除组织
settings.delete_account=删除当前组织
settings.delete_prompt=删除操作会永久清除该组织的信息，并且 <strong>不可恢复</strong>！
@@ -776,7 +779,7 @@ users.created=创建时间
users.edit=编辑
users.auth_source=认证源
users.local=本地
users.auth_login_name=认证登录名
users.auth_login_name=认证登录名称
users.update_profile_success=该用户信息更新成功！
users.edit_account=编辑用户信息
users.is_activated=该用户已被激活
@@ -800,14 +803,14 @@ repos.watches=关注数
repos.stars=点赞数
repos.issues=工单数
auths.auth_manage_panel=授权认证管理面板
auths.auth_manage_panel=认证管理面板
auths.new=添加新的认证源
auths.name=认证名称
auths.type=认证类型
auths.enabled=已启用
auths.updated=最后更新时间
auths.auth_type=授权类型
auths.auth_name=授权名称
auths.auth_type=认证类型
auths.auth_name=认证名称
auths.domain=域名
auths.host=主机地址
auths.port=主机端口
@@ -820,7 +823,7 @@ auths.attribute_mail=邮箱属性
auths.filter=用户过滤规则
auths.admin_filter=管理员过滤规则
auths.ms_ad_sa=Ms Ad SA
auths.smtp_auth=SMTP 授权类型
auths.smtp_auth=SMTP 认证类型
auths.smtphost=SMTP 主机地址
auths.smtpport=SMTP 主机端口
auths.enable_tls=启用 TLS 加密
@@ -828,13 +831,13 @@ auths.skip_tls_verify=忽略 TLS 验证
auths.pam_service_name=PAM 服务名称
auths.enable_auto_register=允许授权用户自动注册
auths.tips=帮助提示
auths.edit=修改授权认证设置
auths.edit=编辑认证设置
auths.activated=该授权认证已经启用
auths.update_success=授权认证设置更新成功！
auths.update=更新授权认证信息
auths.delete=删除该授权认证
auths.delete_auth_title=授权认证删除操作
auths.delete_auth_desc=该授权认证将被删除，您确定要继续吗？
auths.update_success=认证设置更新成功！
auths.update=更新认证设置
auths.delete=删除该认证
auths.delete_auth_title=删除认证操作
auths.delete_auth_desc=该认证将被删除。是否继续？
config.server_config=服务器配置
config.app_name=应用名称
gogs.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.6.9.0910 Beta"
const APP_VER = "0.6.10.0910 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())
models/issue.go
+1 -1
View File
@@ -546,7 +546,7 @@ func GetIssueCountByPoster(uid, rid int64, isClosed bool) int64 {
// IssueUser represents an issue-user relation.
type IssueUser struct {
ID int64 `xorm:"pk autoincr"`
UID int64 `xorm:"uid INDEX"` // User ID.
UID int64 `xorm:"INDEX"` // User ID.
IssueID int64
RepoID int64 `xorm:"INDEX"`
MilestoneID int64
models/models.go
+1 -1
View File
@@ -87,7 +87,7 @@ func init() {
new(Team), new(OrgUser), new(TeamUser), new(TeamRepo),
new(Notice), new(EmailAddress))
gonicNames := []string{"SSL"}
gonicNames := []string{"UID", "SSL"}
for _, name := range gonicNames {
core.LintGonicMapper[name] = true
}
models/repo.go
+1 -1
View File
@@ -1658,7 +1658,7 @@ func NotifyWatchers(act *Action) error {
type Star struct {
ID int64 `xorm:"pk autoincr"`
UID int64 `xorm:"uid UNIQUE(s)"`
UID int64 `xorm:"UNIQUE(s)"`
RepoID int64 `xorm:"UNIQUE(s)"`
}
models/token.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
// AccessToken represents a personal access token.
type AccessToken struct {
ID int64 `xorm:"pk autoincr"`
UID int64 `xorm:"uid INDEX"`
UID int64 `xorm:"INDEX"`
Name string
Sha1 string `xorm:"UNIQUE VARCHAR(40)"`
Created time.Time `xorm:"CREATED"`
models/user.go
+10 -10
View File
@@ -110,8 +110,8 @@ func (u *User) AfterSet(colName string, _ xorm.Cell) {
// EmailAdresses is the list of all email addresses of a user. Can contain the
// primary email address, but is not obligatory
type EmailAddress struct {
Id int64
Uid int64 `xorm:"INDEX NOT NULL"`
ID int64 `xorm:"pk autoincr"`
UID int64 `xorm:"INDEX NOT NULL"`
Email string `xorm:"UNIQUE NOT NULL"`
IsActivated bool
IsPrimary bool `xorm:"-"`
@@ -624,7 +624,7 @@ func deleteUser(e *xorm.Session, u *User) error {
&Follow{FollowID: u.Id},
&Action{UserID: u.Id},
&IssueUser{UID: u.Id},
&EmailAddress{Uid: u.Id},
&EmailAddress{UID: u.Id},
); err != nil {
return fmt.Errorf("deleteUser: %v", err)
}
@@ -831,11 +831,11 @@ func AddEmailAddress(email *EmailAddress) error {
func (email *EmailAddress) Activate() error {
email.IsActivated = true
if _, err := x.Id(email.Id).AllCols().Update(email); err != nil {
if _, err := x.Id(email.ID).AllCols().Update(email); err != nil {
return err
}
if user, err := GetUserByID(email.Uid); err != nil {
if user, err := GetUserByID(email.UID); err != nil {
return err
} else {
user.Rands = GetUserSalt()
@@ -851,7 +851,7 @@ func DeleteEmailAddress(email *EmailAddress) error {
return ErrEmailNotExist
}
if _, err = x.Id(email.Id).Delete(email); err != nil {
if _, err = x.Id(email.ID).Delete(email); err != nil {
return err
}
@@ -871,12 +871,12 @@ func MakeEmailPrimary(email *EmailAddress) error {
return ErrEmailNotActivated
}
user := &User{Id: email.Uid}
user := &User{Id: email.UID}
has, err = x.Get(user)
if err != nil {
return err
} else if !has {
return ErrUserNotExist{email.Uid, ""}
return ErrUserNotExist{email.UID, ""}
}
// Make sure the former primary email doesn't disappear
@@ -885,7 +885,7 @@ func MakeEmailPrimary(email *EmailAddress) error {
if err != nil {
return err
} else if !has {
former_primary_email.Uid = user.Id
former_primary_email.UID = user.Id
former_primary_email.IsActivated = user.IsActive
x.Insert(former_primary_email)
}
@@ -962,7 +962,7 @@ func GetUserByEmail(email string) (*User, error) {
return nil, err
}
if has {
return GetUserByID(emailAddress.Uid)
return GetUserByID(emailAddress.UID)
}
return nil, ErrUserNotExist{0, "email"}
modules/auth/user_form.go
+1 -1
View File
@@ -110,7 +110,7 @@ func (f *UploadAvatarForm) Validate(ctx *macaron.Context, errs binding.Errors) b
}
type AddEmailForm struct {
Email string `binding:"Required;Email;MaxSize(50)"`
Email string `binding:"Required;Email;MaxSize(254)"`
}
func (f *AddEmailForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
modules/bindata/bindata.go
+8 -8
View File
@@ -4344,7 +4344,7 @@ func confLocaleLocale_bgBgIni() (*asset, error) {
return a, nil
}
var _confLocaleLocale_deDeIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xb4\xbd\xdb\x8e\x24\xc5\x92\x2e\x7c\xdf\x52\xbf\x43\xd0\xa3\xfe\x01\xa9\x2a\x5b\xc0\x7f\x12\x22\x61\x57\xd3\xc7\x45\x17\xdd\x43\x35\x20\x81\x50\x12\x99\xe1\x99\x19\x93\x91\x11\xb9\xc2\x23\xaa\xba\x6a\x34\xd2\xbe\x98\x67\xd8\x57\x5b\x9a\x1b\xb4\x1f\x81\x2b\xee\xea\x4d\xf6\x93\x6c\xfb\xcc\xcc\x4f\x11\x91\x45\xaf\xb5\x66\x2e\xa0\x2b\xc3\xcd\x4f\xe6\xee\xe6\x76\xf6\xfc\x70\x58\x14\xc6\xae\xe6\x4f\xcb\x3a\xb3\xab\xed\xde\xb4\x37\x55\x63\x4d\x7b\x92\x59\x53\x2d\x6d\x97\x6d\xcc\xb6\xb1\x9d\xe9\x4c\x9b\x3d\x2f\xbb\xd3\x0b\xd3\x5e\x96\x2b\x73\x42\xdf\x09\xbc\x2d\xcd\xd2\xd4\x19\xd5\x7d\xde\xdc\xbf\x77\xff\xde\xb6\xd9\x9b\xf9\x0b\xfa\xdf\xfd\x7b\x45\x6e\xb7\xcb\x26\x6f\x8b\xf9\xed\xff\x5c\x9a\xd6\x96\xab\x6d\x77\xff\x9e\x79\x77\xa8\x9a\xd6\xcc\x9f\xb6\xbb\xbe\x2e\x4c\x4d\x55\x4c\x75\x98\xbf\x28\xab\x35\xd5\xb1\xe5\xa6\x5e\x94\xf5\xfc\xac\xde\x9b\x8a\x4b\x6d\xb3\x2a\xf3\x6a\x91\x16\xf4\xf5\x26\xbb\xfd\x83\x1a\xcd\x6c\x73\x43\xc5\xc6\x66\xdf\x34\x75\xd7\x7c\x9e\xdd\x5c\x99\x12\x23\xbd\xc0\xd0\xba\x2e\xfb\xc2\xee\xf3\xaa\xfa\x92\x4b\xb3\x4b\xd3\xee\xea\xdb\x3f\x0e\x6b\x53\x7f\xf1\x48\x0a\xb4\xcb\xa6\xef\xe6\x67\x4b\xdf\x27\x3e\xf5\x87\xf9\x77\x66\x53\xda\x8e\xa6\xd8\xe2\x6b\xcb\xbf\x4c\x3b\xf8\x7c\x65\x96\x96\xba\x9c\xff\x48\xff\xa2\xef\xfb\xf7\x2e\x31\xd9\xa6\x9e\xff\x20\xff\xde\xbf\x77\xc8\x37\x66\x7e\x21\x85\x9d\xd9\x1f\xaa\x9c\xe0\x7f\x68\xda\x8a\xbe\xdf\xbf\x57\xe5\xf5\xa6\x67\x88\x43\x9b\xaf\xb6\xf4\x65\xd5\x1a\x82\x58\xd4\xe6\x8a\xd0\x44\x5d\x56\x95\xa9\x67\xb3\xd9\xfd\x7b\x3d\xad\xcb\xe2\xd0\x36\xeb\xb2\x32\x8b\xbc\x2e\x16\x7b\xa0\xf2\xb1\xa9\xfb\xee\xc6\xb4\x52\x90\x11\x5a\xb3\xbd\xd9\xb6\x32\x0f\x53\x10\xda\x16\xb9\xc5\xfa\x6e\x4c\xd5\x6c\x36\x5d\x96\x57\x16\x6b\x85\xd6\xea\x7c\x1f\x1a\xc0\x0f\x5a\xa1\x7d\x5e\x56\xf3\xa7\xa7\xe7\xf4\x0f\xc6\x6e\xed\x55\x43\x8b\xf8\x46\xfe\xe8\x80\x88\x45\x77\x7d\x30\xfe\x4b\xb6\x34\xb6\xbb\xfd\xad\x2b\x37\xc0\xc7\x2a\x3f\x74\xab\x6d\x3e\xff\x5a\xfe\x45\x47\xad\x39\x34\x84\xa3\xa6\xbd\x26\xdc\xb9\x3f\xef\xdf\x6b\xda\x4d\x5e\x97\x37\x79\x07\x64\xbd\xe6\x1f\x96\x7f\xdc\xbf\xb7\x2f\xdb\xb6\x69\x09\x23\xa5\xa1\x41\xdf\xbf\x47\xa8\x58\xa0\x95\xf9\xb7\xa6\xa7\xc5\x8e\x5b\x41\xd1\xbe\xdc\xb4\xc0\x29\x4a\xb3\x73\xfe\xc1\xcd\xa0\x6c\xdd\xb4\x3b\xad\x96\x2f\x69\xcf\x1e\xf2\x0a\x9b\x79\xdc\x08\x0d\x47\x1a\x18\x0c\x25\xaf\x69\x71\xb8\x34\x2e\xa0\x4d\x4f\xeb\x7c\x85\xc6\x08\x28\x2f\xf6\x84\xe5\x43\x5e\x9b\x6a\x7e\x86\xbf\x4f\xdf\xe0\x6f\x2a\x58\xad\x9a\xbe\xee\x16\xd6\x74\x1d\x2d\x80\x9d\xf3\x4e\x34\x65\xcd\xcb\x4a\xfb\x98\xf7\x9b\x2b\x7c\x9a\x7e\xbf\x6e\x7a\xbf\xdc\xf3\x27\x54\x29\x7b\xc3\x3f\xb4\xc4\x57\x43\x91\xc9\x06\x95\x79\x52\x76\xb1\x36\xa6\xa0\x69\x5d\xd9\xec\x19\xfd\x45\xeb\xd9\x57\x15\xa1\xf2\xaf\x84\x8f\xce\xce\xdf\xd0\x2f\x42\x84\xfc\xba\x7f\xaf\xb4\x96\xfe\x9a\xbf\xe4\x7f\xd0\xc4\x2a\xaf\x57\x98\xd2\x72\xd9\x1a\xda\x9a\xdc\xec\xcf\xd6\xe4\xed\x6a\xfb\x0b\xc6\x8d\x3f\xe6\x17\x3d\x8a\x78\x83\x1e\x59\x69\xec\x34\xbf\xcb\xb4\x9b\x39\xcd\x65\x59\x99\x3d\x75\xd2\x14\x66\xfe\x35\xfd\x8f\x5b\xc7\x2c\xe8\x64\x52\xf3\xfa\xd7\xfc\xa5\xfc\xab\xeb\xd1\x95\x1d\x61\x23\xfe\x96\xad\x6f\xff\x68\x33\x3a\x6c\x1d\x1d\x69\x6c\xc2\xec\xa2\xcb\x65\xa3\xfe\xb5\xa7\x43\xb7\x28\x96\x42\xe2\x9e\x37\x1b\x4b\x70\xb4\x23\x0a\x43\xdb\xf6\xfc\xfa\xe2\x9f\x5f\x9d\x64\x6f\x88\xba\x6d\x5a\x43\x7f\x67\x34\x06\x22\x1d\xff\xfc\x8a\x2a\x65\x9f\x9d\xd0\x7e\xf1\x3f\x3f\xcb\xe8\xc8\x83\xcc\x01\xa2\x59\xaf\xcb\x9b\x92\x8f\x65\xb6\x2c\xeb\xdb\xdf\x88\x10\x64\x7a\xda\xb3\x7c\x57\x5e\x12\x69\xe8\x08\x1b\xd4\xaf\x8c\xf6\x09\x6d\xce\x7a\x99\xd7\xbb\xc1\xc2\x03\x00\x27\xc9\x97\xd3\x2f\xd0\x50\xdb\x11\x0d\xb5\xdd\x08\x71\x13\x87\x91\x9a\xe0\x33\xec\x9b\x90\x43\x4c\x9f\x41\x57\x51\x9b\xc8\xa0\xe1\xbd\x6a\x40\x6f\xb3\x97\x75\xdd\x3c\x79\x7c\xfa\xb4\xde\x60\xd3\xec\xcb\x2e\xeb\xbb\xf5\xff\xbf\xa0\xf1\x98\x96\x08\xed\xaa\xcc\x7e\x32\x25\x16\x94\xf6\xf9\x8d\xa0\x96\x11\x45\xf3\xb1\xb6\x22\x8a\x43\x8b\x75\x71\xf1\xea\xf4\xbc\x29\x7a\x8b\x21\x75\xdb\xf9\x9b\x75\x4e\x5b\xcb\xfe\xb5\x02\xb6\xb5\xdf\x27\x84\x28\x0c\xaa\x3c\x50\x21\xa1\xcd\x7a\x4c\xfa\xa1\x52\x93\xa6\x6d\x17\x44\x11\xbb\xeb\x85\xd6\xf6\xed\x65\x37\xbd\x47\xfe\xa9\xaf\x92\x15\x79\xbb\xce\x6a\xdc\x25\x59\x65\x70\x01\x10\x4a\x67\xd8\x38\x6e\x02\x82\xf1\xb3\xaa\xda\x98\xfd\xf8\x5c\x64\x97\x0d\xae\xaa\x0d\x8d\x1c\x37\x1f\xa3\xee\xac\x06\x6a\xa8\xd8\x0a\xee\x5c\x81\x9b\xc9\x0b\x5a\xce\x0c\xa8\x8b\xcf\x3f\xc3\xd6\x19\xf5\x40\x28\xa2\x86\x75\xf3\xcb\xf8\xc3\xde\xcf\xbe\x6b\x9a\xee\x94\xf6\xc6\x0d\x90\x4a\x95\x0f\x8c\x2a\x0f\xea\xfa\xa0\xf1\x1a\xbe\x5e\x43\x55\x9b\x5d\x99\xb6\x90\xcb\xb5\x28\x8d\x35\xfb\x2c\x6a\x07\xd7\xef\x81\x17\x8a\xb7\x5a\xdb\xd3\x8d\x85\xcd\x72\xd6\x5b\x1a\xd0\xb6\xc5\x62\xb7\x59\xd8\x3a\x0e\x20\x5e\x1e\x57\x9a\xed\x7b\x6b\xd1\x47\xf6\x53\xbf\x69\xcb\xf5\xda\xd2\xc6\xa7\xf3\x4e\x14\x1d\x37\x2d\xef\x01\xba\xcd\xb3\x3b\xa6\x95\x6d\x73\xf0\x01\xb8\x7b\xd0\x6f\x1e\x8d\x22\x74\xe3\x70\xef\x16\xad\x68\xe8\xaa\xa9\xe7\x4f\xf8\x1f\xf7\xd3\x0f\x90\xa6\x4c\xad\x76\x19\xcd\xe8\xaa\x04\xbLine truncated
var _confLocaleLocale_deDeIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xb4\xbd\xdb\x8e\x1b\xc7\xb2\x26\x7c\x2f\x40\xef\x50\xd6\x86\x7e\xdb\x40\x93\x82\x97\xff\x39\xc0\x30\xe5\x69\x9d\xb5\xac\x96\xb4\xdd\xb2\x0d\xd8\x30\xe8\x22\x2b\x49\xd6\x66\xb1\x8a\xab\xb2\xd8\xad\xee\x8d\x0d\xcc\xc5\x7e\x86\xb9\x1a\x60\xdf\x18\xf3\x08\xbe\xf2\x5d\xbf\xc9\x3c\xc9\xc4\x17\x11\x79\xaa\x2a\xb6\xb4\x96\x67\x2e\x6c\x35\x2b\x23\x4f\x91\x99\x91\x71\xce\x7c\xbf\x9f\x17\xc6\x2e\x67\x4f\xcb\x3a\xb3\xcb\xcd\xce\xb4\xd7\x55\x63\x4d\x7b\x92\x59\x53\x2d\x6c\x97\xad\xcd\xa6\xb1\x9d\xe9\x4c\x9b\x3d\x2f\xbb\xc9\xb9\x69\x2f\xca\xa5\x39\xa1\xef\x04\xde\x96\x66\x61\xea\x8c\xea\x3e\x6f\xee\xde\xb9\x7b\x67\xd3\xec\xcc\xec\x05\xfd\xef\xee\x9d\x22\xb7\x9b\x45\x93\xb7\xc5\xec\xe6\x7f\x2e\x4c\x6b\xcb\xe5\xa6\xbb\x7b\xc7\xbc\xdf\x57\x4d\x6b\x66\x4f\xdb\xed\xa1\x2e\x4c\x4d\x55\x4c\xb5\x9f\xbd\x28\xab\x15\xd5\xb1\xe5\xba\x9e\x97\xf5\xec\xb4\xde\x99\x8a\x4b\x6d\xb3\x2c\xf3\x6a\x9e\x16\x1c\xea\x75\x76\xf3\x07\x35\x9a\xd9\xe6\x9a\x8a\x8d\xcd\xbe\x6d\xea\xae\xf9\x2a\xbb\xbe\x34\x25\x46\x7a\x8e\xa1\x75\x5d\xf6\xb5\xdd\xe5\x55\xf5\x90\x4b\xb3\x0b\xd3\x6e\xeb\x9b\x3f\xf6\x2b\x53\x7f\xfd\x40\x0a\xb4\xcb\xe6\xd0\xcd\x4e\x17\xbe\x4f\x7c\x3a\xec\x67\xdf\x99\x75\x69\x3b\x9a\x62\x8b\xaf\x2d\xff\x32\x6d\xef\xf3\xa5\x59\x58\xea\x72\xf6\x23\xfd\x8b\xbe\xef\xde\xb9\xc0\x64\x9b\x7a\xf6\x83\xfc\x7b\xf7\xce\x3e\x5f\x9b\xd9\xb9\x14\x76\x66\xb7\xaf\x72\x82\xff\xa1\x69\x2b\xfa\x7e\xf7\x4e\x95\xd7\xeb\x03\x43\xec\xdb\x7c\xb9\xa1\x2f\xcb\xd6\x10\xc4\xbc\x36\x97\x84\x26\xea\xb2\xaa\x4c\x3d\x9d\x4e\xef\xde\x39\xd0\xba\xcc\xf7\x6d\xb3\x2a\x2b\x33\xcf\xeb\x62\xbe\x03\x2a\x1f\x99\xfa\xd0\x5d\x9b\x56\x0a\x32\x42\x6b\xb6\x33\x9b\x56\xe6\x61\x0a\x42\xdb\x3c\xb7\x58\xdf\xb5\xa9\x9a\xf5\xba\xcb\xf2\xca\x62\xad\xd0\x5a\x9d\xef\x42\x03\xf8\x41\x2b\xb4\xcb\xcb\x6a\xf6\x74\x72\x46\xff\x60\xec\xd6\x5e\x36\xb4\x88\x6f\xe5\x8f\x0e\x88\x98\x77\x57\x7b\xe3\xbf\x64\x0b\x63\xbb\x9b\xdf\xba\x72\x0d\x7c\x2c\xf3\x7d\xb7\xdc\xe4\xb3\xc7\xf2\x2f\x3a\x6a\xcd\xbe\x21\x1c\x35\xed\x15\xe1\xce\xfd\x79\xf7\x4e\xd3\xae\xf3\xba\xbc\xce\x3b\x20\xeb\x0d\xff\xb0\xfc\xe3\xee\x9d\x5d\xd9\xb6\x4d\x4b\x18\x29\x0d\x0d\xfa\xee\x1d\x42\xc5\x1c\xad\xcc\x5e\x9b\x03\x2d\x76\xdc\x0a\x8a\x76\xe5\xba\x05\x4e\x51\x9a\x9d\xf1\x0f\x6e\x06\x65\xab\xa6\xdd\x6a\xb5\x7c\x41\x7b\x76\x9f\x57\xd8\xcc\xc3\x46\x68\x38\xd2\x40\x6f\x28\x79\x4d\x8b\xc3\xa5\x71\x01\x6d\x7a\x5a\xe7\x4b\x34\x46\x40\x79\xb1\x23\x2c\xef\xf3\xda\x54\xb3\x53\xfc\x3d\x79\x8b\xbf\xa9\x60\xb9\x6c\x0e\x75\x37\xb7\xa6\xeb\x68\x01\xec\x8c\x77\xa2\x29\x6b\x5e\x56\xda\xc7\xbc\xdf\x5c\xe1\xd3\xf4\xfb\x55\x73\xf0\xcb\x3d\x7b\x42\x95\xb2\xb7\xfc\x43\x4b\x7c\x35\x14\x99\xac\x57\x99\x27\x65\xe7\x2b\x63\x0a\x9a\xd6\xa5\xcd\x9e\xd1\x5f\xb4\x9e\x87\xaa\x22\x54\xfe\x8d\xf0\xd1\xd9\xd9\x5b\xfa\x45\x88\x90\x5f\x77\xef\x94\xd6\xd2\x5f\xb3\x97\xfc\x0f\x9a\x58\xe6\xf5\x12\x53\x5a\x2c\x5a\x43\x5b\x93\x9b\xfd\xd9\x9a\xbc\x5d\x6e\x7e\xc1\xb8\xf1\xc7\xec\xfc\x80\x22\xde\xa0\x47\x56\x1a\x3b\xcd\xef\x32\xed\x66\x46\x73\x59\x54\x66\x47\x9d\x34\x85\x99\x3d\xa6\xff\x71\xeb\x98\x05\x9d\x4c\x6a\x5e\xff\x9a\xbd\x94\x7f\x75\x3d\xba\xb2\x23\x6c\xc4\xdf\xb2\xd5\xcd\x1f\x6d\x46\x87\xad\xa3\x23\x8d\x4d\x98\x9d\x77\xb9\x6c\xd4\xbf\x1d\xe8\xd0\xcd\x8b\x85\x90\xb8\xe7\xcd\xda\x12\x1c\xed\x88\xc2\xd0\xb6\x3d\xbb\x3a\xff\xe7\x57\x27\xd9\x5b\xa2\x6e\xeb\xd6\xd0\xdf\x19\x8d\x81\x48\xc7\x3f\xbf\xa2\x4a\xd9\x97\x27\xb4\x5f\xfc\xcf\x2f\x33\x3a\xf2\x20\x73\x80\x68\x56\xab\xf2\xba\xe4\x63\x99\x2d\xca\xfa\xe6\x37\x22\x04\x99\x9e\xf6\x2c\xdf\x96\x17\x44\x1a\x3a\xc2\x06\xf5\x2b\xa3\x7d\x42\x9b\xb3\x5e\xe4\xf5\xb6\xb7\xf0\x00\xc0\x49\xf2\xe5\xf4\x0b\x34\xd4\x76\x44\x43\x6d\x37\x40\xdc\xc8\x61\xa4\x26\xf8\x0c\xfb\x26\xe4\x10\xd3\x67\xd0\x55\xd4\x26\x32\x68\x78\xaf\x1a\xd0\xdb\xec\x65\x5d\x37\x4f\x1e\x4d\x9e\xd6\x6b\x6c\x9a\x5d\xd9\x65\x87\x6e\xf5\x5f\xe7\x34\x1e\xd3\x12\xa1\x5d\x96\xd9\x4f\xa6\xc4\x82\xd2\x3e\xbf\x16\xd4\x32\xa2\x68\x3e\xd6\x56\x44\x71\x68\xb1\xce\xcf\x5f\x4d\xce\x9a\xe2\x60\x31\xa4\x6e\x33\x7b\xbb\xca\x69\x6b\xd9\xbf\x55\xc0\xb6\xf6\xfb\x84\x10\x85\x41\x95\x7b\x2a\x24\xb4\x59\x8f\x49\x3f\x54\x6a\xd2\xb4\xed\x9c\x28\x62\x77\x35\xd7\xda\xbe\xbd\xec\xfa\xe0\x91\x3f\xf1\x55\xb2\x22\x6f\x57\x59\x8d\xbb\x24\xab\x0c\x2e\x00\x42\xe9\x14\x1b\xc7\x4d\x40\x30\x7e\x5a\x55\x6b\xb3\x1b\x9e\x8b\xec\xa2\xc1\x55\xb5\xa6\x91\xe3\xe6\x63\xd4\x9d\xd6\x40\x0d\x15\x5b\xc1\x9d\x2b\x70\x33\x79\x41\xcb\x99\x01\x75\xf1\xf9\x67\xd8\x3a\xa3\x1e\x08\x45\xd4\xb0\x6e\x7e\x19\x7f\xd8\xfb\xd9\x77\x4d\xd3\x4d\x68\x6f\x5c\x03\xa9\x54\x79\xcf\xa8\xf2\xa0\xae\x0f\x1a\xaf\xe1\xeb\x35\x54\xb5\xd9\xa5\x69\x0b\xb9\x5c\x8b\xd2\x58\xb3\xcb\xa2\x76\x70\xfd\xee\x79\xa1\x78\xab\xb5\x07\xba\xb1\xb0\x59\x4e\x0f\x96\x06\xb4\x69\xb1\xd8\x6d\x16\xb6\x8e\x03\x88\x97\xc7\x95\x66\xbb\x83\xb5\xe8\x23\xfb\xe9\xb0\x6e\xcb\xd5\xca\xd2\xc6\xa7\xf3\x4e\x14\x1d\x37\x2d\xef\x01\xba\xcd\xb3\x5b\xa6\x95\x6d\x72\xf0\x01\xb8\x7b\xd0\x6f\x1e\x8d\x22\x74\xe3\x70\xef\x16\xad\x68\xe8\xaa\xa9\x67\x4f\xf8\x1f\xf7\xd3\x0f\x90\xa6\x4c\xad\x76\x19\xcd\xe8\xb2\x0Line truncated
func confLocaleLocale_deDeIniBytes() ([]byte, error) {
return bindataRead(
@@ -4359,12 +4359,12 @@ func confLocaleLocale_deDeIni() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "conf/locale/locale_de-DE.ini", size: 45690, mode: os.FileMode(493), modTime: time.Unix(1441457542, 0)}
info := bindataFileInfo{name: "conf/locale/locale_de-DE.ini", size: 45849, mode: os.FileMode(493), modTime: time.Unix(1441913798, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\xbd\xeb\x92\xdc\x46\xae\x27\xfe\x9d\x4f\x41\xeb\x84\xfe\xb2\x23\x5a\xa5\xb0\xfd\xdf\x4b\x38\x24\x79\x5b\xdd\xd6\x65\x8e\x5a\xdd\xa3\x6e\xcf\xec\xac\x42\x41\xb3\x8a\xac\x2a\x8e\xaa\xc8\x32\xc9\x52\xa9\xe7\xc4\x89\xd8\xd7\xd8\xd7\xdb\x27\x59\xe0\x07\x20\x2f\x24\xab\x25\x79\x4e\xec\x7e\xe9\x66\x65\x22\x6f\x48\x24\x12\x40\x22\x91\xf9\x6e\x97\x15\x65\xb7\x48\x9f\xa4\xa7\xe9\x2e\xaf\xea\x4d\xd9\x75\x69\x57\x6e\x96\x0f\xd7\x4d\xd7\x97\x45\xfa\xa2\xea\xe9\x77\xfb\xb1\x5a\x94\x49\xb2\x6e\xb6\x25\x81\xbe\xa4\x7f\x49\x91\x77\xeb\x79\x93\xb7\x05\x25\x9c\xdb\x77\x52\x7e\xda\x6d\x9a\x96\x81\x7e\x91\xaf\x64\x5d\x6e\x76\x5c\x86\xfe\x25\x5d\xb5\xaa\xb3\xaa\xa6\x9f\xd7\xf4\x95\xbe\xaa\x93\xae\x59\x54\xf9\x26\x0b\x32\x90\x60\xf9\x3f\xa5\x3f\xd4\x45\x7a\xdd\x97\xbb\xf4\x71\xb7\xcd\x37\x9b\xa7\x79\x87\x22\x7d\x99\xe6\x8b\x45\xb3\xaf\xfb\xc7\x8f\x24\x43\x2a\x6f\xf6\xbd\xd5\x7e\xb9\xef\x25\x6d\xbf\xb3\xa4\x5f\x77\x49\x5b\xae\x2a\x1a\x58\x4b\x49\x6f\xf5\x33\x39\x94\xf3\xae\xea\xb9\xd3\x7f\x95\xaf\xe4\x63\xd9\x76\x55\xc3\xfd\xf9\x8b\x7c\x25\xbb\x7c\xc5\x00\x57\xf4\x2f\xe9\xcb\xed\x6e\x93\xa3\xc0\x8d\x7e\x26\x9b\xbc\x5e\xed\x05\xe6\xb5\x7e\x26\x8b\xb6\xa4\xac\xac\x2e\x0f\x94\x7a\x86\x1f\x29\xfd\x98\xcd\x66\xc9\x9e\x70\x9a\xed\xda\x66\x59\x6d\xca\x2c\xaf\x8b\x6c\x2b\x58\xfb\x95\xd2\x53\x4d\x4f\x29\x3d\xe5\x74\x0c\xa3\x2c\x08\x41\x59\xde\xe9\x58\x68\x6a\x08\x5f\x79\x97\xa0\xaa\x3a\xdf\x5a\x69\xfe\x4c\xca\x6d\x5e\x6d\x78\x12\x1e\xf2\x07\x75\xbe\xeb\x0e\x0d\xa6\xea\x4a\x3f\x09\x11\x59\x7f\xbb\x2b\x81\x87\x87\x37\xf4\x95\x2c\xf2\x5d\xbf\x58\xe7\xdc\x57\xf9\x4a\x08\x68\xd7\x10\x42\x9a\xf6\x16\x70\xf6\x23\x69\xda\x55\x5e\x57\xff\xc8\x7b\x41\xd2\x65\xf0\x33\xd9\x56\x6d\xdb\x30\x7e\x2f\xf0\x91\xd0\x88\x33\xae\x87\x52\xde\x10\x26\x82\x5a\x38\x67\x5b\xad\x5a\x41\x25\x67\x5e\xe0\x17\xd7\xc2\x79\xcb\xa6\xfd\xa0\x19\xcf\xf9\x73\x50\x94\x3a\xa1\xb9\x71\xfb\x79\x4d\xc8\xd7\xdc\x0b\xfc\x88\x00\xba\x24\x2f\xb6\x84\xca\x5d\x5e\x97\x8c\xa3\x53\xfe\x45\x78\xa1\x5f\x89\xd2\x54\xd6\x95\x7d\x5f\xd5\x2b\x46\xf6\xa9\x24\xa5\xd7\x9a\x94\x04\x79\x2e\xed\xb6\xd9\xbb\xe9\xa4\xf4\xbf\xd1\xcf\xf4\x4a\x7e\x4a\x5e\x50\x08\x99\xae\x24\x8f\xa4\xcb\x96\x65\x59\xc8\x58\xba\xf4\x39\x7d\x27\xbb\xfd\x66\x43\x58\xfb\x7d\x5f\x76\x3d\x17\xba\xa2\xdf\x34\x7e\xf9\x9d\x54\x5d\x47\x1f\x94\xfc\x0a\x1f\x09\x4d\x5d\xbd\xc0\x60\xce\xf0\x91\x24\xef\xba\x32\x6f\x17\xeb\xf7\x89\xfc\x47\x5f\xf9\x83\x69\xef\xd8\xa4\x32\x21\x29\x11\x49\x0b\xd6\x40\xb2\x68\x0a\xfe\x71\x46\xff\xa8\xea\xaa\xee\x7a\x5a\x71\xef\x13\xfd\x60\x30\xf9\x92\x09\xe8\xab\x1e\x58\xd0\x44\x2c\xdf\x8e\x67\x30\x7d\x5e\xb5\x5d\xff\xb0\xaf\x88\x58\xdf\xee\xeb\x84\xc7\x47\xab\x2d\x2b\xe6\xc6\x84\x5e\x34\x84\x22\x24\xb7\x34\xbe\x8b\xdb\xeb\x3f\xbf\x3e\x49\xaf\x88\x13\xad\xda\x92\xbe\x53\xaa\x83\xfe\x51\x99\x1f\x67\x09\x95\xb2\x96\xce\xf3\x3e\x9f\xe7\x5d\xe9\xd1\xca\x99\x42\xdd\x2e\x0f\x34\xce\x5c\x0d\x1c\xac\xeb\xa3\xf1\x4e\xad\x10\xaa\x43\xd7\x95\xab\xe3\x0d\x2f\x2e\x4a\x67\xa6\x86\xc2\x57\x9b\x92\xd3\xa9\xaa\xf4\xd5\x9b\x37\x97\xe7\xcf\xd2\xb2\x5e\x55\x75\x99\x1e\xaa\x7e\x9d\xee\xfb\xe5\x7f\xcd\x56\x65\x5d\xb6\xc4\xe3\x16\x55\x4a\x6b\xaa\x25\x4a\x48\x89\xb0\x65\x70\xb3\xa4\xeb\x36\xb4\xf6\x81\xde\xeb\xeb\xd7\xe9\x05\xa3\x78\x97\xf7\x6b\x74\xa4\x5f\x27\xdd\xef\x1b\x46\x91\x6b\xf0\x66\x5d\xa6\xa0\x32\x00\x35\x4b\xc3\x47\x5a\x68\x1f\x67\x49\xd9\xb6\x19\xb1\xa5\xfe\x36\xd3\xc2\x5a\xdf\x10\x52\xaa\x20\xd2\xa9\x9b\x3e\x9d\x97\x29\xca\xcc\x92\xc4\x3a\x6c\xd8\x3d\xdd\xed\x36\xd5\x42\xd6\xfa\x0b\xc9\xf3\x88\xe6\x1d\x44\xb1\x14\xc2\x01\x51\x96\x17\xa0\x8b\xd8\x33\xaf\x87\x34\x62\x20\x28\xbf\x2e\x89\x01\xae\xf7\x2b\x61\x7b\x9b\x66\x5f\x7c\x03\x4a\xb5\xde\x7b\x42\x4d\xdf\x36\xd4\x61\x60\xc7\x01\xf8\x26\x4e\x89\xe2\x78\xd3\x6a\xcb\x6d\x43\x7c\xc5\x11\x7b\x45\x04\x75\xa8\x28\x93\x46\xda\xe5\x1f\x69\xbd\xf5\x4d\xda\xaf\xab\x2e\x2d\x88\xd8\x16\x5c\x31\x2d\x8d\x3d\x6d\x17\x42\x16\x44\xa0\x42\x1a\x96\x16\xcf\x01\xa0\xb6\x7b\xa2\xa6\x35\x55\xc6\x9b\x11\xef\x9c\x54\xe5\x54\x3f\x31\x24\xaa\x07\xf4\x4d\x94\xdb\x10\x57\x66\xbe\x79\x8e\x0f\xfd\x1d\xd6\x4f\xbd\xca\x97\x4b\xea\x55\x47\x54\xf1\x32\x5d\x6c\x1a\x22\xa9\x5f\xdf\xbe\xee\x98\x60\xd6\xd9\xae\x69\xb1\xcd\x51\xd6\x15\x7d\xba\xb4\x00\xd1\x0c\x51\xef\xb7\x73\xfa\x75\x58\x57\xc4\x01\x80\x76\x2e\xc1\xbb\x39\xa5\x52\x13\xfb\x8e\xa6\xf0\x24\x25\x12\xa6\x11\x10\xca\x40\x00\x3c\x86\xa2\xea\xf2\x39\xcd\x3d\x83\x2f\x69\xdb\xda\xb7\x44\x56\xeb\xbe\xdf\x59\xcb\x2f\x6f\x6e\xae\xa4\x69\x97\x7a\x57\xdb\x79\x40\x19\x98\x83\x0d\x6f\xbc\x75\xda\xd4\x33\x10\xc9\xbe\xdd\x0c\xe8\x87\xc6\x6a\x39\x47\xf0\xc2\x5d\x78\xc4\x7f\xae\x3d\x7a\x80\xe7\x8e\xa4\x93\x03\xa8\x89\x70\x5c\x62\x03\x24\xa2\x6e\x76\x5c\x6f\x40\xd5\x97\x9a\xe0\x49\x19\x9b\xa6\xcb\x97\xad\x93\x72\x21\xfb\x04\xec\x7f\x4b\x03\x56\x36\x72\x7d\x41\x68\x00\x2f\x41\xea\xb2\x6d\xb6\x94\xfa\x9c\xfe\xf9\x04\xdf\xfd\x0b\xae\x0f\x30\x79\x51\x10\x7f\xeb\x4e\xd2\xb7\xcf\xcf\xd2\xff\xf4\xe3\x0f\x3f\xcc\xd2\x57\x3d\xaf\x44\x26\xce\xbf\x33\x51\xd1\xa7\xec\xe1\x0e\x94\x58\x46\x4f\x7Line truncated
var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\xbd\xeb\x72\xdc\x48\xae\x27\xfe\x9d\x4f\xc1\xf6\x09\xff\xdd\x1d\x21\x97\xa3\xbb\xff\x7b\x89\x0e\xdb\xbd\xb2\xd4\xbe\xcc\xb1\x2c\x8d\xa5\x9e\xd9\x59\x87\xa3\x9a\x55\xa4\xaa\x38\xae\x22\xab\x49\x96\x65\xcd\x89\x13\xb1\xaf\xb1\xaf\xb7\x4f\xb2\xc0\x0f\x40\xde\xc8\x92\xed\x9e\x13\xbb\x5f\x24\x56\x26\xf2\x86\x44\x22\x01\x24\x12\x59\xec\x76\xf3\xb2\xea\x97\xf9\x93\xfc\x38\xdf\x15\x75\xb3\xa9\xfa\x3e\xef\xab\xcd\xf5\xc3\x75\xdb\x0f\x55\x99\xbf\xa8\x07\xfa\xdd\x7d\xac\x97\x55\x96\xad\xdb\x6d\x45\xa0\x2f\xe9\x5f\x56\x16\xfd\x7a\xd1\x16\x5d\x49\x09\xa7\xf6\x9d\x55\x9f\x76\x9b\xb6\x63\xa0\x5f\xe4\x2b\x5b\x57\x9b\x1d\x97\xa1\x7f\x59\x5f\xaf\x9a\x79\xdd\xd0\xcf\x4b\xfa\xca\x5f\x35\x59\xdf\x2e\xeb\x62\x33\x0f\x32\x90\x60\xf9\x3f\xe5\x3f\x34\x65\x7e\x39\x54\xbb\xfc\x71\xbf\x2d\x36\x9b\xa7\x45\x8f\x22\x43\x95\x17\xcb\x65\xbb\x6f\x86\xc7\x8f\x24\x43\x2a\x6f\xf7\x83\xd5\x7e\xbe\x1f\x24\x6d\xbf\xb3\xa4\x5f\x77\x59\x57\xad\x6a\x1a\x58\x47\x49\x6f\xf5\x33\xbb\xa9\x16\x7d\x3d\x70\xa7\xff\x2a\x5f\xd9\xc7\xaa\xeb\xeb\x96\xfb\xf3\x17\xf9\xca\x76\xc5\x8a\x01\x2e\xe8\x5f\x36\x54\xdb\xdd\xa6\x40\x81\x2b\xfd\xcc\x36\x45\xb3\xda\x0b\xcc\x6b\xfd\xcc\x96\x5d\x45\x59\xf3\xa6\xba\xa1\xd4\x13\xfc\xc8\xe9\xc7\x6c\x36\xcb\xf6\x84\xd3\xf9\xae\x6b\xaf\xeb\x4d\x35\x2f\x9a\x72\xbe\x15\xac\xfd\x4a\xe9\xb9\xa6\xe7\x94\x9e\x73\x3a\x86\x51\x95\x84\xa0\x79\xd1\xeb\x58\x68\x6a\x08\x5f\x45\x9f\xa1\xaa\xa6\xd8\x5a\x69\xfe\xcc\xaa\x6d\x51\x6f\x78\x12\x1e\xf2\x07\x75\xbe\xef\x6f\x5a\x4c\xd5\x85\x7e\x12\x22\xe6\xc3\xed\xae\x02\x1e\x1e\x5e\xd1\x57\xb6\x2c\x76\xc3\x72\x5d\x70\x5f\xe5\x2b\x23\xa0\x5d\x4b\x08\x69\xbb\x5b\xc0\xd9\x8f\xac\xed\x56\x45\x53\xff\xa3\x18\x04\x49\xe7\xc1\xcf\x6c\x5b\x77\x5d\xcb\xf8\x3d\xc3\x47\x46\x23\x9e\x73\x3d\x94\xf2\x86\x30\x11\xd4\xc2\x39\xdb\x7a\xd5\x09\x2a\x39\xf3\x0c\xbf\xb8\x16\xce\xbb\x6e\xbb\x0f\x9a\xf1\x9c\x3f\x93\xa2\xd4\x09\xcd\x8d\xdb\x2f\x1a\x42\xbe\xe6\x9e\xe1\x47\x04\xd0\x67\x45\xb9\x25\x54\xee\x8a\xa6\x62\x1c\x1d\xf3\x2f\xc2\x0b\xfd\xca\x94\xa6\xe6\x7d\x35\x0c\x75\xb3\x62\x64\x1f\x4b\x52\x7e\xa9\x49\x59\x90\xe7\xd2\x6e\xdb\xbd\x9b\x4e\x4a\xff\x1b\xfd\xcc\x2f\xe4\xa7\xe4\x05\x85\x90\xe9\x4a\xf2\x48\xfa\xf9\x75\x55\x95\x32\x96\x3e\x7f\x4e\xdf\xd9\x6e\xbf\xd9\x10\xd6\x7e\xdf\x57\xfd\xc0\x85\x2e\xe8\x37\x8d\x5f\x7e\x67\x75\xdf\xd3\x07\x25\xbf\xc2\x47\x46\x53\xd7\x2c\x31\x98\x13\x7c\x64\xd9\xbb\xbe\x2a\xba\xe5\xfa\x7d\x26\xff\xd1\x57\xfe\x60\xda\x3b\x34\xa9\x4c\x48\x4a\x44\xd2\x82\x35\x90\x2d\xdb\x92\x7f\x9c\xd0\x3f\xaa\xba\x6e\xfa\x81\x56\xdc\xfb\x4c\x3f\x18\x4c\xbe\x64\x02\x86\x7a\x00\x16\x34\x11\xcb\xb7\xe7\x19\xcc\x9f\xd7\x5d\x3f\x3c\x1c\x6a\x22\xd6\xb7\xfb\x26\xe3\xf1\xd1\x6a\x9b\x97\x0b\x63\x42\x2f\x5a\x42\x11\x92\x3b\x1a\xdf\xd9\xed\xe5\x9f\x5f\x1f\xe5\x17\xc4\x89\x56\x5d\x45\xdf\x39\xd5\x41\xff\xa8\xcc\x8f\xb3\x8c\x4a\x59\x4b\xa7\xc5\x50\x2c\x8a\xbe\xf2\x68\xe5\x4c\xa1\x6e\x97\x07\x1a\x67\xae\x06\x0e\xd6\x0f\xd1\x78\xa7\x56\x08\xd5\xa1\xeb\xca\xd5\xf1\x86\x17\x17\xa5\x33\x53\x43\xe1\x8b\x4d\xc5\xe9\x54\x55\xfe\xea\xcd\x9b\xf3\xd3\x67\x79\xd5\xac\xea\xa6\xca\x6f\xea\x61\x9d\xef\x87\xeb\xff\x3a\x5f\x55\x4d\xd5\x11\x8f\x5b\xd6\x39\xad\xa9\x8e\x28\x21\x27\xc2\x96\xc1\xcd\xb2\xbe\xdf\xd0\xda\x07\x7a\x2f\x2f\x5f\xe7\x67\x8c\xe2\x5d\x31\xac\xd1\x91\x61\x9d\xf5\xbf\x6f\x18\x45\xae\xc1\xab\x75\x95\x83\xca\x00\xd4\x5e\x1b\x3e\xf2\x52\xfb\x38\xcb\xaa\xae\x9b\x13\x5b\x1a\x6e\xe7\x5a\x58\xeb\x4b\x21\xa5\x0a\x22\x9d\xa6\x1d\xf2\x45\x95\xa3\xcc\x2c\xcb\xac\xc3\x86\xdd\xe3\xdd\x6e\x53\x2f\x65\xad\xbf\x90\x3c\x8f\x68\xde\x41\x14\x4b\x21\x1c\x10\x65\x79\x01\xba\x88\x3d\xf3\x7a\xc8\x23\x06\x82\xf2\xeb\x8a\x18\xe0\x7a\xbf\x12\xb6\xb7\x69\xf7\xe5\x37\xa0\x54\xeb\xbd\x27\xd4\xfc\x6d\x4b\x1d\x06\x76\x1c\x80\x6f\xe2\x98\x28\x8e\x37\xad\xae\xda\xb6\xc4\x57\x1c\xb1\xd7\x44\x50\x37\x35\x65\xd2\x48\xfb\xe2\x23\xad\xb7\xa1\xcd\x87\x75\xdd\xe7\x25\x11\xdb\x92\x2b\xa6\xa5\xb1\xa7\xed\x42\xc8\x82\x08\x54\x48\xc3\xd2\xe2\x39\x00\xd4\x76\x4f\xd4\xb4\xa6\xca\x78\x33\xe2\x9d\x93\xaa\x9c\xea\x27\x86\x44\xf5\x80\xbe\x89\x72\x5b\xe2\xca\xcc\x37\x4f\xf1\xa1\xbf\xc3\xfa\xa9\x57\xc5\xf5\x35\xf5\xaa\x27\xaa\x78\x99\x2f\x37\x2d\x91\xd4\xaf\x6f\x5f\xf7\x4c\x30\xeb\xf9\xae\xed\xb0\xcd\x51\xd6\x05\x7d\xba\xb4\x00\xd1\x0c\xd1\xec\xb7\x0b\xfa\x75\xb3\xae\x89\x03\x00\xed\x5c\x82\x77\x73\x4a\xa5\x26\xf6\x3d\x4d\xe1\x51\x4e\x24\x4c\x23\x20\x94\x81\x00\x78\x0c\x65\xdd\x17\x0b\x9a\x7b\x06\xbf\xa6\x6d\x6b\xdf\x11\x59\xad\x87\x61\x67\x2d\xbf\xbc\xba\xba\x90\xa6\x5d\xea\x5d\x6d\x17\x01\x65\x60\x0e\x36\xbc\xf1\x36\x79\xdb\xcc\x40\x24\xfb\x6e\x93\xd0\x0f\x8d\xd5\x72\x0e\xe0\x85\xbb\xf0\x88\xff\x5c\x7a\xf4\x00\xcf\x3d\x49\x27\x37\xa0\x26\xc2\x71\x85\x0d\x90\x88\xba\xdd\x71\xbd\x01\x55\x9f\x6b\x82\x27\x65\x6c\x9a\x2e\x5f\xb6\x4e\xca\x85\xec\x13\xb0\xff\x2d\x0d\x58\xd9\xc8\xe5\x19\xa1\x01\xbc\x04\xa9\xd7\x5d\xbb\xa5\xd4\xe7\xf4\xcf\x27\xf8\xee\x9f\x71\x7d\x80\x29\xca\x92\xf8\x5b\x7f\x94\xbf\x7d\x7e\x92\xff\xa7\x1f\x7f\xf8\x61\x96\xbf\x1a\x78\x25\x32\x71\xfe\x9d\x89\x8a\x3e\x65\x0f\x77\xa0\xcLine truncated
func confLocaleLocale_enUsIniBytes() ([]byte, error) {
return bindataRead(
@@ -4379,7 +4379,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 42176, mode: os.FileMode(420), modTime: time.Unix(1441638740, 0)}
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 42439, mode: os.FileMode(420), modTime: time.Unix(1441898772, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -4464,7 +4464,7 @@ func confLocaleLocale_jaJpIni() (*asset, error) {
return a, nil
}
var _confLocaleLocale_lvLvIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xbc\x7d\xdd\x72\x1c\xb7\x92\xe6\xbd\x23\xfc\x0e\x65\x4f\x38\x6c\x47\xd0\xad\xf0\xf1\xfe\x85\xc3\x6d\x2f\x2d\xf9\xd8\xb4\x24\x8a\x23\xca\xda\x98\x71\x38\xda\xe8\x2e\xb0\x59\xec\xee\xaa\x3e\x85\x2a\x52\xe4\xc4\x44\xac\x6e\xe6\x05\xf4\x02\x47\x7b\xee\x56\x0f\x70\x2e\xd6\x7b\xae\x9a\xef\xb5\xf9\x65\x26\x50\x40\x55\x35\x25\xcf\xcc\xce\x0d\xd9\x05\x24\x80\xc4\x5f\x22\x33\x91\x99\x30\xdb\xed\x2c\xb7\x6e\x31\x7d\x5e\xd8\xe5\xba\xc8\xda\x1b\xd7\xec\x5e\xe6\xbb\x97\x1b\x97\x7d\x5f\x34\x99\xb3\xf5\x65\xe1\xdc\x41\xb6\x32\x2e\xab\xcd\x8a\x72\xdf\x34\x2e\xbb\x34\xeb\x8a\x80\xb2\xef\xab\xf7\xdf\x7b\xff\xbd\xf3\x6a\x63\xa7\xa7\xbb\x97\xab\x76\xe3\xde\x7f\x2f\x37\xee\x7c\x5e\x99\x3a\x9f\x1e\x95\x67\xd5\xd6\x94\x76\x5d\x50\xb2\x7d\xb1\x5d\x57\xb5\x9d\x1e\xdd\x6c\x77\xaf\x50\x0b\x95\xb3\xeb\xed\xf4\xc4\xac\x77\x6f\xf2\x9b\xdd\x9b\xb9\x79\xff\x3d\x57\x2c\xcb\x59\x51\x4e\x4f\x0a\xeb\x1b\x2b\x2c\x15\x76\xd5\xa2\x30\xeb\x99\xcf\x3e\xa5\xcf\xdd\xcb\x35\x21\xb0\x2d\x6c\x63\x8b\xd5\xed\x6b\x53\xee\x5e\xba\x2f\xb3\x3f\x4c\x32\x57\x51\x7b\xd9\x57\x6e\x63\xd6\xeb\xaf\x29\xdf\x99\x82\x2b\xca\x56\x55\xd9\xb4\x5f\xdd\x93\x0c\x6d\xab\x6a\x1b\xc2\x28\x6d\x0b\xe9\xed\x16\x38\xa0\x6a\x49\xac\xed\x92\x6a\xb1\xf5\xf4\xa9\xdd\xfd\x85\x7e\xd5\xd4\x07\xce\xb8\xb2\x73\x57\x34\x76\xfa\x78\xf7\xf2\x82\x86\x68\x6d\xb6\xd4\x8d\x4b\x5b\xbb\xa2\x2a\xa7\xcf\xf1\xff\x82\x12\xb6\x66\x69\xa7\x8f\x38\xaf\xb1\x9b\xed\xda\x50\x89\x53\xb3\x34\x8d\xb9\xb4\xef\xbf\xb7\x36\xe5\xb2\x05\xc4\x73\x0c\x2b\xc1\x2c\x6a\x4b\x10\xb3\xd2\x5e\x11\x72\x97\xb6\xc8\xab\x26\xbb\x30\x6d\xd9\x4e\x26\x93\xf7\xdf\x6b\x69\x52\x66\xdb\xba\x3a\x2b\xd6\x76\x66\xca\x7c\xb6\xc1\xb8\x3e\x22\x74\xab\x06\x58\x64\x92\xd7\x66\x6d\x49\x13\x55\xd4\x34\x31\xd2\x2b\x9b\xd3\xe0\xcd\x8c\x8b\x86\xf7\x82\x3a\x91\xad\x76\x2f\x31\x8d\xa8\xb7\x34\x9b\xa8\xaa\xcb\xdd\xcb\x3a\xc7\xdc\x6d\x4c\xb1\x9e\x7e\xf7\xd9\xd6\xb8\xc6\xa1\x37\xce\x5d\x55\x34\xc1\x27\xa6\xae\xd6\x16\xa3\x33\x6b\xae\xb7\x56\xbf\x33\xd3\x50\x8d\x35\x55\x51\x50\x57\xcc\xb6\x59\x9c\x9b\xe9\x09\xa5\xcc\x4d\x9b\xa3\xb9\x0a\x75\xa2\xd4\xb6\xa2\xb1\xab\xea\x6b\x1a\xd5\x6d\x75\x83\x9f\xc5\x05\x65\x55\xf5\xd2\x94\xc5\x8d\x69\x30\x86\x4f\xe4\x63\xf7\x72\xc1\x23\xb9\x29\xea\xba\xaa\xa7\xa7\xdb\x6a\xd9\xf2\xba\xa2\x41\x9a\xa1\xa6\xe9\x8f\x34\x40\xb4\x46\x93\x9a\x90\xb9\x29\x96\x35\xc6\x1b\xf9\x26\xc3\x97\xaf\x0b\xb9\x67\x55\xbd\xd2\xa2\xa6\xc9\xb1\x16\x1b\x5a\x2f\x23\xd5\x10\x52\x5a\x45\xd5\xc3\xc8\x94\x34\x77\x9c\x8f\x4e\xd2\xd6\xc8\xb1\xda\x12\x28\xaa\xc3\xe4\x1b\x1a\x7c\xde\x0e\xd3\x43\xfc\xce\xc2\xd6\x30\x8b\x45\xd5\x96\xcd\xcc\xd9\xa6\x29\xca\xa5\x9b\x3e\xa4\x95\x6a\x32\x9a\x9a\xc6\x60\x8e\xda\x0d\x0d\x64\xc8\x3c\x4a\x92\xaf\xab\x36\x2c\x86\xe9\x33\x73\xe9\x74\xf6\x9d\x66\x85\x62\x94\x57\xf4\xaa\xe4\x8e\xb9\xd9\x99\xb5\x39\x77\xad\xdd\xb4\xd9\x76\x7d\xfb\x86\x76\x08\x4d\x72\xbb\x5e\xd3\xc0\xfe\xa9\xa5\x22\xd4\xe8\x0d\x2d\x81\xdb\x7f\x69\xb1\xe1\xb6\xb5\x71\xbe\x0a\xa2\x0d\x04\x30\x3d\xa9\xab\xf9\x7a\xf7\x6a\x63\x78\x62\x17\xa6\x5c\xa0\x97\x0d\xfd\x6d\x90\xf0\xb3\xb3\xa6\x5e\x9c\xff\x82\x5e\xe0\xc7\xf4\xb1\x5d\x11\x78\xc3\xcb\x79\xef\x32\xc0\x7a\xec\xd6\xa2\xd3\xc6\xa6\x0f\x77\xbf\xdd\xbe\xe1\x5d\x52\xe5\xf4\xa5\x8b\xe9\xe7\xa2\xa4\xae\xad\xd7\xd4\x86\xfe\x22\xf2\x83\xff\x7e\x9a\x9a\xa2\xa1\x11\x8a\xd3\x1c\x91\x8a\xdd\x6f\x05\x75\xa9\xde\x54\x34\xe3\xc5\x0d\xfd\x36\x6b\xea\xe7\xdf\xaa\x06\x78\xfd\xa9\xa5\x9d\x3d\xcb\xe7\x42\x21\xbf\xaf\x96\x2e\x2b\xea\xac\xb4\x34\x06\x8b\xc2\x12\xcd\xd9\x98\xec\xf1\xf5\xe9\xdf\x3f\x3a\xc8\x4e\x2a\xd7\x2c\x6b\x4b\xbf\xb1\xe5\x32\xfa\x4f\x45\xbf\xc8\x72\xd3\xb4\xd9\x7c\xf7\xf2\xc6\x52\x47\xa9\x22\x41\xe2\x41\x48\x75\xbd\x19\x01\x08\x36\x52\x0c\x81\xfd\xef\x40\x64\x5d\x43\x03\xe4\xda\xda\x51\xad\x55\x3d\x36\x40\x83\x8d\x49\xf5\xf1\x8e\x8e\xeb\x2b\x2b\x67\x5a\x25\xd5\xf3\x19\x68\x30\xd5\x72\x1c\x75\x8a\x90\xa2\xd9\x2e\xa9\x56\xe9\x5d\x76\x74\x7c\xfc\xe4\xc1\xb7\x59\x7e\x53\x94\x45\x66\x6a\x39\x07\x88\x62\x6f\x2e\x5a\xda\xcc\x5b\x22\x34\xcd\xd9\x7f\x9b\x2d\x6d\x49\x54\x65\x3d\x5b\x14\xd4\x57\xe7\xd6\x44\x96\x68\x7e\x4e\x4f\x1f\xd1\xd0\xde\xfe\x8d\xa0\x19\xc1\xe6\x7c\x7a\xdf\xd2\x0c\xbe\x26\x98\x3f\xad\x31\xbe\x8a\x81\x0c\x59\x16\x8f\x99\xcb\xce\x88\xee\x18\xda\x98\xb5\x51\x0a\x9f\x5d\x52\x77\x0d\x35\x60\xeb\x7a\x46\x94\xb4\xb9\x9e\x69\x35\x5c\xf5\xb1\xb9\xa4\xfe\xd5\x38\xc1\x70\x4c\x0d\xa7\xc1\x65\x0b\x6e\x7d\x82\x35\xe3\x31\x96\x59\xe1\xf9\xa5\xc3\x6e\x4b\x9b\x78\xf7\x66\x59\xd8\xde\xdc\xe0\xa8\x8c\xc8\x63\x99\x0e\xa5\xcf\x0d\x03\xca\x58\x10\x64\x8f\x10\x84\x32\x6d\x76\xfb\xda\x16\xcd\x07\xb2\x01\x04\xfd\x68\xfd\xb7\xd9\x72\x6d\x08\x65\xf4\xdb\x68\xb7\x23\x50\xdf\xcc\xf3\xc2\x15\x7c\x50\x9b\x86\xd6\xc0\xba\xa0\x31\xa2\x73\x29\x26\x5f\x45\xd6\x14\x2b\xa7\xb5\x35\x05\xb5\x6a\x2e\xe8\xe0\xcc\x8b\xda\xae\x18\x60\xf7\x12\x9b\xb0\xa5\x33\x0f\xcb\x89\x8e\xe7\x62\x0d\x2a\xbd\x8e\xd6\x95\xcf\xf5\xad\x76\x67\xcd\x06\x3b\x82\xaa\x98\xdf\x12\xc9\xd3\x33\x45\x51\xc6\xf9\x48\xa7\x3a\xb1\x12\x31\x3a\x26\x73\x66\x85\xb1\xeb\x10\xa0\xfd\x42\x27\x15\x0Line truncated
var _confLocaleLocale_lvLvIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xbc\x7d\xdd\x6e\x1c\x47\x96\xe6\xbd\x01\xbf\x43\xda\x03\xc3\x36\x40\x97\x60\x7b\xff\x60\xb8\xec\xa5\x25\xb7\x4d\x4b\xa2\x38\xa2\xac\xc5\x8c\x61\x94\xa3\x2a\x83\xc5\x64\x55\x65\x56\x67\x64\x92\x26\x07\x03\xac\x6e\xe6\x05\xf4\x02\xad\xed\xbb\xd5\x03\xf4\xc5\x7a\xfb\xaa\xf8\x5e\x7b\xbe\x73\x4e\x44\x46\x64\x66\x51\x72\xf7\xec\xdc\x90\x95\xf1\x7b\xe2\xef\xc4\xf9\x0f\xb3\xdd\xce\x72\xeb\x16\xd3\xe7\x85\x5d\xae\x8b\xac\xbd\x71\xcd\xee\x45\xbe\x7b\xb1\x71\xd9\x77\x45\x93\x39\x5b\x5f\x16\xce\x1d\x64\x2b\xe3\xb2\xda\xac\x28\xf7\x75\xe3\xb2\x4b\xb3\xae\xa8\x50\xf6\x5d\xf5\xee\x3b\xef\xbe\x73\x5e\x6d\xec\xf4\x74\xf7\x62\xd5\x6e\xdc\xbb\xef\xe4\xc6\x9d\xcf\x2b\x53\xe7\xd3\xa3\xf2\xac\xda\x9a\xd2\xae\x0b\x4a\xb6\xbf\x6e\xd7\x55\x6d\xa7\x47\x37\xdb\xdd\x4b\xb4\x42\xf5\xec\x7a\x3b\x3d\x31\xeb\xdd\xeb\xfc\x66\xf7\x7a\x6e\xde\x7d\xc7\x15\xcb\x72\x56\x94\xd3\x93\xc2\xfa\xce\x0a\x4b\x95\x5d\xb5\x28\xcc\x7a\xe6\xb3\x4f\xe9\x73\xf7\x62\x4d\x00\x6c\x0b\xdb\xd8\x62\x75\xfb\xca\x94\xbb\x17\xee\x8b\xec\xb3\x49\xe6\x2a\xea\x2f\xfb\xd2\x6d\xcc\x7a\xfd\x15\xe5\x3b\x53\x70\x43\xd9\xaa\x2a\x9b\xf6\xcb\x7b\x92\xa1\x7d\x55\x6d\x43\x10\xa5\x7d\x21\xbd\xdd\x02\x06\x34\x2d\x89\xb5\x5d\x52\x2b\xb6\x9e\x3e\xb5\xbb\x3f\xd3\xaf\x9a\xc6\xc0\x19\x57\x76\xee\x8a\xc6\x4e\x1f\xef\x5e\x5c\xd0\x14\xad\xcd\x96\x86\x71\x69\x6b\x57\x54\xe5\xf4\x39\xfe\x5f\x50\xc2\xd6\x2c\xed\xf4\x11\xe7\x35\x76\xb3\x5d\x1b\xaa\x71\x6a\x96\xa6\x31\x97\xf6\xdd\x77\xd6\xa6\x5c\xb6\x28\xf1\x1c\xd3\x4a\x65\x16\xb5\xa5\x12\xb3\xd2\x5e\x11\x70\x97\xb6\xc8\xab\x26\xbb\x30\x6d\xd9\x4e\x26\x93\x77\xdf\x69\x69\x51\x66\xdb\xba\x3a\x2b\xd6\x76\x66\xca\x7c\xb6\xc1\xbc\x3e\x22\x70\xab\x06\x50\x64\x92\xd7\x66\x6d\x49\x0b\x55\xd4\xb4\x30\x32\x2a\x9b\xd3\xe4\xcd\x8c\x8b\xa6\xf7\x82\x06\x91\xad\x76\x2f\xb0\x8c\x68\xb7\x34\x9b\xa8\xa9\xcb\xdd\x8b\x3a\xc7\xda\x6d\x4c\xb1\x9e\x7e\xfb\xc9\xd6\xb8\xc6\x61\x34\xce\x5d\x55\xb4\xc0\x27\xa6\xae\xd6\x16\xb3\x33\x6b\xae\xb7\x56\xbf\x33\xd3\x50\x8b\x35\x35\x51\xd0\x50\xcc\xb6\x59\x9c\x9b\xe9\x09\xa5\xcc\x4d\x9b\xa3\xbb\x0a\x6d\xa2\xd6\xb6\xa2\xb9\xab\xea\x6b\x9a\xd5\x6d\x75\x83\x9f\xc5\x05\x65\x55\xf5\xd2\x94\xc5\x8d\x69\x30\x87\x4f\xe4\x63\xf7\x62\xc1\x33\xb9\x29\xea\xba\xaa\xa7\xa7\xdb\x6a\xd9\xf2\xbe\xa2\x49\x9a\xa1\xa5\xe9\x0f\x34\x41\xb4\x47\x93\x96\x90\xb9\x29\x96\x35\xe6\x1b\xf9\x26\xc3\x97\x6f\x0b\xb9\x67\x55\xbd\xd2\xaa\xa6\xc9\xb1\x17\x1b\xda\x2f\x23\xcd\x10\x50\xda\x44\xd5\x83\xc8\x94\xb4\x76\x9c\x8f\x41\xd2\xd1\xc8\xb1\xdb\x92\x52\xd4\x86\xc9\x37\x34\xf9\x7c\x1c\xa6\x87\xf8\x9d\x85\xa3\x61\x16\x8b\xaa\x2d\x9b\x99\xb3\x4d\x53\x94\x4b\x37\x7d\x48\x3b\xd5\x64\xb4\x34\x8d\xc1\x1a\xb5\x1b\x9a\xc8\x90\x79\x94\x24\x5f\x57\x6d\xd8\x0c\xd3\x67\xe6\xd2\xe9\xea\x3b\xcd\x0a\xd5\x28\xaf\xe8\x35\xc9\x03\x73\xb3\x33\x6b\x73\x1e\x5a\xbb\x69\xb3\xed\xfa\xf6\x35\x9d\x10\x5a\xe4\x76\xbd\xa6\x89\xfd\x63\x4b\x55\xa8\xd3\x1b\xda\x02\xb7\xff\xd6\xe2\xc0\x6d\x6b\xe3\x7c\x13\x84\x1b\xa8\xc0\xf4\xa4\xae\xe6\xeb\xdd\xcb\x8d\xe1\x85\x5d\x98\x72\x81\x51\x36\xf4\xb7\x41\xc2\x4f\xce\x9a\x7a\x71\xfe\x33\x46\x81\x1f\xd3\xc7\x76\x45\xc5\x1b\xde\xce\x7b\xb7\x01\xf6\x63\xb7\x17\x9d\x76\x36\x7d\xb8\xfb\xed\xf6\x35\x9f\x92\x2a\xa7\x2f\xdd\x4c\x3f\x15\x25\x0d\x6d\xbd\xa6\x3e\xf4\x17\xa1\x1f\xfc\xf7\xcb\xd4\x14\x0d\xcd\x50\x9c\xe6\x08\x55\xec\x7e\x2b\x68\x48\xf5\xa6\xa2\x15\x2f\x6e\xe8\xb7\x59\xd3\x38\xff\x5a\x35\x80\xeb\x8f\x2d\x9d\xec\x59\x3e\x17\x0c\xf9\x5d\xb5\x74\x59\x51\x67\xa5\xa5\x39\x58\x14\x96\x70\xce\xc6\x64\x8f\xaf\x4f\xff\xf1\xd1\x41\x76\x52\xb9\x66\x59\x5b\xfa\x8d\x23\x97\xd1\x7f\xaa\xfa\x79\x96\x9b\xa6\xcd\xe6\xbb\x17\x37\x96\x06\x4a\x0d\x09\x10\x0f\x42\xaa\xeb\xad\x08\x8a\xe0\x20\xc5\x25\x70\xfe\x1d\x90\xac\x6b\x68\x82\x5c\x5b\x3b\x6a\xb5\xaa\xc7\x26\x68\x70\x30\xa9\x3d\x3e\xd1\x71\x7b\x65\xe5\x4c\xab\xa8\x7a\x3e\x03\x0e\xa6\x56\x8e\xa3\x41\x11\x50\xb4\xda\x25\xb5\x2a\xa3\xcb\x8e\x8e\x8f\x9f\x3c\xf8\x26\xcb\x6f\x8a\xb2\xc8\x4c\x2d\xf7\x00\x61\xec\xcd\x45\x4b\x87\x79\x4b\x88\xa6\x39\xfb\x6f\xb3\xa5\x2d\x09\xab\xac\x67\x8b\x82\xc6\xea\xdc\x9a\xd0\x12\xad\xcf\xe9\xe9\x23\x9a\xda\xdb\xbf\x52\x69\x06\xb0\x39\x9f\xde\xb7\xb4\x82\xaf\xa8\xcc\x1f\xd7\x98\x5f\x85\x40\xa6\x2c\x8b\xe7\xcc\x65\x67\x84\x77\x0c\x1d\xcc\xda\x28\x86\xcf\x2e\x69\xb8\x86\x3a\xb0\x75\x3d\x23\x4c\xda\x5c\xcf\xb4\x19\x6e\xfa\xd8\x5c\xd2\xf8\x6a\xdc\x60\xb8\xa6\x86\xcb\xe0\xb2\x05\xf7\x3e\xc1\x9e\xf1\x10\xcb\xaa\xf0\xfa\xd2\x65\xb7\xa5\x43\xbc\x7b\xbd\x2c\x6c\x6f\x6d\x70\x55\x46\xe8\xb1\x4c\xa7\xd2\xe7\x86\x09\x65\x28\xa8\x64\x0f\x11\x84\x3a\x6d\x76\xfb\xca\x16\xcd\x7b\x72\x00\x04\xfc\x68\xff\xb7\xd9\x72\x6d\x08\x64\x8c\xdb\xe8\xb0\xa3\xa2\xbe\x9b\xe7\x85\x2b\xf8\xa2\x36\x0d\xed\x81\x75\x41\x73\x44\xf7\x52\x8c\xbe\x8a\xac\x29\x56\x4e\x5b\x6b\x0a\xea\xd5\x5c\xd0\xc5\x99\x17\xb5\x5d\x71\x81\xdd\x0b\x1c\xc2\x96\xee\x3c\x6c\x27\xba\x9e\x8b\x35\xb0\xf4\x3a\xda\x57\x3e\xd7\xf7\xda\xdd\x35\x1b\x9c\x08\x6a\x62\x7e\x4b\x28\x4f\xef\x14\x05\x19\xf7\x23\xdd\xea\x44\x4a\xc4\xe0\x98\xcc\x99\x15\xe6\xae\x03\x80\xce\x0b\xdd\x54\x3c\xfd\xbLine truncated
func confLocaleLocale_lvLvIniBytes() ([]byte, error) {
return bindataRead(
@@ -4479,7 +4479,7 @@ func confLocaleLocale_lvLvIni() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "conf/locale/locale_lv-LV.ini", size: 45556, mode: os.FileMode(493), modTime: time.Unix(1441457544, 0)}
info := bindataFileInfo{name: "conf/locale/locale_lv-LV.ini", size: 45668, mode: os.FileMode(493), modTime: time.Unix(1441913806, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -4564,7 +4564,7 @@ func confLocaleLocale_ruRuIni() (*asset, error) {
return a, nil
}
var _confLocaleLocale_zhCnIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xbc\x7d\xdb\x72\x1b\x47\x96\xe0\xbb\x22\xf4\x0f\x15\x9e\x50\xf4\x93\xe5\xb0\xbd\xb7\xd8\x30\xb4\xdb\xd3\x3d\xe3\xee\x8d\xb6\xdb\xdb\x72\xc7\x3c\x38\x1c\x30\x08\x14\x49\x8c\x00\x14\x8c\x02\x24\xb3\x27\x26\x82\x94\x44\x12\x14\xef\x12\x25\x4a\x22\x29\x8a\x34\x29\xd2\x92\x48\x50\x17\x4b\x24\xc1\xcb\xc7\x18\x55\x00\x9e\xfc\x0b\x7b\x6e\x99\x95\x75\x01\x65\xf7\xce\xee\x8b\x44\x54\x9e\xcc\x3c\x79\x32\xf3\xdc\xf2\xe4\xc9\x4c\xb9\x9c\xce\xd9\x6e\x36\xe5\xad\x1e\xb6\x0e\x67\xac\x4f\x1d\xab\xd3\xd8\xe9\x6c\x0f\xb7\x1f\xde\xec\x8c\x3f\xf5\x6e\xfd\x60\x7d\x9a\xaf\x5a\xfe\xf2\xb4\x77\x6b\xed\xfc\xb9\xf3\xe7\x06\x9d\xa2\x9d\xea\x3e\xb9\xd7\x5d\xfb\xf1\xfc\xb9\x5c\xc6\x1d\xec\x73\x32\x95\x5c\xca\x9f\xd9\xf2\xea\x6f\xba\x2b\xeb\xfe\xca\xe9\xf9\x73\xf6\x77\xe5\x82\x53\xb1\xe1\xeb\x7a\xfb\xf5\x3a\x54\xb2\x0b\xe5\x94\xb7\xbf\x0b\xcd\x9d\x3f\xe7\xe6\x07\x4a\xe9\x7c\x29\xd5\x7e\xd0\xf4\x8e\xef\xc2\x6f\x27\x9b\xcf\x14\xd2\xfa\xf3\xc6\x49\xeb\x70\xc3\xdb\x9f\xf3\x66\xdf\x32\xc8\xcf\x47\x0f\xdb\xcf\x9f\x5b\x1f\x59\xfe\xce\xa6\xf5\x89\x5b\xcc\x14\x0a\x97\xbc\xd1\x57\x9d\x91\x05\x86\xfa\xe4\x03\xfe\x26\x4d\x3b\xb5\x6a\xaa\x3b\x3c\xec\x8d\x1f\xca\x87\x5a\x39\xe5\xbf\xda\xf6\xc6\xa6\xce\x9f\xab\xd8\x03\x79\xb7\x6a\x57\xf4\x87\x6b\x76\x9f\x9b\xaf\xda\x29\x6f\xf7\xbe\x7f\xef\xa0\x7d\x3c\xdf\x7e\xf6\xe0\xfc\xb9\xab\x76\xc5\xcd\x3b\xa5\x94\x77\x7c\xc7\x9b\x98\x6e\x4f\xd4\xfd\xe5\xe7\xe7\xcf\x95\x33\x03\x30\xf4\xb5\x1f\x61\x94\xe7\xcf\x55\xed\x62\xb9\x90\x81\x9a\xfe\xf6\x1a\x8d\xb9\x90\x29\x0d\xd4\x10\x82\xe9\xd7\x1d\x9e\xe8\xae\x1d\x9c\x3f\x97\xad\xd8\x00\x95\x2e\xd9\xd7\x52\x5e\x7d\xc9\x6b\x1e\xfa\xf7\xf6\x80\xb6\x17\x2f\x5e\x3c\x7f\xae\xe6\xda\x95\x74\xb9\xe2\xf4\xe7\x0b\x76\x3a\x53\xca\xa5\x8b\x48\xb4\xf6\xc2\xb6\x5f\x7f\xdb\x3a\x5d\xf3\x47\x1a\xde\xec\x2d\x7f\xe9\xb5\xb7\xf1\x90\x87\x62\xe7\x80\x42\xe9\x8c\x9b\xf2\xde\xbe\x64\xda\x30\x30\x4e\x0c\x36\x56\xca\x14\x55\x7d\x6f\x6e\x1a\xe6\xa1\x98\xc9\x17\x52\xdd\xeb\xbb\xed\xdd\x17\x88\xbf\xeb\x5e\x73\x60\xb2\xbc\xc6\x58\xfb\xf1\x08\x52\x23\x5d\x1d\x2a\x43\x8d\xb5\xdd\xce\xee\x86\xfa\x9a\xcd\x94\xab\xd9\xc1\x4c\xaa\xfb\x74\xaa\xd3\x18\xa1\x4f\x08\x5a\x76\x80\x50\x4e\x65\x28\xd5\x6a\xde\xf1\x0e\xef\x9c\x3f\xe7\x54\x06\x32\xa5\xfc\xdf\x32\x55\xa4\x54\xbb\x79\xb3\xdd\x1c\x3f\x7f\xae\x98\xaf\x54\x9c\x4a\xaa\x7b\x77\xd9\xbb\x31\x7b\xfe\x1c\x0c\x3b\x8d\x55\x43\x63\x57\x0d\x60\x61\x31\x3f\x50\x41\x2a\x76\x4e\x47\xda\x5b\x4d\x6f\xe3\x5e\xf7\xc6\xb6\x59\xde\xef\x54\xae\x84\x2a\xfb\xaf\x4f\xda\x0b\xab\x26\x08\xe0\x11\x82\xd0\xa8\x64\x4a\x30\x1d\x54\xdc\xde\x5d\x6b\xcf\x8d\xf9\xf5\x79\xa3\x38\x93\x2b\x02\x2d\xcb\x99\x92\x5d\x90\x72\xb5\x7a\x33\xd9\xac\x53\x2b\x55\xd3\xae\x5d\xad\xe6\x4b\x03\x40\xed\xfd\x39\xa0\x68\x67\xf7\xa4\x7d\xbc\x0b\x13\x91\xfc\x79\xc8\xa9\xe9\xc9\x4c\xb5\xf6\x9f\xb6\x0e\x0f\x79\x0e\xa5\x48\x57\xe3\xf9\x51\xd5\x68\x0c\x6e\xba\xdf\xb6\x61\x13\x2d\x0f\xc3\x10\xfc\xd7\x4d\xef\xd6\x36\x4c\x57\xad\x50\x00\xe2\x7d\x5b\xb3\xdd\x2a\x74\x36\x57\xf7\x0e\xde\x74\x1a\x6f\xfd\x17\xd7\xcf\x9f\xcb\xbb\x2e\x7c\x86\x65\xb0\xe9\x4d\xdf\x65\xec\xb1\xa9\x6c\xa6\x94\x85\xe1\x78\xb3\xf7\xfc\x37\x75\xfc\xf0\x95\x6b\x67\x2a\xd9\xc1\xaf\x11\x6b\xfc\x23\xe5\xcf\x2d\xc3\x8e\xa4\xd5\x97\x30\xa5\xb8\x86\x52\x6a\x49\x51\x1f\xd2\x05\x34\xed\xe4\x60\x58\xcd\xef\x65\x3d\x7c\x95\x2f\xb9\x55\xd8\x74\xd0\xb2\xfc\x05\x5b\x68\xa2\xf3\xfd\xa8\xde\x1f\xf9\x6a\x81\x18\x85\xff\x7c\xad\x73\x3a\xd7\x59\x9b\xe2\xf2\xf6\xf6\xa4\x77\x38\x8b\xbd\x7f\x5b\x83\x8d\x97\xce\xf5\x31\xff\xf9\xd4\x19\x70\x2d\x6f\x74\xa4\xb3\xbb\xef\xcd\xcd\xb4\x9f\x35\xfc\xbb\x7b\xfe\xf4\x2e\xa0\xd5\xda\x3f\xb4\x3e\x1b\xba\xfc\xbf\xff\xf4\xd3\xf0\xc8\x17\x8e\x5b\x1d\xa8\xd8\xf0\xc3\xf2\xeb\xf7\x2c\xf8\x1f\xda\xf8\xf8\xa7\x61\x20\x09\x34\xc4\x7d\xea\x8a\x8a\xc4\x58\x82\xcb\x5c\x17\xb4\x5f\x34\xbd\x47\x93\xc8\xcb\xdc\x6a\xca\xe8\xa7\xe9\x2f\x1f\x0a\x11\x02\x58\xa1\x86\xde\x3c\x91\x12\xb5\x6b\xa0\x13\xda\x7d\xba\x18\x36\x60\x7b\x6b\x8f\x0a\x90\xfd\x41\x9b\xde\x93\xeb\xfe\xa3\x65\xff\xfa\x76\xeb\xf8\x14\x2a\xf3\xa0\x7e\x3e\x82\x5d\xf6\x56\xbe\xfc\xf1\xf3\xcf\xff\xfc\xfb\x7f\xb4\xbc\xa3\xbb\xfe\x9d\x99\x56\x73\x13\xb6\xbf\x55\xab\xf6\xff\xb7\xf4\x80\x5d\xb2\x2b\xc0\x24\xb3\x79\xcb\xdb\x59\x6c\x3f\x7f\xd2\x5d\x1a\xa3\x51\xbb\x6e\x01\xb8\x06\x4c\xcd\xe5\xcb\x40\x92\xed\x35\xef\x68\x16\x71\xad\x0e\x06\x88\xf8\xf7\xc6\x5b\xcd\x37\x9d\xb7\x0d\xef\xe4\x26\x54\xf8\xb6\x80\x64\x17\x94\x84\x80\x56\x30\x28\xd8\x61\x06\x3c\xf5\x61\x57\x2a\x69\xe0\x76\xd5\xa1\xb4\x54\xa6\xf6\xb9\xaa\x95\xd8\x4d\x6b\x7f\xba\x73\xe3\x18\x26\xae\xfd\xc3\x21\x35\x71\xfe\x9c\x1a\x01\xcf\x91\x77\xb8\x00\xe3\x05\x99\x03\x8c\x55\x4d\x13\x8a\x22\x22\xa1\x14\x0a\xfd\xd4\x67\x4d\xc5\xd3\x67\x50\xda\x9e\xbc\xee\x4f\x1e\x77\x47\xdf\xb6\xaf\x3f\xd3\x9b\x9a\xab\x74\x17\x9f\xb6\x1f\xcd\xc0\x66\x6f\x35\x9f\xff\x7c\x34\xc2\x0b\x9d\x71\xe6\x75\xee\x3f\x3e\x68\x2f\xed\x92\xec\xd1\x45\xaa\x75\x7f\x62\xd8\x5f\x9e\x20\x99\xd7\x39\x5d\x86\xc5\xca\x55\xba\x37\x8e\xbd\xbd\xb1\xce\xfa\x33\x6f\xe7\xbe\xbf\x00\x02\x6a\xa6\xd3\xd8\xeLine truncated
var _confLocaleLocale_zhCnIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xbc\x7d\x59\x73\x1b\x47\x9a\xe0\xbb\x22\xf4\x1f\x2a\x3c\xa1\xe8\x27\xcb\x61\x7b\xaf\xd8\x30\xb4\xdb\xd3\x3d\xe3\xee\x8d\xb6\xdb\xdb\x72\xc7\x3c\x38\x1c\x30\x08\x14\x49\x8c\x00\x14\x8c\x02\x24\xb3\x27\x26\x82\x94\x44\x12\x14\x6f\x89\x12\x25\x91\x14\x45\x9a\x14\x69\x49\x24\xa8\xc3\x12\x49\xf0\xf8\x31\x46\x15\x80\x27\xff\x85\xfd\xae\xcc\xca\x3a\x40\xd9\xbd\xb3\xfb\x22\x11\x95\x5f\x5e\x5f\x66\x7e\x77\x7e\x99\x29\x97\xd3\x39\xdb\xcd\xa6\xbc\xd5\xc3\xd6\xe1\x8c\xf5\xa9\x63\x75\x1a\x3b\x9d\xed\xe1\xf6\xc3\x9b\x9d\xf1\xa7\xde\xad\x1f\xac\x4f\xf3\x55\xcb\x5f\x9e\xf6\x6e\xad\x9d\x3f\x77\xfe\xdc\xa0\x53\xb4\x53\xdd\x27\xf7\xba\x6b\x3f\x9e\x3f\x97\xcb\xb8\x83\x7d\x4e\xa6\x92\x4b\xf9\x33\x5b\x5e\xfd\x4d\x77\x65\xdd\x5f\x39\x3d\x7f\xce\xfe\xae\x5c\x70\x2a\x36\x7c\x5d\x6f\xbf\x5e\x87\x4a\x76\xa1\x9c\xf2\xf6\x77\xa1\xb9\xf3\xe7\xdc\xfc\x40\x29\x9d\x2f\xa5\xda\x0f\x9a\xde\xf1\x5d\xf8\xed\x64\xf3\x99\x42\x5a\x7f\xde\x38\x69\x1d\x6e\x78\xfb\x73\xde\xec\x5b\x06\xf9\xf9\xe8\x61\xfb\xf9\x73\xeb\x23\xcb\xdf\xd9\xb4\x3e\x71\x8b\x99\x42\xe1\x92\x37\xfa\xaa\x33\xb2\xc0\x50\x9f\x7c\xc0\xdf\xa4\x69\xa7\x56\x4d\x75\x87\x87\xbd\xf1\x43\xf9\x50\x2b\xa7\xfc\x57\xdb\xde\xd8\xd4\xf9\x73\x15\x7b\x20\xef\x56\xed\x8a\xfe\x70\xcd\xee\x73\xf3\x55\x3b\xe5\xed\xde\xf7\xef\x1d\xb4\x8f\xe7\xdb\xcf\x1e\x9c\x3f\x77\xd5\xae\xb8\x79\xa7\x94\xf2\x8e\xef\x78\x13\xd3\xed\x89\xba\xbf\xfc\xfc\xfc\xb9\x72\x66\x00\xa6\xbe\xf6\x23\xcc\xf2\xfc\xb9\xaa\x5d\x2c\x17\x32\x50\xd3\xdf\x5e\xa3\x39\x17\x32\xa5\x81\x1a\x42\x30\xfe\xba\xc3\x13\xdd\xb5\x83\xf3\xe7\xb2\x15\x1b\xa0\xd2\x25\xfb\x5a\xca\xab\x2f\x79\xcd\x43\xff\xde\x1e\xe0\xf6\xe2\xc5\x8b\xe7\xcf\xd5\x5c\xbb\x92\x2e\x57\x9c\xfe\x7c\xc1\x4e\x67\x4a\xb9\x74\x11\x91\xd6\x5e\xd8\xf6\xeb\x6f\x5b\xa7\x6b\xfe\x48\xc3\x9b\xbd\xe5\x2f\xbd\xf6\x36\x1e\xf2\x54\xec\x1c\x60\x28\x9d\x71\x53\xde\xdb\x97\x8c\x1b\x06\xc6\x85\xc1\xc6\x4a\x99\xa2\xaa\xef\xcd\x4d\xc3\x3a\x14\x33\xf9\x42\xaa\x7b\x7d\xb7\xbd\xfb\x02\xc7\xef\xba\xd7\x1c\x58\x2c\xaf\x31\xd6\x7e\x3c\x82\xd8\x48\x57\x87\xca\x50\x63\x6d\xb7\xb3\xbb\xa1\xbe\x66\x33\xe5\x6a\x76\x30\x93\xea\x3e\x9d\xea\x34\x46\xe8\x13\x82\x96\x1d\x40\x94\x53\x19\x4a\xb5\x9a\x77\xbc\xc3\x3b\xe7\xcf\x39\x95\x81\x4c\x29\xff\xb7\x4c\x15\x31\xd5\x6e\xde\x6c\x37\xc7\xcf\x9f\x2b\xe6\x2b\x15\xa7\x92\xea\xde\x5d\xf6\x6e\xcc\x9e\x3f\x07\xd3\x4e\x63\xd5\xd0\xdc\x55\x03\x58\x58\xcc\x0f\x54\x10\x8b\x9d\xd3\x91\xf6\x56\xd3\xdb\xb8\xd7\xbd\xb1\x6d\x96\xf7\x3b\x95\x2b\xa1\xca\xfe\xeb\x93\xf6\xc2\xaa\x09\x02\xe3\x08\x41\xe8\xa1\x64\x4a\xb0\x1c\x54\xdc\xde\x5d\x6b\xcf\x8d\xf9\xf5\x79\xa3\x38\x93\x2b\x02\x2e\xcb\x99\x92\x5d\x90\x72\xb5\x7b\x33\xd9\xac\x53\x2b\x55\xd3\xae\x5d\xad\xe6\x4b\x03\x80\xed\xfd\x39\xc0\x68\x67\xf7\xa4\x7d\xbc\x0b\x0b\x91\xfc\x79\xc8\xa9\xe9\xc5\x4c\xb5\xf6\x9f\xb6\x0e\x0f\x79\x0d\xa5\x48\x57\xe3\xf5\x51\xd5\x68\x0e\x6e\xba\xdf\xb6\xe1\x10\x2d\x0f\xc3\x14\xfc\xd7\x4d\xef\xd6\x36\x2c\x57\xad\x50\x00\xe4\x7d\x5b\xb3\xdd\x2a\x74\x36\x57\xf7\x0e\xde\x74\x1a\x6f\xfd\x17\xd7\xcf\x9f\xcb\xbb\x2e\x7c\x86\x6d\xb0\xe9\x4d\xdf\xe5\xd1\x63\x53\xd9\x4c\x29\x0b\xd3\xf1\x66\xef\xf9\x6f\xea\xf8\xe1\x2b\xd7\xce\x54\xb2\x83\x5f\xe3\xa8\xf1\x8f\x94\x3f\xb7\x0c\x27\x92\x76\x5f\xc2\x92\xe2\x1e\x4a\xa9\x2d\x45\x7d\x48\x17\xd0\xb4\x93\x83\x69\x35\xbf\x97\xfd\xf0\x55\xbe\xe4\x56\xe1\xd0\x41\xcb\xf2\x17\x1c\xa1\x89\xce\xf7\xa3\xfa\x7c\xe4\xab\x05\x22\x14\xfe\xf3\xb5\xce\xe9\x5c\x67\x6d\x8a\xcb\xdb\xdb\x93\xde\xe1\x2c\xf6\xfe\x6d\x0d\x0e\x5e\x3a\xd7\xc7\xf4\xe7\x53\x67\xc0\xb5\xbc\xd1\x91\xce\xee\xbe\x37\x37\xd3\x7e\xd6\xf0\xef\xee\xf9\xd3\xbb\x30\xac\xd6\xfe\xa1\xf5\xd9\xd0\xe5\xff\xfd\xa7\x9f\x86\x47\xbe\x70\xdc\xea\x40\xc5\x86\x1f\x96\x5f\xbf\x67\xc1\xff\xd0\xc6\xc7\x3f\x0d\x03\x4a\xa0\x21\xee\x53\x57\x54\x28\xc6\x12\xdc\xe6\xba\xa0\xfd\xa2\xe9\x3d\x9a\x44\x5a\xe6\x56\x53\x46\x3f\x4d\x7f\xf9\x50\x90\x10\xc0\x0a\x36\xf4\xe1\x89\x94\xa8\x53\x03\x9d\xd0\xe9\xd3\xc5\x70\x00\xdb\x5b\x7b\x54\x80\xe4\x0f\xda\xf4\x9e\x5c\xf7\x1f\x2d\xfb\xd7\xb7\x5b\xc7\xa7\x50\x99\x27\xf5\xf3\x11\x9c\xb2\xb7\xf2\xe5\x8f\x9f\x7f\xfe\xe7\xdf\xff\xa3\xe5\x1d\xdd\xf5\xef\xcc\xb4\x9a\x9b\x70\xfc\xad\x5a\xb5\xff\xbf\xa5\x07\xec\x92\x5d\x01\x22\x99\xcd\x5b\xde\xce\x62\xfb\xf9\x93\xee\xd2\x18\xcd\xda\x75\x0b\x40\x35\x60\x69\x2e\x5f\x06\x94\x6c\xaf\x79\x47\xb3\x38\xd6\xea\x60\x30\x10\xff\xde\x78\xab\xf9\xa6\xf3\xb6\xe1\x9d\xdc\x84\x0a\xdf\x16\x10\xed\x32\x24\x41\xa0\x15\x4c\x0a\x4e\x98\x01\x4f\x7d\xd8\x95\x4a\x1a\xa8\x5d\x75\x28\x2d\x95\xa9\x7d\xae\x6a\x25\x76\xd3\xda\x9f\xee\xdc\x38\x86\x85\x6b\xff\x70\x48\x4d\x9c\x3f\xa7\x66\xc0\x6b\xe4\x1d\x2e\xc0\x7c\x81\xe7\x00\x61\x55\xcb\x84\xac\x88\x50\x28\x85\x82\x3f\xf5\x59\x63\xf1\xf4\x19\x94\xb6\x27\xaf\xfb\x93\xc7\xdd\xd1\xb7\xed\xeb\xcf\xf4\xa1\xe6\x2a\xdd\xc5\xa7\xed\x47\x33\x70\xd8\x5b\xcd\xe7\x3f\x1f\x8d\xf0\x46\xe7\x31\xf3\x3e\xf7\x1f\x1f\xb4\x97\x76\x89\xf7\xe8\x22\xd5\xba\x3f\x31\xec\x2f\x4f\x10\xcf\xeb\x9c\x2e\xc3\x66\xe5\x2a\xdd\x1b\xc7\xde\xde\x58\x67\xfd\x99\xb7\x73\xdf\x5f\x00\x06\x35\xd3\x69\x6c\x72\x2Line truncated
func confLocaleLocale_zhCnIniBytes() ([]byte, error) {
return bindataRead(
@@ -4579,7 +4579,7 @@ func confLocaleLocale_zhCnIni() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "conf/locale/locale_zh-CN.ini", size: 41664, mode: os.FileMode(493), modTime: time.Unix(1441457544, 0)}
info := bindataFileInfo{name: "conf/locale/locale_zh-CN.ini", size: 41698, mode: os.FileMode(493), modTime: time.Unix(1441913804, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
public/css/gogs.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('embedded-opentype'),url(../fonts/octicons.woff?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('woff'),url(../fonts/octicons.ttf?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('truetype'),url(../fonts/octicons.svg?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d#octicons) format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beaker:before,.octicon-microscope:before{content:'\f0dd'}.octicon-bell:before{content:'\f0de'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-clone:before,.octicon-desktop-download:before{content:'\f0dc'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gLine truncated
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('embedded-opentype'),url(../fonts/octicons.woff?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('woff'),url(../fonts/octicons.ttf?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('truetype'),url(../fonts/octicons.svg?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d#octicons) format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beaker:before,.octicon-microscope:before{content:'\f0dd'}.octicon-bell:before{content:'\f0de'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-clone:before,.octicon-desktop-download:before{content:'\f0dc'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gLine truncated
public/less/_base.less
-3
View File
@@ -253,9 +253,6 @@ footer {
text-align: center;
color: #428bca;
}
.ui.language.dropdown {
z-index: 10000;
}
.links >* {
border-left: 1px solid #d6d6d6;
padding-left: 8px;
public/less/_user.less
+10 -1
View File
@@ -3,10 +3,19 @@
padding-bottom: @footer-margin * 2;
&.settings {
.key.list {
.list {
.item.ui.grid {
margin-top: 15px;
}
}
.email.list {
.item:not(:first-child) {
border-top: 1px solid #eaeaea;
height: 50px;
.button {
margin-top: -10px;
}
}
}
}
}
routers/user/setting.go
+71 -88
View File
@@ -132,6 +132,40 @@ func SettingsAvatar(ctx *middleware.Context, form auth.UploadAvatarForm) {
ctx.Redirect(setting.AppSubUrl + "/user/settings")
}
func SettingsPassword(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("settings")
ctx.Data["PageIsSettingsPassword"] = true
ctx.HTML(200, SETTINGS_PASSWORD)
}
func SettingsPasswordPost(ctx *middleware.Context, form auth.ChangePasswordForm) {
ctx.Data["Title"] = ctx.Tr("settings")
ctx.Data["PageIsSettingsPassword"] = true
if ctx.HasError() {
ctx.HTML(200, SETTINGS_PASSWORD)
return
}
if !ctx.User.ValidatePassword(form.OldPassword) {
ctx.Flash.Error(ctx.Tr("settings.password_incorrect"))
} else if form.Password != form.Retype {
ctx.Flash.Error(ctx.Tr("form.password_not_match"))
} else {
ctx.User.Passwd = form.Password
ctx.User.Salt = models.GetUserSalt()
ctx.User.EncodePasswd()
if err := models.UpdateUser(ctx.User); err != nil {
ctx.Handle(500, "UpdateUser", err)
return
}
log.Trace("User password updated: %s", ctx.User.Name)
ctx.Flash.Success(ctx.Tr("settings.change_password_success"))
}
ctx.Redirect(setting.AppSubUrl + "/user/settings/password")
}
func SettingsEmails(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("settings")
ctx.Data["PageIsSettingsEmails"] = true
@@ -150,6 +184,19 @@ func SettingsEmailPost(ctx *middleware.Context, form auth.AddEmailForm) {
ctx.Data["Title"] = ctx.Tr("settings")
ctx.Data["PageIsSettingsEmails"] = true
// Make emailaddress primary.
if ctx.Query("_method") == "PRIMARY" {
if err := models.MakeEmailPrimary(&models.EmailAddress{ID: ctx.QueryInt64("id")}); err != nil {
ctx.Handle(500, "MakeEmailPrimary", err)
return
}
log.Trace("Email made primary: %s", ctx.User.Name)
ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
return
}
// Add Email address.
emails, err := models.GetEmailAddresses(ctx.User.Id)
if err != nil {
ctx.Handle(500, "GetEmailAddresses", err)
@@ -157,51 +204,16 @@ func SettingsEmailPost(ctx *middleware.Context, form auth.AddEmailForm) {
}
ctx.Data["Emails"] = emails
// Delete E-mail address.
if ctx.Query("_method") == "DELETE" {
id := ctx.QueryInt64("id")
if id <= 0 {
return
}
if err = models.DeleteEmailAddress(&models.EmailAddress{Id: id}); err != nil {
ctx.Handle(500, "DeleteEmail", err)
} else {
log.Trace("Email address deleted: %s", ctx.User.Name)
ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
}
return
}
// Make emailaddress primary.
if ctx.Query("_method") == "PRIMARY" {
id := ctx.QueryInt64("id")
if id <= 0 {
return
}
if err = models.MakeEmailPrimary(&models.EmailAddress{Id: id}); err != nil {
ctx.Handle(500, "MakeEmailPrimary", err)
} else {
log.Trace("Email made primary: %s", ctx.User.Name)
ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
}
return
}
// Add Email address.
if ctx.HasError() {
ctx.HTML(200, SETTINGS_EMAILS)
return
}
cleanEmail := strings.Replace(form.Email, "\n", "", -1)
e := &models.EmailAddress{
Uid: ctx.User.Id,
Email: cleanEmail,
UID: ctx.User.Id,
Email: strings.TrimSpace(form.Email),
IsActivated: !setting.Service.RegisterEmailConfirm,
}
if err := models.AddEmailAddress(e); err != nil {
if models.IsErrEmailAlreadyUsed(err) {
ctx.RenderWithErr(ctx.Tr("form.email_been_used"), SETTINGS_EMAILS, &form)
@@ -209,64 +221,35 @@ func SettingsEmailPost(ctx *middleware.Context, form auth.AddEmailForm) {
}
ctx.Handle(500, "AddEmailAddress", err)
return
} else {
// Send confirmation e-mail
if setting.Service.RegisterEmailConfirm {
mailer.SendActivateEmail(ctx.Render, ctx.User, e)
if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil {
log.Error(4, "Set cache(MailResendLimit) fail: %v", err)
}
ctx.Flash.Info(ctx.Tr("settings.add_email_confirmation_sent", cleanEmail, setting.Service.ActiveCodeLives/60))
} else {
ctx.Flash.Success(ctx.Tr("settings.add_email_success"))
}
log.Trace("Email address added: %s", e.Email)
ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
return
}
ctx.HTML(200, SETTINGS_EMAILS)
// Send confirmation e-mail
if setting.Service.RegisterEmailConfirm {
mailer.SendActivateEmail(ctx.Render, ctx.User, e)
if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil {
log.Error(4, "Set cache(MailResendLimit) fail: %v", err)
}
ctx.Flash.Info(ctx.Tr("settings.add_email_confirmation_sent", e.Email, setting.Service.ActiveCodeLives/60))
} else {
ctx.Flash.Success(ctx.Tr("settings.add_email_success"))
}
log.Trace("Email address added: %s", e.Email)
ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
}
func SettingsPassword(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("settings")
ctx.Data["PageIsSettingsPassword"] = true
ctx.HTML(200, SETTINGS_PASSWORD)
}
func SettingsPasswordPost(ctx *middleware.Context, form auth.ChangePasswordForm) {
ctx.Data["Title"] = ctx.Tr("settings")
ctx.Data["PageIsSettingsPassword"] = true
if ctx.HasError() {
ctx.HTML(200, SETTINGS_PASSWORD)
func DeleteEmail(ctx *middleware.Context) {
if err := models.DeleteEmailAddress(&models.EmailAddress{ID: ctx.QueryInt64("id")}); err != nil {
ctx.Handle(500, "DeleteEmail", err)
return
}
log.Trace("Email address deleted: %s", ctx.User.Name)
tmpUser := &models.User{
Passwd: form.OldPassword,
Salt: ctx.User.Salt,
}
tmpUser.EncodePasswd()
if ctx.User.Passwd != tmpUser.Passwd {
ctx.Flash.Error(ctx.Tr("settings.password_incorrect"))
} else if form.Password != form.Retype {
ctx.Flash.Error(ctx.Tr("form.password_not_match"))
} else {
ctx.User.Passwd = form.Password
ctx.User.Salt = models.GetUserSalt()
ctx.User.EncodePasswd()
if err := models.UpdateUser(ctx.User); err != nil {
ctx.Handle(500, "UpdateUser", err)
return
}
log.Trace("User password updated: %s", ctx.User.Name)
ctx.Flash.Success(ctx.Tr("settings.change_password_success"))
}
ctx.Redirect(setting.AppSubUrl + "/user/settings/password")
ctx.Flash.Success(ctx.Tr("settings.email_deletion_success"))
ctx.JSON(200, map[string]interface{}{
"redirect": setting.AppSubUrl + "/user/settings/email",
})
}
func SettingsSSHKeys(ctx *middleware.Context) {
templates/.VERSION
+1 -1
View File
@@ -1 +1 @@
0.6.9.0910 Beta
0.6.10.0910 Beta
templates/user/settings/email.tmpl
+66 -56
View File
@@ -1,60 +1,70 @@
{{template "ng/base/head" .}}
{{template "ng/base/header" .}}
<div id="setting-wrapper" class="main-wrapper">
<div id="user-profile-setting" class="container clear">
{{template "user/settings/nav" .}}
<div class="grid-4-5 left">
<div class="setting-content">
{{template "ng/base/alert" .}}
<div id="user-email-setting-content">
<div id="user-email-panel" class="panel panel-radius">
<div class="panel-header">
<strong>{{.i18n.Tr "settings.manage_emails"}}</strong>
</div>
<ul class="panel-body setting-list">
<li>{{.i18n.Tr "settings.email_desc"}}</li>
{{range .Emails}}
<li class="email clear">
<div class="email-content left">
<p><strong>{{.Email}}</strong> {{if .IsPrimary}} <span class="text-red">{{$.i18n.Tr "settings.primary"}}</span> {{end}}</p>
</div>
{{if not .IsPrimary}}
{{if .IsActivated}}
<form action="{{AppSubUrl}}/user/settings/email" method="post">
{{$.CsrfTokenHtml}}
<input name="_method" type="hidden" value="PRIMARY">
<input name="id" type="hidden" value="{{.Id}}">
<button class="right email-btn btn btn-small btn-green btn-radius">{{$.i18n.Tr "settings.primary_email"}}</button>
</form>
{{end}}
<form action="{{AppSubUrl}}/user/settings/email" method="post">
{{$.CsrfTokenHtml}}
<input name="_method" type="hidden" value="DELETE">
<input name="id" type="hidden" value="{{.Id}}">
<button class="right email-btn btn btn-small btn-red btn-radius" style="margin-right: 5px">{{$.i18n.Tr "settings.delete_email"}}</button>
</form>
{{end}}
</li>
{{end}}
</ul>
<div class="panel-header">
<strong>{{.i18n.Tr "settings.add_new_email"}}</strong>
</div>
<form class="form form-align panel-body" id="add-email-form" action="{{AppSubUrl}}/user/settings/email" method="post">
{{.CsrfTokenHtml}}
<p class="field">
<label class="req" for="email">{{.i18n.Tr "email"}}</label>
<input class="ipt ipt-large ipt-radius" id="email" name="email" type="text" required />
</p>
<p class="field">
<label></label>
<button class="btn btn-green btn-large btn-radius" id="email-add-btn">{{.i18n.Tr "settings.add_email"}}</button>
</p>
</form>
</div>
</div>
{{template "base/head" .}}
<div class="user settings emails">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.manage_emails"}}
</h4>
<div class="ui attached segment">
<div class="ui email list">
<div class="item">
{{.i18n.Tr "settings.email_desc"}}
</div>
{{range .Emails}}
<div class="item ui grid">
<div class="column">
<strong>{{.Email}}</strong>
{{if .IsPrimary}}<span class="text red">{{$.i18n.Tr "settings.primary"}}</span>{{end}}
{{if not .IsPrimary}}
<div class="ui right">
<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
{{$.i18n.Tr "settings.delete_key"}}
</button>
</div>
{{if .IsActivated}}
<div class="ui right">
<form action="{{$.Link}}" method="post">
{{$.CsrfTokenHtml}}
<input name="_method" type="hidden" value="PRIMARY">
<input name="id" type="hidden" value="{{.ID}}">
<button class="ui green tiny button">{{$.i18n.Tr "settings.primary_email"}}</button>
</form>
</div>
{{end}}
{{end}}
</div>
</div>
{{end}}
</div>
</div>
<div class="ui attached bottom segment">
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<div class="required field {{if .Err_Email}}error{{end}}">
<label for="email">{{.i18n.Tr "settings.add_new_email"}}</label>
<input id="email" name="email" type="email" autofocus required>
</div>
<button class="ui green button">
{{.i18n.Tr "settings.add_email"}}
</button>
</form>
</div>
</div>
</div>
</div>
</div>
{{template "ng/base/footer" .}}
<div class="ui small basic delete modal">
<div class="ui icon header">
<i class="trash icon"></i>
{{.i18n.Tr "settings.email_deletion"}}
</div>
<div class="content">
<p>{{.i18n.Tr "settings.email_deletion_desc"}}</p>
</div>
{{template "base/delete_modal_actions" .}}
</div>
{{template "base/footer" .}}
templates/user/settings/password.tmpl
+32 -33
View File
@@ -1,37 +1,36 @@
{{template "ng/base/head" .}}
{{template "ng/base/header" .}}
<div id="setting-wrapper" class="main-wrapper">
<div id="user-profile-setting" class="container clear">
{{template "user/settings/nav" .}}
<div class="grid-4-5 left">
<div class="setting-content">
{{template "ng/base/alert" .}}
<div id="setting-content">
<div id="user-profile-setting-content" class="panel panel-radius">
<p class="panel-header"><strong>{{.i18n.Tr "settings.change_password"}}</strong></p>
<form class="form form-align panel-body" id="user-profile-form" action="{{AppSubUrl}}/user/settings/password" method="post">
{{.CsrfTokenHtml}}
<p class="field">
<label class="req" for="old-password">{{.i18n.Tr "settings.old_password"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_OldPassword}}ipt-error{{end}}" id="old-password" name="old_password" type="password" required />
</p>
<p class="field">
<label class="req" for="password">{{.i18n.Tr "settings.new_password"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" required />
</p>
<p class="field">
<label class="req" for="retype">{{.i18n.Tr "re_type"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Retype}}ipt-error{{end}}" id="retype" name="retype" type="password" required />
</p>
<p class="field">
<span class="form-label"></span>
<button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "settings.change_password"}}</button>
</p>
</form>
</div>
</div>
{{template "base/head" .}}
<div class="user settings password">
<div class="ui container">
<div class="ui grid">
{{template "user/settings/navbar" .}}
<div class="twelve wide column content">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.change_password"}}
</h4>
<div class="ui attached segment">
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<div class="required field {{if .Err_OldPassword}}error{{end}}">
<label for="old_password">{{.i18n.Tr "settings.old_password"}}</label>
<input id="old_password" name="old_password" type="password" autofocus required>
</div>
<div class="required field {{if .Err_Password}}error{{end}}">
<label for="password">{{.i18n.Tr "settings.new_password"}}</label>
<input id="password" name="password" type="password" required>
</div>
<div class="required field {{if .Err_Password}}error{{end}}">
<label for="retype">{{.i18n.Tr "settings.retype_new_password"}}</label>
<input id="retype" name="retype" type="password" required>
</div>
<div class="field">
<button class="ui green button">{{$.i18n.Tr "settings.change_password"}}</button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
{{template "ng/base/footer" .}}
{{template "base/footer" .}}
templates/user/settings/profile.tmpl
+6 -6
View File
@@ -37,12 +37,12 @@
<input id="location" name="location" value="{{.SignedUser.Location}}">
</div>
<div class="required field {{if or DisableGravatar .SignedUser.UseCustomAvatar}}hide{{end}} {{if .Err_Gravatar}}error{{end}}">
<label for="gravatar">Gravatar {{.i18n.Tr "email"}}</label>
<input id="gravatar" name="gravatar" value="{{.SignedUser.AvatarEmail}}" />
<label for="gravatar">Gravatar {{.i18n.Tr "email"}}</label>
<input id="gravatar" name="gravatar" value="{{.SignedUser.AvatarEmail}}" />
</div>
<div class="field">
<button class="ui green button">{{$.i18n.Tr "settings.update_profile"}}</button>
<button class="ui green button">{{$.i18n.Tr "settings.update_profile"}}</button>
</div>
</form>
@@ -58,12 +58,12 @@
</div>
</div>
<div class="inline field">
<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
<input name="avatar" type="file" >
<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
<input name="avatar" type="file" >
</div>
<div class="field">
<button class="ui green button">{{$.i18n.Tr "settings.update_avatar"}}</button>
<button class="ui green button">{{$.i18n.Tr "settings.update_avatar"}}</button>
</div>
</form>
</div>