diff --git a/app/assets/images/ajuntament_bcn_activa.png b/app/assets/images/ajuntament_bcn_activa.png new file mode 100644 index 000000000..f89a56374 Binary files /dev/null and b/app/assets/images/ajuntament_bcn_activa.png differ diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb index 47f377e1b..485384b50 100644 --- a/app/views/pages/about.html.erb +++ b/app/views/pages/about.html.erb @@ -1,7 +1,7 @@
-

<%== t("pages.about.title") %><%== t("pages.about.title2") %>

+

<%= t("pages.about.title") %><%= t("pages.about.title2") %>

<%= t("pages.about.subtitle") %>

@@ -38,7 +38,7 @@

<%= t("pages.about.empower-title") %>

-

<%== t( +

<%= t( "pages.about.empower-text-1", showmap_link: link_to( t("pages.about.empower-showmap"), @@ -46,7 +46,7 @@ { title: t("pages.about.empower-showmap-title") } ) ).html_safe %>

-

<%== t( +

<%= t( "pages.about.empower-text-2", coopdevs_link: link_to( t("pages.about.empower-coopdevs"), @@ -59,7 +59,7 @@ { title: t("pages.about.empower-adbdt-title") } ) ).html_safe %>

-

<%== t( +

<%= t( "pages.about.empower-text-3", github_link: link_to( t("pages.about.empower-github"), @@ -72,13 +72,31 @@

+
+ +
+ +
diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 4bd213cec..d7bbf16f0 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -377,7 +377,7 @@ ca: banner-title: Ets un Banc de Temps? 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ó. donate-title: Participa amb una donació - donate_link: donar 1€ al mes + donate-link: donar 1€ al mes empower-adbdt: ADBdT empower-adbdt-title: Associació pel Desenvolupament dels Bancs de Temps empower-coopdevs: CoopDevs diff --git a/config/locales/en.yml b/config/locales/en.yml index dfc6deb0e..e0f407d89 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -378,7 +378,7 @@ en: banner-title: Are you a Time Bank? 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. donate-title: Participate with a donation - donate_link: Donate 1€ a month + donate-link: Donate 1€ a month empower-adbdt: ADBdT empower-adbdt-title: Association for the Development of Time Banks empower-coopdevs: CoopDevs @@ -402,6 +402,9 @@ en: subtitle: TimeOverflow is open source, free and collaborative title: The software designed by and for title2: Time Banks + app-mobile: Mobile App + app-mobile-text: The mobile app TimeOverflow for Android and iOS is available for download.
This app has been possible thanks to the collaboration of the municipality of Barcelona, program %{impulsem_link} (Barcelona Activa) 2017-2018 + impulsem-link: "Impulsem el que fas" posts: show: info: "%{type} of %{organization} to see person's details you have to" diff --git a/config/locales/es.yml b/config/locales/es.yml index 6518697bc..5f0fda2b1 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -378,7 +378,7 @@ es: banner-title: "¿Eres un Banco de Tiempo?" 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. donate-title: Participa con una donación - donate_link: donar 1€ al mes + donate-link: donar 1€ al mes empower-adbdt: ADBdT empower-adbdt-title: Asociación para el Desarrollo de los Bancos de Tiempo empower-coopdevs: CoopDevs diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 456ca464e..3ff30e631 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -383,7 +383,7 @@ eu: banner-title: Denbora banku bat al zara? donate-text: komunitate askori babesteko asmotan ADBdt elkarteak , TimeOverflow plataforma eskaintzen die Denbora Banku guztiei. Hausnar ezazu %{donate_link} mantenu eta berritze lanetan laguntzeko. donate-title: Laguntzan parte hartu - donate_link: Hilean €1 ematea + donate-link: Hilean €1 ematea empower-adbdt: ADBdt empower-adbdt-title: Denbora Bankuen garapenerako elkartea empower-coopdevs: CoopDevs diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 110bc745c..70ff3266d 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -377,7 +377,7 @@ pt-BR: banner-title: Você é um Banco de Tempo? donate-text: donate-title: - donate_link: + donate-link: empower-adbdt: ADBdt empower-adbdt-title: Associação para o Desenvolvimento dos Bancos de Tempo empower-coopdevs: CoopDevs