From b25e42a77f4b3472bc519e8a394b2cfe0e063e4c Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 31 May 2017 14:38:17 -0400 Subject: Misc tidying and clean ups (#3445) * Remove trailing whitespace in i18n mailers * Use query methods instead of #present? on AR attributes * Delegate Status#account_domain method * Delegate Mention #account_username and #account_acct methods --- app/views/api/v1/statuses/_mention.rabl | 4 ++-- app/views/user_mailer/confirmation_instructions.ar.text.erb | 2 +- app/views/user_mailer/confirmation_instructions.fa.text.erb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views') diff --git a/app/views/api/v1/statuses/_mention.rabl b/app/views/api/v1/statuses/_mention.rabl index 498cca275..8c95fc9bd 100644 --- a/app/views/api/v1/statuses/_mention.rabl +++ b/app/views/api/v1/statuses/_mention.rabl @@ -1,4 +1,4 @@ node(:url) { |mention| TagManager.instance.url_for(mention.account) } -node(:acct) { |mention| mention.account.acct } +node(:acct) { |mention| mention.account_acct } node(:id) { |mention| mention.account_id } -node(:username) { |mention| mention.account.username } +node(:username) { |mention| mention.account_username } diff --git a/app/views/user_mailer/confirmation_instructions.ar.text.erb b/app/views/user_mailer/confirmation_instructions.ar.text.erb index 1b7b445a1..087c6a9ae 100644 --- a/app/views/user_mailer/confirmation_instructions.ar.text.erb +++ b/app/views/user_mailer/confirmation_instructions.ar.text.erb @@ -9,4 +9,4 @@ مع أجمل التحيات، -فريق <%= @instance %> +فريق <%= @instance %> diff --git a/app/views/user_mailer/confirmation_instructions.fa.text.erb b/app/views/user_mailer/confirmation_instructions.fa.text.erb index cbabed06d..904bd5bfe 100644 --- a/app/views/user_mailer/confirmation_instructions.fa.text.erb +++ b/app/views/user_mailer/confirmation_instructions.fa.text.erb @@ -2,11 +2,11 @@ شما الان در <%= @instance %> حساب باز کردید. -برای تأیید عضویت، لطفاً روی پیوند زیر کلیک کنید: +برای تأیید عضویت، لطفاً روی پیوند زیر کلیک کنید: <%= confirmation_url(@resource, confirmation_token: @token) %> لطفاً همچنین شرایط و مقررات استفادهٔ ما را هم بخوانید <%= terms_url %> با احترام، -گردانندگان سرور <%= @instance %> +گردانندگان سرور <%= @instance %> -- cgit