forked from cybrespace/mastodon
		
	Merge pull request #394 from ticky/email-reblog-to-boost
"Reblog" -> "boost" in more places
This commit is contained in:
		
						commit
						9bb1b97d2a
					
				
					 3 changed files with 5 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -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} />
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue