diff --git a/config/environments/test.rb b/config/environments/test.rb index 4912a6cc2..29682e8e1 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -38,7 +38,7 @@ Rails.application.configure do config.action_mailer.default_url_options = { host: 'test' } - config.action_mailer.asset_host = 'http://madrid.test' + config.action_mailer.asset_host = 'http://consul.test' # Randomize the order test cases are executed. config.active_support.test_order = :random diff --git a/config/locales/en.yml b/config/locales/en.yml index adc9b275a..05153d714 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -182,14 +182,14 @@ en: privacy: Privacy Policy transparency_text: Find out anything about the city. transparency_title: Transparency - transparency_url: https://yourtransparencysite.com + transparency_url: https://transparency.consul header: administration: Administration debates: Debates external_link_blog: Blog external_link_opendata: Open data external_link_transparency: Transparency - external_link_transparency_url: https://yourtransparencysite.com + external_link_transparency_url: https://transparency.consul locale: 'Language:' logo: Consul management: Management diff --git a/config/locales/es.yml b/config/locales/es.yml index 9a586e96a..9391da3bf 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -182,14 +182,14 @@ es: privacy: Política de privacidad transparency_text: Obtén cualquier información sobre la ciudad. transparency_title: Transparencia - transparency_url: https://yourtransparencysite.com + transparency_url: https://transparency.consul header: administration: Administrar debates: Debates external_link_blog: Blog external_link_opendata: Datos abiertos external_link_transparency: Transparencia - external_link_transparency_url: https://yourtransparencysite.com + external_link_transparency_url: https://transparency.consul locale: 'Idioma:' logo: Consul management: Gestión diff --git a/config/locales/management.en.yml b/config/locales/management.en.yml index 8833eac0f..fa02e5bc3 100644 --- a/config/locales/management.en.yml +++ b/config/locales/management.en.yml @@ -59,10 +59,10 @@ en: support_proposals: Support proposals vote_proposals: Vote proposals print: - proposals_info: Create yor proposal on http://hereyoursite.com + proposals_info: Create yor proposal on http://url.consul proposals_note: The proposals more supported will be voted. If are accepted by a majority, the city Council shall be carried out. proposals_title: 'Proposals:' - spending_proposals_info: Participate at http://hereyoursite.com + spending_proposals_info: Participate at http://url.consul spending_proposals_note: Participatory budget will be assigned to the most votes spending proposals. print_info: Print this info proposals: diff --git a/config/locales/management.es.yml b/config/locales/management.es.yml index e9c39d406..fe3d08697 100644 --- a/config/locales/management.es.yml +++ b/config/locales/management.es.yml @@ -59,10 +59,10 @@ es: support_proposals: Apoyar propuestas vote_proposals: Participar en las votaciones finales print: - proposals_info: Haz tu propuesta en http://hereyoursite.com + proposals_info: Haz tu propuesta en http://url.consul proposals_note: Las propuestas más apoyadas serán llevadas a votación. Y si las acepta una mayoría, el Ayuntamiento las llevará a cabo. proposals_title: 'Propuestas:' - spending_proposals_info: Participa en http://hereyoursite.com + spending_proposals_info: Participa en http://url.consul spending_proposals_note: Los presupuestos participativos se invertirán en las propuestas de inversión más apoyadas. print_info: Imprimir esta información proposals: diff --git a/config/locales/verification.en.yml b/config/locales/verification.en.yml index 6474ac20d..e47e5a6b3 100755 --- a/config/locales/verification.en.yml +++ b/config/locales/verification.en.yml @@ -21,7 +21,7 @@ en: create: flash: offices: Citizen Support Offices - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul success_html: Thank you for requesting your maximum security code (only required for the final votes). 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 +33,7 @@ en: go_to_index: See proposals office: Verify in any %{office} offices: Citizen Support Offices - offices_url: http://yourcitizensupportofficesite.com + 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,6 +65,7 @@ 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 diff --git a/config/locales/verification.es.yml b/config/locales/verification.es.yml index e6d0ffa0d..a8e41ea09 100644 --- a/config/locales/verification.es.yml +++ b/config/locales/verification.es.yml @@ -21,7 +21,7 @@ es: create: flash: offices: Oficinas de Atención al Ciudadano - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul success_html: Antes de las votaciones recibirás una carta con las instrucciones para verificar tu cuenta.
Recuerda que puedes ahorrar el envío verificándote presencialmente en cualquiera de las %{offices}. edit: see_all: Ver propuestas @@ -33,7 +33,7 @@ es: go_to_index: Ver propuestas office: Verificarte presencialmente en cualquier %{office} offices: Oficina de Atención al Ciudadano - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul send_letter: Solicitar una carta por correo postal title: "¡Felicidades!" user_permission_info: Con tu cuenta ya puedes... @@ -65,6 +65,7 @@ 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 diff --git a/config/routes.rb b/config/routes.rb index 658a9b027..4f3eb94ec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -267,6 +267,6 @@ Rails.application.routes.draw do mount Tolk::Engine => '/translate', :as => 'tolk' # static pages - get '/blog' => redirect("http://hereyourblogsite.com/") + get '/blog' => redirect("http://blog.consul/") resources :pages, path: '/', only: [:show] end diff --git a/doc/locales/fr.yaml b/doc/locales/fr.yaml index 3b8e5571c..e3298cb1f 100644 --- a/doc/locales/fr.yaml +++ b/doc/locales/fr.yaml @@ -865,14 +865,14 @@ fr: privacy: Vie privée transparency_text: Trouver tout à propos de la mairie de Madrid transparency_title: Transparence - transparency_url: https://yourtransparencysite.com + transparency_url: https://transparency.consul header: administration: Administration debates: Débats external_link_blog: Blog external_link_opendata: Open data external_link_transparency: Transparence - external_link_transparency_url: https://yourtransparencysite.com + external_link_transparency_url: https://transparency.consul locale: 'Langue :' logo: Consul moderation: Modération @@ -1497,7 +1497,7 @@ fr: create: flash: offices: Bureaux de soutien aux citoyens - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul success_html: Merci d'avoir demandé votre code de sécurité maximum (uniquement requis pour le vote final). Dans quelques jours, nous vous enverrons un courrier vers votre adresse postale. Vous pouvez le réclamer dans n'importe @@ -1512,7 +1512,7 @@ fr: go_to_index: Voir les propositions office: Vérifier dans n'importe quel %{office} offices: Bureaux de soutien aux citoyens - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul send_letter: Envoyer une lettre avec le code title: Félicitations user_permission_info: Avec votre compte, vous pouvez diff --git a/doc/locales/pt-br.yaml b/doc/locales/pt-br.yaml index 363427030..9098a933e 100644 --- a/doc/locales/pt-br.yaml +++ b/doc/locales/pt-br.yaml @@ -854,14 +854,14 @@ pt-BR: privacy: Política de privacidade transparency_text: Descubra tudo sobre a Câmara da Cidade de Madrid. transparency_title: Transparência - transparency_url: https://yourtransparencysite.com + transparency_url: https://transparency.consul header: administration: Administração debates: Debates external_link_blog: Blog external_link_opendata: Dados abertos external_link_transparency: Transparência - external_link_transparency_url: https://yourtransparencysite.com + external_link_transparency_url: https://transparency.consul locale: 'Idioma:' logo: Consul moderation: Moderação @@ -1515,7 +1515,7 @@ pt-BR: create: flash: offices: Escritórios de Apoio ao Cidadão - offices_url: http://yourcitizensupportofficesite.com + offices_url: http://offices.consul success_html: Obrigado por solicitar seu código de segurança máxima (somente solicitado em votações finais). Em poucos dias nós lhe enviaremos para seu endereço relacionado nos dados que temos em arquivo. Por favor @@ -1531,7 +1531,7 @@ pt-BR: go_to_index: Ver propostas office: Verificar em qualquer %{office} offices: Escritórios de Apoio ao Cidadão - offices_url: http://yourcitizensupportofficesite.com + 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...