mastofe

commit: 9bb1b97d2a31477ce3da83fb204dd5702323c1bb
parent: 3b604d278602757350b769888dc3bf407887eff7
Author: Eugen <eugen@zeonfederated.com>
Date:   Thu,  5 Jan 2017 03:35:22 +0100

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

"Reblog" -> "boost" in more places
Diffstat:
M
app/assets/javascripts/components/features/notifications/components/notification.jsx
2
+-
M
config/locales/en.yml
4
++--
M
spec/mailers/notification_mailer_spec.rb
4
++--

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/assets/javascripts/components/features/notifications/components/notification.jsx b/app/assets/javascripts/components/features/notifications/components/notification.jsx
@@ -71,7 +71,7 @@ const Notification = React.createClass({
             <i className='fa fa-fw fa-retweet' style={{ color: '#2b90d9' }} />
           </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>
 
         <StatusContainer id={notification.get('status')} muted={true} />
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -67,8 +67,8 @@ en:
       body: 'You were mentioned by %{name} in:'
       subject: You were mentioned by %{name}
     reblog:
-      body: 'Your status was reblogged by %{name}:'
-      subject: "%{name} reblogged your status"
+      body: 'Your status was boosted by %{name}:'
+      subject: "%{name} boosted your status"
   pagination:
     next: Next
     prev: Prev
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
@@ -53,12 +53,12 @@ RSpec.describe NotificationMailer, type: :mailer do
     let(:mail) { NotificationMailer.reblog(own_status.account, Notification.create!(account: receiver.account, activity: reblog)) }
 
     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])
     end
 
     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