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.

Sign up for GitHub

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

Jump to bottom

Fix copy in email templates #2801

Merged
merged 4 commits into from
Oct 29, 2017
Merged

Fix copy in email templates #2801

merged 4 commits into from
Oct 29, 2017

Conversation

mmarif4u
Copy link

Fixes #2784

@codecov-io
Copy link

codecov-io commented Oct 28, 2017 •
edited
Loading

Codecov Report

Merging #2801 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2801   +/-   ##
=======================================
  Coverage   26.86%   26.86%           
=======================================
  Files          89       89           
  Lines       17596    17596           
=======================================
  Hits         4727     4727           
  Misses      12183    12183           
  Partials      686      686

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 638509b...8c3de2a. Read the comment docs.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 28, 2017
lafriks
lafriks reviewed Oct 28, 2017
View reviewed changes
templates/mail/auth/activate_email.tmpl Outdated
@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>{{.Username}}, please verify your e-mail address</title>
<title>{{.Username}}, please verify your email address</title>
Copy link
Member

@lafriks lafriks Oct 28, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

I don't think this change is needed

Copy link
Author

Choose a reason for hiding this comment

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

I have changed it to email, because in the mail body it is email.
Please click the following link to verify your email address within.
If still want to revert back, i will roll it back to e-mail.

Copy link
Member

Choose a reason for hiding this comment

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

I think it would be better as it was before

Copy link
Author

Choose a reason for hiding this comment

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

Ok, no problem.

@appleboy appleboy added the type/enhancement An improvement of existing functionality label Oct 29, 2017
@appleboy appleboy added this to the 1.3.0 milestone Oct 29, 2017
@lafriks
Copy link
Member

lafriks commented Oct 29, 2017

LGTM

@tboerger tboerger 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 Oct 29, 2017
@ethantkoenig
Copy link
Member

LGTM, although these should eventually be moved to locales, right?

@tboerger tboerger 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 Oct 29, 2017
@lafriks lafriks merged commit 6e98812 into go-gitea:master Oct 29, 2017
@lafriks
Copy link
Member

lafriks commented Oct 29, 2017

@ethantkoenig I think yes

@ethantkoenig ethantkoenig mentioned this pull request Oct 29, 2017
Closed
@mmarif4u mmarif4u deleted the fix-email-template-copy branch October 30, 2017 02:04
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks left review comments

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.

Password reset email copy
6 participants
@mmarif4u @codecov-io @lafriks @ethantkoenig @appleboy @tboerger