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

Show ssh command directly in template instead of i18n translation #19335

Merged
merged 4 commits into from
Apr 6, 2022
Merged

Show ssh command directly in template instead of i18n translation #19335

merged 4 commits into from
Apr 6, 2022

Conversation

junjieyuan
Copy link
Contributor

Signed-off-by: Junjie Yuan yuan@junjie.pro

If missing space, ssh-keygen will report "Too few arguments for sign: missing namespace" and failed to generate ssh token.

Signed-off-by: Junjie Yuan <yuan@junjie.pro>
@wxiaoguang
Copy link
Contributor

Translations are maintained by https://crowdin.com/translate/gitea/68/enus-zhcn , the edits on these locale files will be overwritten by the crowdin translations.

So you can submit the translations at crowdin.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 6, 2022
@junjieyuan
Copy link
Contributor Author

Translations are maintained by https://crowdin.com/translate/gitea/68/enus-zhcn , the edits on these locale files will be overwritten by the crowdin translations.

So you can submit the translations at crowdin.

Hello, @wxiaoguang. Can you submit new translations for me? I don't plan to sign up for a Crowdin account right now. Thanks!

Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ssh command shouldn't use i18n translation. So I just edited on your PR directly, show the command directly in the tmpl

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 6, 2022
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 6, 2022
@wxiaoguang wxiaoguang added this to the 1.17.0 milestone Apr 6, 2022
@wxiaoguang wxiaoguang changed the title add missing space for generate ssh token command Show ssh command directly in template instead of i18n translation Apr 6, 2022
@junjieyuan
Copy link
Contributor Author

This ssh command shouldn't use i18n translation. So I just edited on your PR directly, show the command directly in the tmpl

Thank you for your help!

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 6, 2022
@lunny lunny merged commit 1843026 into go-gitea:main Apr 6, 2022
@junjieyuan junjieyuan deleted the add-missing-space branch April 6, 2022 13:26
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 11, 2022
* giteaofficial/main: (22 commits)
  Add logic to switch between source/rendered on Markdown (go-gitea#19356)
  Fixed registry host value. (go-gitea#19363)
  [skip ci] Updated translations via Crowdin
  Allow package linking to private repository (go-gitea#19348)
  Use "main" as default branch name (go-gitea#19354)
  Move milestone to models/issues/ (go-gitea#19278)
  Refactor CSRF protection modules, make sure CSRF tokens can be up-to-date. (go-gitea#19337)
  Remove dependent on session auth for api/v1 routers (go-gitea#19321)
  API: Search Issues, dont show 500 if filter result in empty list (go-gitea#19244)
  [skip ci] Updated translations via Crowdin
  Never use /api/v1 from Gitea UI Pages (go-gitea#19318)
  [skip ci] Updated translations via Crowdin
  Show ssh command directly in template instead of i18n translation (go-gitea#19335)
  Package registry changes (go-gitea#19305)
  [skip ci] Updated translations via Crowdin
  Add `ENABLE_SSH_LOG` to debugging problems (go-gitea#19316)
  Warn on SSH connection for incorrect configuration (go-gitea#19317)
  escape fake link
  Allow custom redirect for landing page (go-gitea#19324)
  [skip ci] Updated translations via Crowdin
  ...
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this pull request Aug 24, 2022
…-gitea#19335)

* add missing space for generate ssh token command

Signed-off-by: Junjie Yuan <yuan@junjie.pro>

* Do not use i18n for ssh command

* Remove unnecessary settings.ssh_token_code

* Revert locale_zh-CN.ini

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants