Updates i18n keys and images folder

This commit is contained in:
decabeza
2018-01-30 19:10:48 +01:00
parent fc89c899cc
commit 42d0f471ee
24 changed files with 66 additions and 66 deletions

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 284 KiB

After

Width:  |  Height:  |  Size: 284 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -1,28 +1,28 @@
<div class="row section-content">
<div class="small-12 column">
<h3 id="budgets" data-magellan-target="budgets">
<%= t("pages.more_info.budgets.title") %>
<%= t("pages.help.budgets.title") %>
</h3>
<p>
<%= t("pages.more_info.budgets.description",
link: link_to(t("pages.more_info.budgets.link"), budgets_path)).html_safe %>
<%= t("pages.help.budgets.description",
link: link_to(t("pages.help.budgets.link"), budgets_path)).html_safe %>
</p>
<ul class="features">
<li>
<%= t("pages.more_info.budgets.feature") %>
<%= t("pages.help.budgets.feature") %>
</li>
<li><%= t("pages.more_info.budgets.phase_1_html",
<li><%= t("pages.help.budgets.phase_1_html",
org: setting['org_name']).html_safe %></li>
<li><%= t("pages.more_info.budgets.phase_2_html") %></li>
<li><%= t("pages.more_info.budgets.phase_3_html") %></li>
<li><%= t("pages.more_info.budgets.phase_4_html") %></li>
<li><%= t("pages.help.budgets.phase_2_html") %></li>
<li><%= t("pages.help.budgets.phase_3_html") %></li>
<li><%= t("pages.help.budgets.phase_4_html") %></li>
</ul>
<p><%= t("pages.more_info.budgets.phase_5_html") %></p>
<p><%= t("pages.help.budgets.phase_5_html") %></p>
<figure>
<%= image_tag "more_info/budgets_#{I18n.locale}.png", alt: t("pages.more_info.budgets.image_alt") %>
<figcaption><%= t("pages.more_info.budgets.figcaption_html") %></figcaption>
<%= image_tag "help/budgets_#{I18n.locale}.png", alt: t("pages.help.budgets.image_alt") %>
<figcaption><%= t("pages.help.budgets.figcaption_html") %></figcaption>
</figure>
</div>
</div>

View File

@@ -1,25 +1,25 @@
<div class="row section-content">
<div class="small-12 column">
<h3 id="debates" data-magellan-target="debates">
<%= t("pages.more_info.debates.title") %>
<%= t("pages.help.debates.title") %>
</h3>
<p>
<%= t("pages.more_info.debates.description",
<%= t("pages.help.debates.description",
org: setting['org_name'],
link: link_to(t("pages.more_info.debates.link"),
link: link_to(t("pages.help.debates.link"),
debates_path)).html_safe %>
</p>
<ul class="features">
<li>
<%= t("pages.more_info.debates.feature_html",
link: link_to(t("pages.more_info.debates.feature_link", org: setting['org_name']),
<%= t("pages.help.debates.feature_html",
link: link_to(t("pages.help.debates.feature_link", org: setting['org_name']),
new_user_registration_path)).html_safe %>
</li>
</ul>
<figure>
<%= image_tag "more_info/debates.png", alt: t("pages.more_info.debates.image_alt") %>
<figcaption><%= t("pages.more_info.debates.figcaption") %></figcaption>
<%= image_tag "help/debates.png", alt: t("pages.help.debates.image_alt") %>
<figcaption><%= t("pages.help.debates.figcaption") %></figcaption>
</figure>
</div>
</div>

View File

@@ -3,21 +3,21 @@
<ul class="menu-pages" data-magellan>
<% if feature?(:debates) %>
<li>
<%= link_to t("pages.more_info.menu.debates"), "#debates", class: "button hollow expanded" %>
<%= link_to t("pages.help.menu.debates"), "#debates", class: "button hollow expanded" %>
</li>
<% end %>
<% if feature?(:proposals) %>
<li>
<%= link_to t("pages.more_info.menu.proposals"), "#proposals", class: "button hollow expanded" %>
<%= link_to t("pages.help.menu.proposals"), "#proposals", class: "button hollow expanded" %>
</li>
<% end %>
<% if feature?(:budgets) %>
<li>
<%= link_to t("pages.more_info.menu.budgets"), "#budgets", class: "button hollow expanded" %>
<%= link_to t("pages.help.menu.budgets"), "#budgets", class: "button hollow expanded" %>
</li>
<% end %>
<li>
<%= link_to t("pages.more_info.menu.other"), "#other", class: "button hollow expanded" %>
<%= link_to t("pages.help.menu.other"), "#other", class: "button hollow expanded" %>
</li>
</ul>
</div>

View File

@@ -1,7 +1,7 @@
<h3 id="other" data-magellan-target="other"><%= t("pages.more_info.other.title") %></h3>
<h3 id="other" data-magellan-target="other"><%= t("pages.help.other.title") %></h3>
<ul class="features">
<li><%= link_to t("pages.more_info.other.how_to_use", org_name: setting['org_name']), how_to_use_path %></li>
<li><%= link_to t("pages.help.other.how_to_use", org_name: setting['org_name']), how_to_use_path %></li>
<% SiteCustomization::Page.with_more_info_flag.with_same_locale.each do |custom_page| %>
<li><%= link_to custom_page.title, page_path(custom_page.slug) %></li>

View File

@@ -1,18 +1,18 @@
<div class="row section-content">
<div class="small-12 column">
<h3 id="polls" data-magellan-target="polls"><%= t("pages.more_info.polls.title") %></h3>
<h3 id="polls" data-magellan-target="polls"><%= t("pages.help.polls.title") %></h3>
<p>
<%= t("pages.more_info.polls.description",
link: link_to(t("pages.more_info.polls.link"), polls_path)).html_safe %>
<%= t("pages.help.polls.description",
link: link_to(t("pages.help.polls.link"), polls_path)).html_safe %>
</p>
<ul class="features">
<li>
<%= t("pages.more_info.polls.feature_1",
link: link_to(t("pages.more_info.polls.feature_1_link", org_name: setting['org_name']),
<%= t("pages.help.polls.feature_1",
link: link_to(t("pages.help.polls.feature_1_link", org_name: setting['org_name']),
new_user_registration_path)).html_safe %>
</li>
<li><%= t("pages.more_info.polls.feature_2") %></li>
<li><%= t("pages.more_info.polls.feature_3") %></li>
<li><%= t("pages.help.polls.feature_2") %></li>
<li><%= t("pages.help.polls.feature_3") %></li>
</ul>
</div>
</div>

View File

@@ -1,23 +1,23 @@
<div class="row section-content">
<div class="small-12 column">
<h3 id="proposals" data-magellan-target="proposals">
<%= t("pages.more_info.proposals.title") %>
<%= t("pages.help.proposals.title") %>
</h3>
<p>
<%= t("pages.more_info.proposals.description",
link: link_to(t("pages.more_info.proposals.link"), proposals_path)).html_safe %>
<%= t("pages.help.proposals.description",
link: link_to(t("pages.help.proposals.link"), proposals_path)).html_safe %>
</p>
<ul class="features">
<li>
<%= t("pages.more_info.proposals.feature_html",
<%= t("pages.help.proposals.feature_html",
org: setting['org_name'],
supports: setting['votes_for_proposal_success']).html_safe %>
</li>
</ul>
<figure>
<%= image_tag "more_info/proposals_#{I18n.locale}.png", alt: t("pages.more_info.proposals.image_alt") %>
<figcaption><%= t("pages.more_info.proposals.figcaption_html") %></figcaption>
<%= image_tag "help/proposals_#{I18n.locale}.png", alt: t("pages.help.proposals.image_alt") %>
<figcaption><%= t("pages.help.proposals.figcaption_html") %></figcaption>
</figure>
</div>
</div>

View File

@@ -1,5 +1,5 @@
<div class="sidebar-card">
<h3><%= t("pages.more_info.faq.title") %></h3>
<p><%= t("pages.more_info.faq.description") %></p>
<%= link_to t("pages.more_info.faq.button"), faq_path, class: "button expanded" %>
<h3><%= t("pages.help.faq.title") %></h3>
<p><%= t("pages.help.faq.description") %></p>
<%= link_to t("pages.help.faq.button"), faq_path, class: "button expanded" %>
</div>

View File

@@ -7,15 +7,15 @@
<%= back_link_to %>
<ul class="menu vertical margin-top">
<li><a href="#1"><strong><%= t("pages.more_info.faq.page.faq_1_title") %></strong></a></li>
<li><a href="#1"><strong><%= t("pages.help.faq.page.faq_1_title") %></strong></a></li>
</ul>
</div>
<div class="text small-12 medium-9 column">
<h1 class="clear"><%= t("pages.more_info.faq.page.title") %></h1>
<p><%= t("pages.more_info.faq.page.description") %></p>
<h1 class="clear"><%= t("pages.help.faq.page.title") %></h1>
<p><%= t("pages.help.faq.page.description") %></p>
<h2 id="1"><%= t("pages.more_info.faq.page.faq_1_title") %></h2>
<p><%= t("pages.more_info.faq.page.faq_1_description") %></p>
<h2 id="1"><%= t("pages.help.faq.page.faq_1_title") %></h2>
<p><%= t("pages.help.faq.page.faq_1_description") %></p>
</div>
</div>

View File

@@ -6,8 +6,8 @@
<div class="text small-12 column">
<%= back_link_to %>
<h1><%= t('pages.more_info.titles.how_to_use') %></h1>
<h1><%= t('pages.help.titles.how_to_use') %></h1>
<%= markdown t('pages.more_info.how_to_use.text') %>
<%= markdown t('pages.help.how_to_use.text') %>
</div>
</div>

View File

@@ -1,48 +1,48 @@
<% provide :title do %><%= t("pages.titles.more_info", org: setting['org_name']) %><% end %>
<% provide :title do %><%= t("pages.titles.help", org: setting['org_name']) %><% end %>
<% content_for :canonical do %>
<%= render "shared/canonical", href: more_info_url %>
<%= render "shared/canonical", href: help_url %>
<% end %>
<div class="jumbo light">
<div class="row">
<div class="small-12 medium-9 column">
<h2><%= t("pages.more_info.title", org: setting['org_name']) %></h2>
<p><%= t("pages.more_info.subtitle", org: setting['org_name']) %></p>
<p><%= t("pages.more_info.guide", org: setting['org_name']) %></p>
<h2><%= t("pages.help.title", org: setting['org_name']) %></h2>
<p><%= t("pages.help.subtitle", org: setting['org_name']) %></p>
<p><%= t("pages.help.guide", org: setting['org_name']) %></p>
</div>
</div>
<%= render "pages/more_info/menu" %>
<%= render "pages/help/menu" %>
</div>
<div id="more-info" class="more-info-content">
<div class="row">
<div class="small-12 medium-7 large-8 column">
<% if feature?(:debates) %>
<%= render "pages/more_info/debates" %>
<%= render "pages/help/debates" %>
<% end %>
<% if feature?(:proposals) %>
<%= render "pages/more_info/proposals" %>
<%= render "pages/help/proposals" %>
<% end %>
<% if feature?(:budgets) %>
<%= render "pages/more_info/budgets" %>
<%= render "pages/help/budgets" %>
<% end %>
<% if feature?(:polls) %>
<%= render "pages/more_info/polls" %>
<%= render "pages/help/polls" %>
<% end %>
</div>
<div class="small-12 medium-4 large-3 column more-info-sidebar">
<%= render "pages/more_info/sidebar" %>
<%= render "pages/help/sidebar" %>
</div>
</div>
<div class="row">
<hr>
<div class="small-12 column">
<%= render "pages/more_info/other" %>
<%= render "pages/help/other" %>
</div>
</div>
</div>

View File

@@ -3,7 +3,7 @@ en:
census_terms: To confirm the account, you must be 16 or older and be registered, having provided the information requested previously, will verify. By accepting the verification process, you also consent to the verification of this information, as well as the contact methods featuring in said files. The data provided will be acquired and processed in a file mentioned previously in the terms and conditions of use for the Portal.
conditions: Terms and conditions of use
general_terms: Terms and Conditions
more_info:
help:
title: "%{org} is a platform for citizen participation"
subtitle: "In %{org} you can make proposals, vote in citizen consultations, propose participatory budget projects, decide on municipal regulations and open debates to exchange opinions with others."
guide: "This guide explains what each of the %{org} sections are for and how they work."
@@ -72,7 +72,7 @@ en:
titles:
accessibility: Accessibility
conditions: Terms of use
more_info: "What is %{org}? - Citizen participation"
help: "What is %{org}? - Citizen participation"
privacy: Privacy Policy
verify:
code: Code you received in letter

View File

@@ -3,7 +3,7 @@ es:
census_terms: Para verificar la cuenta hay que tener 16 años o más y estar empadronado aportando los datos indicados anteriormente, los cuales serán contrastados. Aceptando el proceso de verificación acepta dar su consentimiento para contrastar dicha información, así como medios de contacto que figuren en dichos ficheros. Los datos aportados serán incorporados y tratados en un fichero indicado anteriormente en las condiciones de uso del portal.
conditions: Condiciones de uso
general_terms: Términos y Condiciones
more_info:
help:
title: "%{org} es una plataforma de participación ciudadana"
subtitle: "En %{org} se pueden hacer propuestas, votar en consultas ciudadanas, plantear proyectos de presupuestos participativos, decidir la normativa municipal y abrir debates para intercambiar opiniones con otras personas."
guide: 'Esta guía explica para qué sirven y cómo funcionan cada una de las secciones de %{org}.'
@@ -72,7 +72,7 @@ es:
titles:
accessibility: Accesibilidad
conditions: Condiciones de uso
more_info: "¿Qué es %{org}? - Participación ciudadana"
help: "¿Qué es %{org}? - Participación ciudadana"
privacy: Política de Privacidad
verify:
code: Código que has recibido en tu carta

View File

@@ -32,17 +32,17 @@ describe PagesController do
describe 'More info pages' do
it 'includes a more info page' do
get :show, id: 'more_info/index'
get :show, id: 'help/index'
expect(response).to be_ok
end
it 'includes a how_to_use page' do
get :show, id: 'more_info/how_to_use/index'
get :show, id: 'help/how_to_use/index'
expect(response).to be_ok
end
it 'includes a faq page' do
get :show, id: 'more_info/faq/index'
get :show, id: 'help/faq/index'
expect(response).to be_ok
end
end