Skip to content

Commit 252e890

Browse files
authored
Merge pull request #252 from coopdevs/feature/donate-messages
Add donate messages in mail notifications and about page
2 parents 479fdc9 + 6ea2116 commit 252e890

File tree

10 files changed

+50
-5
lines changed

10 files changed

+50
-5
lines changed

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ group :development do
5353
# gem 'capistrano3-delayed-job', '~> 1.0'
5454
gem 'airbrussh', require: false
5555
gem "quiet_assets"
56-
gem 'localeapp', '2.1.1'
56+
gem 'localeapp', '2.1.1', require: false
57+
gem 'letter_opener', '1.4.1'
5758
end
5859

5960
group :development, :test do

Gemfile.lock

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ GEM
5454
minitest (~> 5.1)
5555
thread_safe (~> 0.3, >= 0.3.4)
5656
tzinfo (~> 1.1)
57+
addressable (2.5.1)
58+
public_suffix (~> 2.0, >= 2.0.2)
5759
airbrussh (0.8.0)
5860
sshkit (>= 1.6.1, != 1.7.0)
5961
arbre (1.0.3)
@@ -183,6 +185,10 @@ GEM
183185
actionpack (>= 3.0.0)
184186
activesupport (>= 3.0.0)
185187
kgio (2.10.0)
188+
launchy (2.4.3)
189+
addressable (~> 2.3)
190+
letter_opener (1.4.1)
191+
launchy (~> 2.2)
186192
localeapp (2.1.1)
187193
gli
188194
i18n (~> 0.4)
@@ -218,6 +224,7 @@ GEM
218224
pdf-core (~> 0.5.1)
219225
ttfunk (~> 1.4.0)
220226
prawn-table (0.2.1)
227+
public_suffix (2.0.5)
221228
pundit (0.3.0)
222229
activesupport (>= 3.0.0)
223230
quiet_assets (1.1.0)
@@ -393,6 +400,7 @@ DEPENDENCIES
393400
jquery-rails (= 4.0.4)
394401
jquery-ui-rails
395402
kaminari
403+
letter_opener (= 1.4.1)
396404
localeapp (= 2.1.1)
397405
memcachier
398406
nokogiri (= 1.6.7.2)

app/assets/stylesheets/application.css.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ form .checkbox input[type="checkbox"] {
712712
display: none;
713713
}
714714

715-
.header, .banner, .empower {
715+
.header, .banner, .empower, .donate {
716716
text-align: center;
717717
}
718718

@@ -789,7 +789,7 @@ form .checkbox input[type="checkbox"] {
789789
}
790790
}
791791

792-
.empower {
792+
.empower, .donate {
793793
h2 {
794794
margin-bottom: 4rem;
795795
}

app/views/organization_notifier/recent_posts.html.erb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@
3838
--
3939
<p>
4040
<%= t("mailers_globals.footer.text", organization_name: @organization_name) %>
41-
<a href="<%= page_url('home', only_path: false) %>">
41+
<a href="<%= root_url %>">
4242
TimeOverflow
4343
<a>
44+
<br />
45+
<em><%= t("mailers_globals.footer.text_donation", href: link_to(t("mailers_globals.footer.text_donation_link"), "https://www.teaming.net/poreldesarrollodelosbancosdetiempo")).html_safe %></em>
4446
</p>
4547
</body>
4648
</html>

app/views/pages/about.html.erb

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,16 @@
6969
).html_safe %></p>
7070
</div>
7171
</div>
72-
</div>
72+
<div class="row">
73+
<div class="col-sm-10 col-sm-offset-1 donate">
74+
<h2><%= t("pages.about.donate-title") %></h2>
75+
<p><%== t(
76+
"pages.about.donate-text",
77+
donate_link: link_to(
78+
t("pages.about.donate_link"),
79+
"https://www.teaming.net/poreldesarrollodelosbancosdetiempo",
80+
)
81+
).html_safe %></p>
82+
</div>
83+
</div>
84+
</div>

config/environments/development.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,6 @@
4141

4242
# Raises error for missing translations
4343
# config.action_view.raise_on_missing_translations = true
44+
45+
config.action_mailer.delivery_method = :letter_opener
4446
end

config/locales/ca.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ ca:
329329
mailers_globals:
330330
footer:
331331
text: "%{organization_name} en"
332+
text_donation: L'associació ADBdT ofereix TimeOverflow de forma gratuïta als Bancs de Temps. Amb una donació de %{href} pots ajudar a mantenir i millorar la plataforma.
333+
text_donation_link: 1€ al mes
332334
offers:
333335
edit:
334336
submit:
@@ -362,6 +364,9 @@ ca:
362364
banner-button: Sol·licita accés
363365
banner-subtitle: Us ajudarem a posar-lo en marxa o fer-vos una demostració
364366
banner-title: Ets un Banc de Temps?
367+
donate-text: Amb la finalitat de donar suport a moltes comunitats la associació ADBdT ofereix la plataforma TimeOverflow a tots los Bancs de Temps. Considera %{donate_link} per contribuir a les despeses de manteniment i innovació.
368+
donate-title: Participa amb una donació
369+
donate_link: donar 1€ al mes
365370
empower-adbdt: ADBdT
366371
empower-adbdt-title: Associació pel Desenvolupament dels Bancs de Temps
367372
empower-coopdevs: CoopDevs

config/locales/en.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ en:
329329
mailers_globals:
330330
footer:
331331
text: "%{organization_name} from"
332+
text_donation: The ADBdT association offers TimeOverflow for free to Time Banks. With a donation of %{href} you can help maintain and improve the platform.
333+
text_donation_link: 1€ a month
332334
offers:
333335
edit:
334336
submit: Change offer
@@ -362,6 +364,9 @@ en:
362364
banner-button: Request access to TimeOverflow
363365
banner-subtitle: We will contact you to start it up or make you a demonstration
364366
banner-title: Are you a Time Bank?
367+
donate-text: In order to support many communities the ADBdT asociation offers TimeOverflow platform to all Time Banks. %{donate_link} to contribute to maintenance and innovation costs.
368+
donate-title: Participate with a donation
369+
donate_link: Donate 1€ a month
365370
empower-adbdt: ADBdT
366371
empower-adbdt-title: Association for the Development of Time Banks
367372
empower-coopdevs: CoopDevs

config/locales/es.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ es:
334334
mailers_globals:
335335
footer:
336336
text: "%{organization_name} en"
337+
text_donation: La asociación ADBdT ofrece TimeOverflow de forma gratuita a los Bancos de Tiempo. Con una donación de %{href} puedes ayudar a mantener y mejorar la plataforma.
338+
text_donation_link: 1€ al mes
337339
offers:
338340
edit:
339341
submit: Cambiar oferta
@@ -367,6 +369,9 @@ es:
367369
banner-button: Solicita acceso
368370
banner-subtitle: Os ayudaremos a ponerlo en marcha o a haceros una demostración
369371
banner-title: "¿Eres un Banco de Tiempo?"
372+
donate-text: Con el fin de apoyar a muchas comunidades la asociación ADBdT ofrece la plataforma TimeOverflow a todos los Bancos de Tiempo. Considera %{donate_link} para contribuir a los gastos de mantenimiento e innovación.
373+
donate-title: Participa con una donación
374+
donate_link: donar 1€ al mes
370375
empower-adbdt: ADBdT
371376
empower-adbdt-title: Asociación para el Desarrollo de los Bancos de Tiempo
372377
empower-coopdevs: CoopDevs

config/locales/pt-BR.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ pt-BR:
334334
mailers_globals:
335335
footer:
336336
text: "%{organization_name} em"
337+
text_donation:
338+
text_donation_link:
337339
offers:
338340
edit:
339341
submit: Trocar oferta
@@ -367,6 +369,9 @@ pt-BR:
367369
banner-button: Pedir acesso
368370
banner-subtitle: Vamos ajudá-los a começar ou obter uma demonstração
369371
banner-title: Você é um Banco de Tempo?
372+
donate-text:
373+
donate-title:
374+
donate_link:
370375
empower-adbdt: ADBdt
371376
empower-adbdt-title: Associação para o Desenvolvimento dos Bancos de Tempo
372377
empower-coopdevs: CoopDevs

0 commit comments

Comments
 (0)