Merge pull request #394 from ticky/email-reblog-to-boost

"Reblog" -> "boost" in more places
master
Eugen 7 years ago committed by GitHub
commit 9bb1b97d2a
  1. 2
      app/assets/javascripts/components/features/notifications/components/notification.jsx
  2. 4
      config/locales/en.yml
  3. 4
      spec/mailers/notification_mailer_spec.rb

@ -71,7 +71,7 @@ const Notification = React.createClass({
<i className='fa fa-fw fa-retweet' style={{ color: '#2b90d9' }} /> <i className='fa fa-fw fa-retweet' style={{ color: '#2b90d9' }} />
</div> </div>
<FormattedMessage id='notification.reblog' defaultMessage='{name} reblogged your status' values={{ name: link }} /> <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} />
</div> </div>
<StatusContainer id={notification.get('status')} muted={true} /> <StatusContainer id={notification.get('status')} muted={true} />

@ -67,8 +67,8 @@ en:
body: 'You were mentioned by %{name} in:' body: 'You were mentioned by %{name} in:'
subject: You were mentioned by %{name} subject: You were mentioned by %{name}
reblog: reblog:
body: 'Your status was reblogged by %{name}:' body: 'Your status was boosted by %{name}:'
subject: "%{name} reblogged your status" subject: "%{name} boosted your status"
pagination: pagination:
next: Next next: Next
prev: Prev prev: Prev

@ -53,12 +53,12 @@ RSpec.describe NotificationMailer, type: :mailer do
let(:mail) { NotificationMailer.reblog(own_status.account, Notification.create!(account: receiver.account, activity: reblog)) } let(:mail) { NotificationMailer.reblog(own_status.account, Notification.create!(account: receiver.account, activity: reblog)) }
it "renders the headers" do it "renders the headers" do
expect(mail.subject).to eq("bob reblogged your status") expect(mail.subject).to eq("bob boosted your status")
expect(mail.to).to eq([receiver.email]) expect(mail.to).to eq([receiver.email])
end end
it "renders the body" do it "renders the body" do
expect(mail.body.encoded).to match("Your status was reblogged by bob") expect(mail.body.encoded).to match("Your status was boosted by bob")
end end
end end

Loading…
Cancel
Save