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

Merge branch 'master' into api-dev-0.18.11

Browse Source
This commit is contained in:
Alberto Miedes Garcés
2017-01-04 16:21:32 +01:00
parent b36deb0382 6e5492de22
commit 6445fffc0d
63 changed files with 964 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/deploy.rb
View File

@@ -30,6 +30,7 @@ set :keep_releases, 5
set :local_user, ENV['USER']
set :delayed_job_workers, 2
set :delayed_job_roles, :background
set(:config_files, %w(
log_rotation

2
config/deploy/preproduction.rb
View File

@@ -6,5 +6,5 @@ set :ssh_options, port: deploysecret(:ssh_port)
set :stage, :preproduction
set :rails_env, :preproduction
server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron)
server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer cron background)
server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer)

2
config/deploy/production.rb
View File

@@ -7,6 +7,6 @@ set :stage, :production
set :rails_env, :production
#server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer)
server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron)
server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer cron background)
server deploysecret(:server3), user: deploysecret(:user), roles: %w(web app db importer)
server deploysecret(:server4), user: deploysecret(:user), roles: %w(web app db importer)

2
config/i18n-tasks.yml
View File

@@ -95,6 +95,8 @@ search:
# - '{devise,simple_form}.*'
ignore_missing:
- 'unauthorized.*'
- 'activerecord.models.proposal'
- 'activerecord.models.spending_proposal'
- 'activerecord.errors.models.proposal_notification.*'
- 'activerecord.errors.models.direct_message.*'
- 'errors.messages.blank'

2
config/initializers/delayed_job_config.rb
View File

@@ -6,7 +6,7 @@ end
Delayed::Worker.destroy_failed_jobs = false
Delayed::Worker.sleep_delay = 2
Delayed::Worker.max_attempts = 3
Delayed::Worker.max_run_time = 30.seconds
Delayed::Worker.max_run_time = 30.minutes
Delayed::Worker.read_ahead = 10
Delayed::Worker.default_queue_name = 'default'
Delayed::Worker.raise_signal_exceptions = :term

4
config/initializers/devise.rb
View File

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

3
config/initializers/vote_extensions.rb
View File

@@ -1,4 +1,6 @@
ActsAsVotable::Vote.class_eval do
belongs_to :signature
def self.for_debates(debates)
where(votable_type: 'Debate', votable_id: debates)
end
@@ -14,4 +16,5 @@ ActsAsVotable::Vote.class_eval do
def value
vote_flag
end
end

11
config/locales/activerecord.en.yml
View File

@@ -69,6 +69,10 @@ en:
external_url: "Link to additional documentation"
geozone_id: "Scope of operation"
title: "Title"
signature_sheet:
signable_type: "Signable type"
signable_id: "Signable ID"
document_numbers: "Documents numbers"
errors:
models:
user:
@@ -90,4 +94,9 @@ en:
proposal_notification:
attributes:
minimum_interval:
invalid: "You have to wait a minium of %{interval} days between notifications"
invalid: "You have to wait a minium of %{interval} days between notifications"
signature:
attributes:
document_number:
not_in_census: 'Not verified by Census'
already_voted: 'Already voted this proposal'

11
config/locales/activerecord.es.yml
View File

@@ -69,6 +69,10 @@ es:
external_url: "Enlace a documentación adicional"
geozone_id: "Ámbito de actuación"
title: "Título"
signature_sheet:
signable_type: "Tipo de hoja de firmas"
signable_id: "ID Propuesta ciudadana/Propuesta inversión"
document_numbers: "Números de documentos"
errors:
models:
user:
@@ -90,4 +94,9 @@ es:
proposal_notification:
attributes:
minimum_interval:
invalid: "Debes esperar un mínimo de %{interval} días entre notificaciones"
invalid: "Debes esperar un mínimo de %{interval} días entre notificaciones"
signature:
attributes:
document_number:
not_in_census: 'No verificado por Padrón'
already_voted: 'Ya ha votado esta propuesta'

26
config/locales/admin.en.yml
View File

@@ -111,6 +111,7 @@ en:
settings: Configuration settings
spending_proposals: Spending proposals
stats: Statistics
signature_sheets: Signature Sheets
moderators:
index:
title: Moderators
@@ -295,6 +296,31 @@ en:
delete:
success: Geozone successfully deleted
error: This geozone can't be deleted since there are elements attached to it
signature_sheets:
author: Author
created_at: Creation date
name: Name
no_signature_sheets: "There are not signature_sheets"
index:
title: Signature sheets
new: New signature sheets
new:
title: New signature sheets
document_numbers_note: "Write the numbers separated by commas (,)"
submit: Create signature sheet
show:
created_at: Created
author: Author
documents: Documents
document_count: "Number of documents:"
verified:
one: "There is %{count} valid signature"
other: "There are %{count} valid signatures"
unverified:
one: "There is %{count} invalid signature"
other: "There are %{count} invalid signatures"
unverified_error: (Not verified by Census)
loading: "There are still signatures that are being verified by the Census, please refresh the page in a few moments"
stats:
show:
stats_title: Stats

26
config/locales/admin.es.yml
View File

@@ -109,6 +109,7 @@ es:
settings: Configuración global
spending_proposals: Propuestas de inversión
stats: Estadísticas
signature_sheets: Hojas de firmas
moderators:
index:
title: Moderadores
@@ -293,6 +294,31 @@ es:
delete:
success: Distrito borrado correctamente
error: No se puede borrar el distrito porque ya tiene elementos asociados
signature_sheets:
author: Autor
created_at: Fecha de creación
name: Nombre
no_signature_sheets: "No existen hojas de firmas"
index:
title: Hojas de firmas
new: Nueva hoja de firmas
new:
title: Nueva hoja de firmas
document_numbers_note: "Introduce los números separados por comas (,)"
submit: Crear hoja de firmas
show:
created_at: Creado
author: Autor
documents: Documentos
document_count: "Número de documentos:"
verified:
one: "Hay %{count} firma válida"
other: "Hay %{count} firmas válidas"
unverified:
one: "Hay %{count} firma inválida"
other: "Hay %{count} firmas inválidas"
unverified_error: (No verificadas por el Padrón)
loading: "Aún hay firmas que se están verificando por el Padrón, por favor refresca la página en unos instantes"
stats:
show:
stats_title: Estadísticas

1
config/locales/en.yml
View File

@@ -154,6 +154,7 @@ en:
spending_proposal: Spending proposal
user: Account
verification/sms: phone
signature_sheet: Signature sheet
geozones:
none: All city
all: All scopes

1
config/locales/es.yml
View File

@@ -154,6 +154,7 @@ es:
spending_proposal: la propuesta de gasto
user: la cuenta
verification/sms: el teléfono
signature_sheet: la hoja de firmas
geozones:
none: Toda la ciudad
all: Todos los ámbitos

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...

2
config/locales/responders.en.yml
View File

@@ -9,7 +9,7 @@ en:
proposal: "Proposal created successfully."
proposal_notification: "Your message has been sent correctly."
spending_proposal: "Spending proposal created successfully. You can access it from %{activity}"
signature_sheet: "Signature sheet created successfully"
save_changes:
notice: Changes saved
update:

1
config/locales/responders.es.yml
View File

@@ -9,6 +9,7 @@ es:
proposal: "Propuesta creada correctamente."
proposal_notification: "Tu message ha sido enviado correctamente."
spending_proposal: "Propuesta de inversión creada correctamente. Puedes acceder a ella desde %{activity}"
signature_sheet: "Hoja de firmas creada correctamente"
save_changes:
notice: Cambios guardados
update:

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

@@ -27,8 +27,12 @@ en:
facebook_login: Facebook login
google_login: Google login
debates: Debates
signature_sheets: Signature sheets
spending_proposals: Investment projects
spending_proposal_features:
voting_allowed: Voting on investment projects
mailer_from_name: Origin email name
mailer_from_address: Origin email address
meta_description: "Site description (SEO)"
meta_keywords: "Keywords (SEO)"
verification_offices_url: Verification offices URL

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

@@ -27,8 +27,12 @@ es:
facebook_login: Registro con Facebook
google_login: Registro con Google
debates: Debates
signature_sheets: Hojas de firmas
spending_proposals: Propuestas de inversión
spending_proposal_features:
voting_allowed: Votaciones sobre propuestas de inversión.
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)"
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

2
config/routes.rb
View File

@@ -149,6 +149,8 @@ Rails.application.routes.draw do
get :summary, on: :collection
end
resources :signature_sheets, only: [:index, :new, :create, :show]
resources :banners, only: [:index, :new, :create, :edit, :update, :destroy] do
collection { get :search}
end