Skip to content

Commit

Permalink
First shot at replacing Devise mails with plaintext mails.
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Altmann committed Mar 6, 2016
1 parent 68dd725 commit fefa3ea
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 31 deletions.
17 changes: 0 additions & 17 deletions app/views/devise_mailer/confirmation_instructions.html.slim

This file was deleted.

13 changes: 13 additions & 0 deletions app/views/devise_mailer/confirmation_instructions.text.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
= "#{t('common.text.hello')} #{@resource.nickname},"

= t('devise.confirmation.email.text')

= t('devise.confirmation.email.link')

= confirmation_url(@resource, confirmation_token: @token)

= t('devise.reset.ignoremail_begin')
= t('devise.reset.ignoremail_addr')
= t('devise.reset.ignoremail_end')

= render 'shared/email/imprint'
14 changes: 0 additions & 14 deletions app/views/devise_mailer/welcome_mail.html.slim

This file was deleted.

18 changes: 18 additions & 0 deletions app/views/devise_mailer/welcome_mail.text.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<%# Copyright (c) 2012-2016, Fairmondo eG. This file is
licensed under the GNU Affero General Public License version 3 or later.
See the COPYRIGHT file for details. %>
<%= "#{t('common.text.hello')} #{@resource.nickname}," %>
<%= t('devise.confirmation.text') %>
<% if @resource.newsletter %>
<%= t('devise.confirmation.link_if_newsletter') %>
<%= confirmation_url(@resource, confirmation_token: @token) %>
<% else %>
<%= t('devise.confirmation.link') %>
<%= confirmation_url(@resource, confirmation_token: @token) %>
<% end %>
<%= t('devise.confirmation.ignoremail') %>
<%= render 'shared/email/imprint' %>
15 changes: 15 additions & 0 deletions app/views/shared/email/_imprint.text.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--
Fairmondo eG
Glogauer Str. 21
10999 Berlin

www.fairmondo.de
Gutes einfach entdecken

Registergericht: Amtsgericht Berlin-Charlottenburg, GnR 738 B USt-IdNr.: DE 290376380

Vorstand: Felix Weth, Richard Schmid
Aufsichtsratsvorsitzender: Kim Stattaus

Facebook: www.facebook.com/fairmondo
Beteiligung an der Genossenschaft: mitmachen.fairmondo.de/anteile-zeichnen/

0 comments on commit fefa3ea

Please sign in to comment.