diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-14 22:11:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 22:11:56 +0100 |
| commit | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (patch) | |
| tree | 74a5e58f2c724746d2e929b9df0e5682f17a2637 /app/views/user_mailer | |
| parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
| parent | 09ac5e7528ba3bfe90c20002f47c863d9afc6fcd (diff) | |
Merge pull request #960 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/user_mailer')
| -rw-r--r-- | app/views/user_mailer/confirmation_instructions.html.haml | 2 | ||||
| -rw-r--r-- | app/views/user_mailer/confirmation_instructions.text.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml index f75f7529a..70d0f5a24 100644 --- a/app/views/user_mailer/confirmation_instructions.html.haml +++ b/app/views/user_mailer/confirmation_instructions.html.haml @@ -36,7 +36,7 @@ %tbody %tr %td.column-cell.text-center - %p= t 'devise.mailer.confirmation_instructions.explanation', host: site_hostname + %p= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname %table.email-table{ cellspacing: 0, cellpadding: 0 } %tbody diff --git a/app/views/user_mailer/confirmation_instructions.text.erb b/app/views/user_mailer/confirmation_instructions.text.erb index 65b4626c6..aad91cd9d 100644 --- a/app/views/user_mailer/confirmation_instructions.text.erb +++ b/app/views/user_mailer/confirmation_instructions.text.erb @@ -2,7 +2,7 @@ === -<%= t 'devise.mailer.confirmation_instructions.explanation', host: site_hostname %> +<%= t @resource.approved? ? 'devise.mailer.confirmation_instructions.explanation' : 'devise.mailer.confirmation_instructions.explanation_when_pending', host: site_hostname %> => <%= confirmation_url(@resource, confirmation_token: @token, redirect_to_app: @resource.created_by_application ? 'true' : nil) %> |