Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update server.en.yml -- minor copyedit (#11631) 

* Update server.en.yml

* Fix the build

Co-authored-by: Arpit Jalan <arpit@techapj.com>
This commit is contained in:
Jeff Atwood 2021-01-04 18:32:02 -08:00 committed by GitHub
parent 0e04f8ac39
commit 762eadb9b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/locales/server.en.yml
View File

@ -1034,9 +1034,9 @@ en:
mute_topic: "Mute all notifications for this topic, %{link}" mute_topic: "Mute all notifications for this topic, %{link}"
unwatch_category: "Stop watching all topics in %{category}" unwatch_category: "Stop watching all topics in %{category}"
mailing_list_mode: "Turn off mailing list mode" mailing_list_mode: "Turn off mailing list mode"
all: "Don't send me any mail from %{sitename}" all: "Don’t send me any mail from %{sitename}"
different_user_description: "You are currently logged in as a different user than the one we emailed. Please log out, or enter anonymous mode, and try again." different_user_description: "You are currently logged in as a different user than the one we emailed. Please log out, or enter anonymous mode, and try again."
not_found_description: "Sorry, we couldn't find this unsubscribe. It's possible the link in your email has expired?" not_found_description: "Sorry, we couldn't find this unsubscribe. It’s possible the link in your email is too old and has expired?"
log_out: "Log Out" log_out: "Log Out"
submit: "Save preferences" submit: "Save preferences"
digest_frequency: digest_frequency:

2
spec/requests/email_controller_spec.rb
View File

@ -199,7 +199,7 @@ RSpec.describe EmailController do
navigate_to_unsubscribe navigate_to_unsubscribe
expect(body).to include("You are not receiving summary emails") expect(body).to include("You are not receiving summary emails")
expect(body).to include("Don&#39;t send me any mail from Discourse") expect(body).to include("Don’t send me any mail from Discourse")
end end
it 'hides unsubscribe from all checkbox when user already unsubscribed' do it 'hides unsubscribe from all checkbox when user already unsubscribed' do