From 81287ba022ae906f1f9eb5b1324567cd93771b4e Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 27 Aug 2014 22:40:45 +0800 Subject: [PATCH] Mirror issue fix --- README.md | 1 + README_ZH.md | 1 + cmd/web.go | 1 - conf/locale/locale_en-US.ini | 2 -- conf/locale/locale_zh-CN.ini | 2 -- routers/user/setting.go | 8 -------- templates/repo/migrate.tmpl | 2 +- templates/user/settings/nav.tmpl | 1 - templates/user/settings/orgs.tmpl | 18 ------------------ 9 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 templates/user/settings/orgs.tmpl diff --git a/README.md b/README.md index c1fd499e0d..e709e76147 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ The goal of this project is to make the easiest, fastest and most painless way t - Administration panel - Supports MySQL, PostgreSQL and SQLite3 - Social account login(GitHub, Google, QQ, Weibo) +- Multi-language support(English, Chinese, etc.) ## System Requirements diff --git a/README_ZH.md b/README_ZH.md index 24836208da..cdf858e77a 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -32,6 +32,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自 - 管理员面板 - 支持 MySQL、PostgreSQL 以及 SQLite3 数据库 - 社交帐号登录（GitHub、Google、QQ、微博） +- 多语言支持（英文、简体中文等等） ## 系统要求 diff --git a/cmd/web.go b/cmd/web.go index 764e2c1b92..1ce671be41 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -167,7 +167,6 @@ func runWeb(*cli.Context) { r.Get("/ssh", user.SettingsSSHKeys) r.Post("/ssh", bindIgnErr(auth.AddSSHKeyForm{}), user.SettingsSSHKeysPost) r.Get("/social", user.SettingsSocial) - r.Get("/orgs", user.SettingsOrgs) r.Route("/delete", "GET,POST", user.SettingsDelete) }, reqSignIn) m.Group("/user", func(r *macaron.Router) { diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 25384b03fe..e7ceb663d5 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -155,8 +155,6 @@ social_desc = This is a list of associated social accounts. Remove any binding t unbind = Unbind unbind_success = Social account has been unbound. -manage_orgs = Manage Organizations - delete_account = Delete Your Account delete_prompt = The operation will delete your account permanently, and CANNOT be undo! confirm_delete_account = Confirm Deletion diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 1b3329e6f8..0fa0ef4e48 100644 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -155,8 +155,6 @@ social_desc = 以下是与您帐户所关联的社交帐号，如果您发现有 unbind = 解除绑定 unbind_success = 社交帐号解除绑定成功！ -manage_orgs = 管理我的组织 - delete_account = 删除当前帐户 delete_prompt = 删除操作会永久清除您的帐户信息，并且 不可恢复！ confirm_delete_account = 确认删除帐户 diff --git a/routers/user/setting.go b/routers/user/setting.go index d3b792134d..4e0e468f0e 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -21,7 +21,6 @@ const ( SETTINGS_PASSWORD base.TplName = "user/settings/password" SETTINGS_SSH_KEYS base.TplName = "user/settings/sshkeys" SETTINGS_SOCIAL base.TplName = "user/settings/social" - SETTINGS_ORGS base.TplName = "user/settings/orgs" SETTINGS_DELETE base.TplName = "user/settings/delete" NOTIFICATION base.TplName = "user/notification" SECURITY base.TplName = "user/security" @@ -231,13 +230,6 @@ func SettingsSocial(ctx *middleware.Context) { ctx.HTML(200, SETTINGS_SOCIAL) } -func SettingsOrgs(ctx *middleware.Context) { - ctx.Data["Title"] = ctx.Tr("settings") - ctx.Data["PageIsUserSettings"] = true - ctx.Data["PageIsSettingsOrgs"] = true - ctx.HTML(200, SETTINGS_ORGS) -} - func SettingsDelete(ctx *middleware.Context) { ctx.Data["Title"] = ctx.Tr("settings") ctx.Data["PageIsUserSettings"] = true diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl index 45465178bd..7c983d7686 100644 --- a/templates/repo/migrate.tmpl +++ b/templates/repo/migrate.tmpl @@ -20,7 +20,7 @@
- +
diff --git a/templates/user/settings/nav.tmpl b/templates/user/settings/nav.tmpl index cae120527c..d6d20dee96 100644 --- a/templates/user/settings/nav.tmpl +++ b/templates/user/settings/nav.tmpl @@ -6,7 +6,6 @@
  • {{.i18n.Tr "settings.password"}}
  • {{.i18n.Tr "settings.ssh_keys"}}
  • {{.i18n.Tr "settings.social"}}
    • -
  • {{.i18n.Tr "settings.orgs"}}
  • {{.i18n.Tr "settings.delete"}}
    • diff --git a/templates/user/settings/orgs.tmpl b/templates/user/settings/orgs.tmpl deleted file mode 100644 index fb9096c3da..0000000000 --- a/templates/user/settings/orgs.tmpl +++ /dev/null @@ -1,18 +0,0 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -
    -
    - {{template "user/settings/nav" .}} -
    -
    - {{template "ng/base/alert" .}} -
    -
    -

    {{.i18n.Tr "settings.manage_orgs"}}

    -
    -
    -
    -
    -
    -
    -{{template "ng/base/footer" .}} \ No newline at end of file