Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trivial Typo: Change 'Gitlab' to 'GitLab' #177

Merged
merged 2 commits into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/administration/oauth-providers.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Opengist can be configured to use OAuth to authenticate users, with GitHub, Gite
```yaml
gitlab.client-key: <key>
gitlab.secret: <secret>
# URL of the Gitlab instance. Default: https://gitlab.com/
# URL of the GitLab instance. Default: https://gitlab.com/
gitlab.url: https://gitlab.com/
```

Expand Down
6 changes: 3 additions & 3 deletions internal/i18n/locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ settings.email-help: Used for commits and Gravatar
settings.email-set: Set email
settings.link-accounts: Link accounts
settings.link-github-account: Link GitHub account
settings.link-gitlab-account: Link Gitlab account
settings.link-gitlab-account: Link GitLab account
settings.link-gitea-account: Link Gitea account
settings.unlink-github-account: Unlink GitHub account
settings.unlink-gitlab-account: Unlink Gitlab account
settings.unlink-gitlab-account: Unlink GitLab account
settings.unlink-gitea-account: Unlink Gitea account
settings.delete-account: Delete account
settings.delete-account-confirm: Are you sure you want to delete your account ?
Expand Down Expand Up @@ -123,7 +123,7 @@ auth.password: Password
auth.register-instead: Register instead
auth.login-instead: Login instead
auth.github-oauth: Continue with GitHub account
auth.gitlab-oauth: Continue with Gitlab account
auth.gitlab-oauth: Continue with GitLab account
auth.gitea-oauth: Continue with Gitea account

error: Error
Expand Down
3 changes: 3 additions & 0 deletions internal/i18n/locales/zh-TW.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,10 @@ settings.email-help: 用於提交和 Gravatar
settings.email-set: 設定電子郵件
settings.link-accounts: 連結帳號
settings.link-github-account: 連結 GitHub 帳號
settings.link-gitlab-account: 連結 Gitlab 帳號
settings.link-gitea-account: 連結 Gitea 帳號
settings.unlink-github-account: 取消連結 GitHub 帳號
settings.unlink-gitlab-account: 取消連結 GitLab 帳號
settings.unlink-gitea-account: 取消連結 Gitea 帳號
settings.delete-account: 刪除帳號
settings.delete-account-confirm: 確定要刪除您的帳號嗎?
Expand Down Expand Up @@ -121,6 +123,7 @@ auth.password: 密碼
auth.register-instead: 註冊
auth.login-instead: 登錄
auth.github-oauth: 用 GitHub 帳號繼續
auth.gitlab-oauth: 用 GitLab 帳號繼續
auth.gitea-oauth: 用 Gitea 帳號繼續

error: 錯誤
Expand Down
2 changes: 1 addition & 1 deletion templates/pages/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h2 class="text-md font-bold text-slate-700 dark:text-slate-300 mb-2">
{{ if .gitlabOauth }}
{{ if .userLogged.GitlabID }}
<a href="{{ $.c.ExternalUrl }}/oauth/gitlab" class="block w-full mb-2 text-center whitespace-nowrap text-slate-700 dark:text-slate-300{{ if .syncReposFromFS }} text-slate-500 cursor-not-allowed {{ end }}rounded border border-gray-300 dark:border-gray-600 bg-gray-50 dark:bg-gray-800 px-2.5 py-2 text-xs font-medium text-gray-700 dark:text-white shadow-sm hover:bg-gray-100 dark:hover:bg-gray-700 hover:border-gray-500 hover:text-slate-700 dark:hover:text-slate-300 focus:outline-none focus:ring-1 focus:border-primary-500 focus:ring-primary-500 leading-3"
onclick="return confirm('Are you sure you want to unlink your Gitlab account? You may lose access to Opengist if it\'s your only way to log in.')">
onclick="return confirm('Are you sure you want to unlink your GitLab account? You may lose access to Opengist if it\'s your only way to log in.')">
{{ .locale.Tr "settings.unlink-gitlab-account" }}
</a>
{{ else }}
Expand Down