consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes conflicts with master

Browse Source
This commit is contained in:
rgarcia
2017-01-05 01:56:35 +01:00
parent 517483f244 6e5492de22
commit dde1d34172
13 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/verification/letter/new.html.erb
View File

@@ -50,7 +50,7 @@
<ul>
<li>
<%= t("verification.letter.new.office",
office: link_to(t("verification.letter.new.offices"), t("verification.letter.new.offices_url"),
office: link_to(t("verification.letter.new.offices"), setting['verification_offices_url'],
target: "blank")).html_safe %>
</li>
<li>

2
app/views/verification/letter/show.html.erb
View File

@@ -12,7 +12,7 @@
<div data-alert class="callout success">
<%= t("verification.letter.create.flash.success_html",
offices: link_to(t("verification.letter.create.flash.offices"),
t("verification.letter.create.flash.offices_url"),
setting['verification_offices_url'],
title: t('shared.target_blank_html'),
target: "_blank")).html_safe
%>

2
app/views/verification/residence/_errors.html.erb
View File

@@ -6,7 +6,7 @@
</button>
<%= t("verification.residence.new.error_verifying_census",
offices: link_to( t("verification.residence.new.error_verifying_census_offices"),
t("verification.residence.new.error_verifying_census_offices_url"), title: t('shared.target_blank_html'), target: "_blank")).html_safe %>
setting['verification_offices_url'], title: t('shared.target_blank_html'), target: "_blank")).html_safe %>
</div>
<% else %>

2
config/initializers/devise.rb
View File

@@ -13,7 +13,7 @@ Devise.setup do |config|
# note that it will be overwritten if you use your own mailer class
# with default "from" parameter.
if Rails.env.test? || !ActiveRecord::Base.connection.table_exists?('settings')
config.mailer_sender = "noreply@example.org"
config.mailer_sender = "noreply@consul.dev"
else
config.mailer_sender = "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>"
end

2
config/locales/fr.yml
View File

@@ -1497,7 +1497,6 @@ fr:
create:
flash:
offices: Bureaux de soutien aux citoyens
offices_url: http://offices.consul
success_html: Merci d'avoir demandé votre <b>code de sécurité maximum (uniquement
requis pour le vote final)</b>. Dans quelques jours, nous vous enverrons
un courrier vers votre adresse postale. Vous pouvez le réclamer dans n'importe
@@ -1512,7 +1511,6 @@ fr:
go_to_index: Voir les propositions
office: Vérifier dans n'importe quel %{office}
offices: Bureaux de soutien aux citoyens
offices_url: http://offices.consul
send_letter: Envoyer une lettre avec le code
title: Félicitations
user_permission_info: Avec votre compte, vous pouvez

2
config/locales/pt-BR.yml
View File

@@ -1518,7 +1518,6 @@ pt-BR:
create:
flash:
offices: Escritórios de Apoio ao Cidadão
offices_url: http://offices.consul
success_html: Obrigado por solicitar seu <b>código de segurança máxima (somente
solicitado em votações finais)</b>. Em poucos dias nós lhe enviaremos
para seu endereço relacionado nos dados que temos em arquivo. Por favor
@@ -1534,7 +1533,6 @@ pt-BR:
go_to_index: Ver propostas
office: Verificar em qualquer %{office}
offices: Escritórios de Apoio ao Cidadão
offices_url: http://offices.consul
send_letter: Envie-me uma carta com o código
title: Parabéns!
user_permission_info: Com a sua conta você pode...

3
config/locales/settings.en.yml
View File

@@ -35,4 +35,5 @@ en:
mailer_from_name: Origin email name
mailer_from_address: Origin email address
meta_description: "Site description (SEO)"
meta_keywords: "Keywords (SEO)"
meta_keywords: "Keywords (SEO)"
verification_offices_url: Verification offices URL

3
config/locales/settings.es.yml
View File

@@ -35,4 +35,5 @@ es:
mailer_from_name: Nombre email remitente
mailer_from_address: Dirección email remitente
meta_description: "Descripción del sitio (SEO)"
meta_keywords: "Palabras clave (SEO)"
meta_keywords: "Palabras clave (SEO)"
verification_offices_url: URL oficinas verificación

3
config/locales/verification.en.yml
View File

@@ -21,7 +21,6 @@ en:
create:
flash:
offices: Citizen Support Offices
offices_url: http://offices.consul
success_html: Thank you for requesting your <b>maximum security code (only required for the final votes)</b>. In a few days we will send it to the address featuring in the data we have on file. Please remember that, if you prefer, you can collect your code from any of the %{offices}.
edit:
see_all: See proposals
@@ -33,7 +32,6 @@ en:
go_to_index: See proposals
office: Verify in any %{office}
offices: Citizen Support Offices
offices_url: http://offices.consul
send_letter: Send me a letter with the code
title: Congratulations!
user_permission_info: With your account you can...
@@ -65,7 +63,6 @@ en:
error_not_allowed_postal_code: In order to be verified, you must be registered.
error_verifying_census: The Census was unable to verify your information. Please confirm that your census details are correct by calling to City Council or visit one %{offices}.
error_verifying_census_offices: Citizen Support Office
error_verifying_census_offices_url: http://offices.consul
form_errors: prevented the verification of your residence
postal_code: Postcode
postal_code_note: To verify your account you must be registered

3
config/locales/verification.es.yml
View File

@@ -21,7 +21,6 @@ es:
create:
flash:
offices: Oficinas de Atención al Ciudadano
offices_url: http://offices.consul
success_html: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.<br> Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}.
edit:
see_all: Ver propuestas
@@ -33,7 +32,6 @@ es:
go_to_index: Ver propuestas
office: Verificarte presencialmente en cualquier %{office}
offices: Oficina de Atención al Ciudadano
offices_url: http://offices.consul
send_letter: Solicitar una carta por correo postal
title: "¡Felicidades!"
user_permission_info: Con tu cuenta ya puedes...
@@ -65,7 +63,6 @@ es:
error_not_allowed_postal_code: Para verificarte debes estar empadronado.
error_verifying_census: El Padrón no pudo verificar tu información. Por favor, confirma que tus datos de empadronamiento sean correctos llamando al Ayuntamiento o visitando una %{offices}.
error_verifying_census_offices: oficina de Atención al ciudadano
error_verifying_census_offices_url: http://offices.consul
form_errors: evitaron verificar tu residencia
postal_code: Código postal
postal_code_note: Para verificar tus datos debes estar empadronado

1
db/dev_seeds.rb
View File

@@ -38,6 +38,7 @@ Setting.create(key: 'mailer_from_name', value: 'Consul')
Setting.create(key: 'mailer_from_address', value: 'noreply@consul.dev')
Setting.create(key: 'meta_description', value: 'Citizen Participation and Open Government Application')
Setting.create(key: 'meta_keywords', value: 'citizen participation, open government')
Setting.create(key: 'verification_offices_url', value: 'http://oficinas-atencion-ciudadano.url/')
puts "Creating Geozones"
('A'..'Z').each { |i| Geozone.create(name: "District #{i}", external_code: i.ord, census_code: i.ord) }

3
db/seeds.rb
View File

@@ -91,3 +91,6 @@ Setting['direct_message_max_per_day'] = 3
# Email settings
Setting['mailer_from_name'] = 'Consul'
Setting['mailer_from_address'] = 'noreply@consul.dev'
# Verification settings
Setting['verification_offices_url'] = 'http://oficinas-atencion-ciudadano.url/'

1
spec/features/verification/letter_spec.rb
View File

@@ -20,6 +20,7 @@ feature 'Verify Letter' do
end
scenario 'Go to office instead of send letter' do
Setting["verification_offices_url"] = "http://offices.consul"
user = create(:user, residence_verified_at: Time.current,
confirmed_phone: "611111111")