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

Display app name in the registration email title #31562

Merged
merged 5 commits into from
Jul 11, 2024
Merged

Conversation

SunnyWan59
Copy link
Contributor

@SunnyWan59 SunnyWan59 commented Jul 5, 2024

I changed the title of the registation email from "Welcome to Gitea" to "Welcome to (appname)". I did this by substituting 'Gitea' in register_notify to %s and formating the registration title in mail.go. I changed this for all the languages I could, but I struggled to changed the translation file for Farsi. I have attached the screenshots of before and after and the related issue below.

Related issue:
#31108

Before change:
Screenshot from 2024-07-04 22-32-17

After:
Screenshot from 2024-07-04 22-32-01

Signed-off-by: Sunny Wan <Sunnywan2020@gmail.com>
@GiteaBot
Copy link
Contributor

GiteaBot commented Jul 5, 2024

@SunnyWan59 I noticed you've updated the locales for non-English languages. These will be overwritten during the sync from our translation tool Crowdin. If you'd like to contribute your translations, please visit https://crowdin.com/project/gitea. Please revert the changes done on these files. 🍵

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 5, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 5, 2024
@github-actions github-actions bot added modifies/translation modifies/go Pull requests that update Go code labels Jul 5, 2024
Copy link
Member

@delvh delvh left a comment

Choose a reason for hiding this comment

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

LGTM once you remove the other changes

@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 Jul 5, 2024
@delvh delvh changed the title Changed registration email title so that the appname is displayed Display app name in the registration email title Jul 5, 2024
@SunnyWan59
Copy link
Contributor Author

LGTM once you remove the other changes

To be clear remove the changes to the other locales right?

services/mailer/mail.go Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 11, 2024
@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 Jul 11, 2024
@6543 6543 enabled auto-merge (squash) July 11, 2024 22:54
@6543 6543 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 11, 2024
@6543 6543 merged commit 4913eda into go-gitea:main Jul 11, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Jul 11, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 11, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 12, 2024
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Display app name in the registration email title (go-gitea#31562)
  typo on date in security document (go-gitea#31617)
  Update JS dependencies (go-gitea#31616)
  Add types for js globals (go-gitea#31586)
@kemzeb kemzeb mentioned this pull request Aug 31, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Oct 10, 2024
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. modifies/go Pull requests that update Go code modifies/translation size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants