diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index aa7f9cbbe..a02529428 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -29,7 +29,7 @@ In addition to the general guides with open source contributions, you would also ### Ask for help -Before opening an issue, please make sure the problem you're encountering isn't already addressed on the [Troubleshooting](https://gogs.io/docs/intro/troubleshooting.html) and [FAQs](https://gogs.io/docs/intro/faqs.html) pages. +Before opening an issue, please make sure the problem you're encountering isn't already addressed on the [Troubleshooting](https://gogs.io/asking/troubleshooting) and [FAQs](https://gogs.io/asking/faq) pages. ### Create a new issue @@ -65,12 +65,12 @@ Contributing to another codebase is not as simple as code changes, it is also ab ### Things we do not accept -1. Updates to locale files (`conf/locale_xx-XX.ini`) other than the `conf/locale_en-US.ini`. Please read the [guide for localizing Gogs](https://gogs.io/docs/features/i18n). +1. Updates to locale files (`conf/locale_xx-XX.ini`) other than the `conf/locale_en-US.ini`. Please read the [guide for localizing Gogs](https://gogs.io/advancing/localization). 1. Docker compose files. ### Coding guidelines -1. Please read the Sourcegraph's [Go style guide](https://docs.sourcegraph.com/dev/background-information/languages/go). +1. Please read the Sourcegraph's [Go style guide](https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/main/doc/dev/background-information/languages/go.md). 1. **NO** direct modifications to `.css` files, `.css` files are all generated by `.less` files. You can regenerate `.css` files by executing `task less`. ## Your PR is merged! diff --git a/README.md b/README.md index 08b4733f0..8c537a408 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ The Gogs (`/gɑgz/`) project aims to build a simple, stable and extensible self- - Please visit [our home page](https://gogs.io) for user documentation. - Please refer to [CHANGELOG.md](CHANGELOG.md) for list of changes in each releases. - Want to try it before doing anything else? Do it [online](https://try.gogs.io/gogs/gogs)! -- Having trouble? Help yourself with [troubleshooting](https://gogs.io/docs/intro/troubleshooting.html) or ask questions in [Discussions](https://github.com/gogs/gogs/discussions). -- Want to help with localization? Check out the [localization documentation](https://gogs.io/docs/features/i18n.html). +- Having trouble? Help yourself with [troubleshooting](https://gogs.io/asking/troubleshooting) or ask questions in [Discussions](https://github.com/gogs/gogs/discussions). +- Want to help with localization? Check out the [localization documentation](https://gogs.io/advancing/localization). - Ready to get hands dirty? Read our [contributing guide](.github/CONTRIBUTING.md). -- Hmm... What about APIs? We have experimental support with [documentation](https://github.com/gogs/docs-api). +- Hmm... What about APIs? We have experimental support with [documentation](https://gogs.io/api-reference). ## 💌 Features @@ -47,15 +47,7 @@ The Gogs (`/gɑgz/`) project aims to build a simple, stable and extensible self- ## 📜 Installation -Make sure you install the [prerequisites](https://gogs.io/docs/installation) first. - -There are 6 ways to install Gogs: - -- [Install from binary](https://gogs.io/docs/installation/install_from_binary.html) -- [Install from source](https://gogs.io/docs/installation/install_from_source.html) -- [Install from packages](https://gogs.io/docs/installation/install_from_packages.html) -- [Ship with Docker](https://github.com/gogs/gogs/tree/main/docker) -- [Try with Vagrant](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs) +Please follow [the guide in our documentation](https://gogs.io/getting-started/installation). ### Deploy to cloud @@ -94,7 +86,8 @@ There are 6 ways to install Gogs: Other acknowledgments: - Thanks [Egon Elbre](https://twitter.com/egonelbre) for designing the original version of the logo. -- Thanks [Crowdin](https://crowdin.com/project/gogs) for sponsoring open source translation plan. +- Thanks [Mintlify](https://mintlify.com) for sponsoring open source documentation plan. +- Thanks [Crowdin](https://crowdin.com) for sponsoring open source translation plan. - Thanks [Buildkite](https://buildkite.com) for sponsoring open source CI/CD plan. ## 👋 Contributors diff --git a/README_ZH.md b/README_ZH.md deleted file mode 100644 index 4d5f651e2..000000000 --- a/README_ZH.md +++ /dev/null @@ -1,102 +0,0 @@ -# Gogs - -Gogs 是一款极易搭建的自助 Git 服务。 - -## 项目愿景 - -Gogs（`/gɑgz/`）项目旨在打造一个以最简便的方式搭建简单、稳定和可扩展的自助 Git 服务。使用 Go 语言开发使得 Gogs 能够通过独立的二进制分发，并且支持 Go 语言支持的 **所有平台**，包括 Linux、macOS、Windows 和基于 ARM 的操作系统。 - -## 概览 - -- 请移步[官网](https://gogs.io)查看用户使用文档 -- 请通过 [CHANGELOG.md](CHANGELOG.md) 文件查看各个版本的变更历史 -- 想要先睹为快？直接去[在线体验](https://try.gogs.io/gogs/gogs)吧！ -- 使用过程中遇到问题？尝试[故障排查](https://gogs.io/docs/intro/troubleshooting.html)或者前往[用户论坛](https://discuss.gogs.io/)获取帮助 -- 希望帮助多国语言的翻译吗？请查看[本地化文档](https://gogs.io/docs/features/i18n.html) -- 准备搞点事情？请阅读[开发指南](docs/dev/local_development.md)配置开发环境 -- 想调用 API 吗？请查看[文档](https://github.com/gogs/docs-api)吧 - -## 主要特性 - -- 控制面板、用户页面以及活动时间线 -- 通过 SSH、HTTP 和 HTTPS 协议操作仓库 -- 管理用户、组织和仓库 -- 仓库和组织级 Webhook，包括 Slack、Discord 和钉钉 -- 仓库 Git 钩子、部署密钥和 Git LFS -- 仓库工单（Issue）、合并请求（Pull Request）、Wiki、保护分支和多人协作 -- 从其它代码平台迁移和镜像仓库以及 Wiki -- 在线编辑仓库文件和 Wiki -- Jupyter Notebook 和 PDF 的渲染 -- 通过 SMTP、LDAP、反向代理、GitHub.com 和 GitHub 企业版进行用户认证 -- 开启两步验证（2FA）登录 -- 自定义 HTML 模板、静态文件和许多其它组件 -- 多样的数据库后端，包括 PostgreSQL、MySQL、SQLite3 和 [TiDB](https://github.com/pingcap/tidb) -- 超过 [31 种语言](https://crowdin.com/project/gogs)的本地化 - -## 硬件要求 - -- 最低的系统硬件要求为一个廉价的树莓派 -- 如果用于团队项目管理，建议使用 2 核 CPU 及 512MB 内存 -- 当团队成员大量增加时，可以考虑添加 CPU 核数，内存占用保持不变 - -## 浏览器支持 - -- 请根据 [Semantic UI](https://github.com/Semantic-Org/Semantic-UI#browser-support) 查看具体支持的浏览器版本。 -- 官方支持的最小 UI 尺寸为 **1024*768**，UI 不一定会在更小尺寸的设备上被破坏，但我们无法保证且不会修复。 - -## 安装部署 - -在安装 Gogs 之前，您需要先安装 [基本环境](https://gogs.io/docs/installation)。 - -然后，您可以通过以下 6 种方式来安装 Gogs： - -- [二进制安装](https://gogs.io/docs/installation/install_from_binary.html) -- [源码安装](https://gogs.io/docs/installation/install_from_source.html) -- [包管理安装](https://gogs.io/docs/installation/install_from_packages.html) -- [采用 Docker 部署](https://github.com/gogs/gogs/tree/main/docker) -- [通过 Vagrant 安装](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs) -- [通过基于 Kubernetes 的 Helm Charts](https://github.com/helm/charts/tree/master/incubator/gogs) - -### 云端部署 - -- [OpenShift](https://github.com/tkisme/gogs-openshift) -- [Cloudron](https://cloudron.io/appstore.html#io.gogs.cloudronapp) -- [Scaleway](https://www.scaleway.com/imagehub/gogs/) -- [Sandstorm](https://github.com/cem/gogs-sandstorm) -- [sloppy.io](https://github.com/sloppyio/quickstarters/tree/master/gogs) -- [YunoHost](https://github.com/mbugeia/gogs_ynh) -- [DPlatform](https://github.com/j8r/DPlatform) -- [LunaNode](https://github.com/LunaNode/launchgogs) - -### 使用教程 - -- [使用 Gogs 搭建自己的 Git 服务器](https://blog.mynook.info/post/host-your-own-git-server-using-gogs/) -- [阿里云上 Ubuntu 14.04 64 位安装 Gogs](http://my.oschina.net/luyao/blog/375654) - -## 软件、服务以及产品支持 - -- [Fabric8](http://fabric8.io/)（DevOps） -- [Jenkins](https://plugins.jenkins.io/gogs-webhook/)（CI） -- [Taiga](https://taiga.io/)（项目管理） -- [Puppet](https://forge.puppet.com/Siteminds/gogs)（IT） -- [Kanboard](https://github.com/kanboard/plugin-gogs-webhook)（项目管理） -- [BearyChat](https://bearychat.com/)（团队交流） -- [GitPitch](https://gitpitch.com/)（Markdown 演示） -- [Synology](https://www.synology.com)（Docker） -- [Syncloud](https://syncloud.org/)（应用商店） - -## 特别鸣谢 - -- 感谢 [Egon Elbre](https://twitter.com/egonelbre) 设计的 Logo。 -- 感谢 [DigitalOcean](https://www.digitalocean.com) 和 [MonoVM](https://monovm.com) 提供服务器赞助。 -- 感谢 [Crowdin](https://crowdin.com/project/gogs) 提供免费的开源项目本地化支持。 -- 感谢 [Buildkite](https://buildkite.com) 提供免费的开源项目 CI/CD 支持。 - -## 贡献成员 - -- 您可以通过查看 [贡献者页面](https://github.com/gogs/gogs/graphs/contributors) 获取 TOP 100 的贡献者列表。 -- 您可以通过查看 [TRANSLATORS](conf/locale/TRANSLATORS) 文件获取公开的翻译人员列表。 - -## 授权许可 - -本项目采用 MIT 开源授权许可证，完整的授权说明已放置在 [LICENSE](https://github.com/gogs/gogs/blob/main/LICENSE) 文件中。 diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 84942da7f..2c7b3d4a6 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -120,7 +120,6 @@ confirm_password = Confirm Password admin_email = Admin Email install_gogs = Install Gogs test_git_failed = Failed to test 'git' command: %v -sqlite3_not_available = Your release version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version. invalid_db_setting = Database setting is not correct: %v invalid_repo_path = Repository root path is invalid: %v run_user_not_match = Run user isn't the current user: %s -> %s diff --git a/docs/getting-started/introduction.mdx b/docs/getting-started/introduction.mdx index 3c8b69a0a..81bbf6630 100644 --- a/docs/getting-started/introduction.mdx +++ b/docs/getting-started/introduction.mdx @@ -5,14 +5,14 @@ description: "The painless way to host your own Git service" icon: "book-open" --- - - @@ -34,14 +34,14 @@ The growth of the Gogs project wasn't possible without our world-class sponsors! - - - - - - 0 { - c.Data["Description"] = c.Tr("repo.settings.hooks_desc", "https://gogs.io/docs/features/webhook.html") + c.Data["Description"] = c.Tr("repo.settings.hooks_desc", "https://gogs.io/advancing/webhooks") ws, err = database.GetWebhooksByRepoID(orCtx.RepoID) } else { c.Data["Description"] = c.Tr("org.settings.hooks_desc") diff --git a/scripts/windows/install-as-service.bat b/scripts/windows/install-as-service.bat index 2ee477131..2b5f140b7 100644 --- a/scripts/windows/install-as-service.bat +++ b/scripts/windows/install-as-service.bat @@ -9,7 +9,7 @@ :: Make sure Gogs work running manually with "gogs web" before running :: this script. :: And, please, read carefully the installation docs first: -:: https://gogs.io/docs/installation +:: https://gogs.io/fine-tuning/run-as-service#windows :: To uninstall the service, run "nssm remove gogs" and restart Windows. :: Set the folder where you extracted Gogs. Omit the last slash. diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 21489ecfe..b9aaa0774 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -148,7 +148,7 @@ {{.i18n.Tr "your_settings"}} - + {{.i18n.Tr "help"}} {{if .IsAdmin}} @@ -173,7 +173,7 @@ {{else}} - {{.i18n.Tr "help"}} + {{.i18n.Tr "help"}}
{{if .ShowRegistrationButton}} diff --git a/templates/home.tmpl b/templates/home.tmpl index ae6633163..31d28261a 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -17,7 +17,7 @@ Einfach zu installieren

- Starte einfach die Anwendung für deine Plattform. Gogs gibt es auch für Docker, Vagrant oder als Installationspaket. + Starte einfach die Anwendung für deine Plattform. Gogs gibt es auch für Docker oder als Installationspaket.

@@ -54,7 +54,7 @@ 易安装

- 您除了可以根据操作系统平台通过 二进制运行，还可以通过 Docker 或 Vagrant，以及 包管理 安装。 + 您除了可以根据操作系统平台通过二进制运行，还可以通过 Docker，以及包管理安装。

@@ -91,10 +91,9 @@ Facile à installer

- Il suffit de lancer l'exécutable correspondant à votre système. - Ou d'utiliser Gogs avec Docker ou - Vagrant - ou en l'installant depuis un package. + Il suffit de lancer l'exécutable correspondant à votre système. + Ou d'utiliser Gogs avec Docker + ou en l'installant depuis un package.

@@ -131,7 +130,7 @@ Fácil de instalar

- Simplemente arranca el binario para tu plataforma. O usa Gogs con Docker o Vagrant, o utilice el paquete. + Simplemente arranca el binario para tu plataforma. O usa Gogs con Docker, o utilice el paquete.

@@ -168,7 +167,7 @@ Fácil de instalar

- Simplesmente rode o executável para o seu sistema operacional. Ou obtenha o Gogs com o Docker ou Vagrant, ou baixe o pacote. + Simplesmente rode o executável para o seu sistema operacional. Ou obtenha o Gogs com o Docker, ou baixe o pacote.

@@ -205,7 +204,7 @@ Простой в установке

- Просто запустите исполняемый файл для вашей платформы. Используйте Gogs с Docker или Vagrant, или загрузите пакет. + Просто запустите исполняемый файл для вашей платформы. Используйте Gogs с Docker или загрузите пакет.

@@ -242,7 +241,7 @@ Простий у втановленні

- Просто запустіть виконуваний файл для вашої платформи. Використовуйте Gogs с Docker або Vagrant, або завантажте пакет. + Просто запустіть виконуваний файл для вашої платформи. Використовуйте Gogs с Docker або завантажте пакет.

@@ -279,7 +278,7 @@ Facie da installare

- Basta avviare il binario per la tua piattaforma. + Basta avviare il binario per la tua piattaforma.

@@ -316,7 +315,7 @@ Easy to install

- Simply run the binary for your platform. Or ship Gogs with Docker or Vagrant, or get it packaged. + Simply run the binary for your platform. Or ship Gogs with Docker, or get it packaged.

diff --git a/templates/repo/settings/webhook/gogs.tmpl b/templates/repo/settings/webhook/gogs.tmpl index 08e6631ea..efa3dca88 100644 --- a/templates/repo/settings/webhook/gogs.tmpl +++ b/templates/repo/settings/webhook/gogs.tmpl @@ -1,5 +1,5 @@ {{if eq .HookType "gogs"}} -

{{.i18n.Tr "repo.settings.add_webhook_desc" "https://gogs.io/docs/features/webhook.html" | Safe}}

+

{{.i18n.Tr "repo.settings.add_webhook_desc" "https://gogs.io/advancing/webhooks" | Safe}}

{{.CSRFTokenHTML}}