Change URLs to use the new domain

This commit is contained in:
Javi Martín
2023-07-07 15:01:41 +02:00
parent 629756dd15
commit 054aef3854
20 changed files with 37 additions and 37 deletions

View File

@@ -36,7 +36,7 @@ If you'd like us to review your pull request in good spirits, please follow our
* Our CI will check whether the rest of the application is still working properly; check its build and make sure all tests are passing * Our CI will check whether the rest of the application is still working properly; check its build and make sure all tests are passing
* Run `bundle exec pronto run` and fix any issues it reports; these issues will also be automatically reported on the pull request * Run `bundle exec pronto run` and fix any issues it reports; these issues will also be automatically reported on the pull request
* Follow [the seven rules of a great commit message](https://chris.beams.io/posts/git-commit/) * Follow [the seven rules of a great commit message](https://chris.beams.io/posts/git-commit/)
* Add or modify i18n translations only in the base languages, English (en) and Spanish (es); we manage all other languages through the [Crowdin integration](https://crowdin.com/project/consul). * Add or modify i18n translations only in the base languages, English (en) and Spanish (es); we manage all other languages through the [Crowdin integration](https://translate.consuldemocracy.org/).
When we review your pull request and ask for changes, if you're proficient using `git rebase` edit existing commits instead of adding new ones. If you aren't proficient with `git rebase`, ignore this point. When we review your pull request and ask for changes, if you're proficient using `git rebase` edit existing commits instead of adding new ones. If you aren't proficient with `git rebase`, ignore this point.

View File

@@ -36,7 +36,7 @@ Si quieres que revisemos tu código con una sonrisa, por favor sigue nuestras co
* Los tests se ejecutarán automáticamente para comprobar que el resto de la aplicación sigue funcionando; asegúrate de que los tests pasan * Los tests se ejecutarán automáticamente para comprobar que el resto de la aplicación sigue funcionando; asegúrate de que los tests pasan
* Ejecuta `bundle exec pronto run` y arregla los problemas de los que informe (si es que hay alguno) * Ejecuta `bundle exec pronto run` y arregla los problemas de los que informe (si es que hay alguno)
* Sigue [las siete reglas para un gran mensaje de commit](https://chris.beams.io/posts/git-commit/) * Sigue [las siete reglas para un gran mensaje de commit](https://chris.beams.io/posts/git-commit/)
* Añade o modifica las traducciones i18n sólo en los idiomas base, inglés (en) y español (es); todos los demás idiomas los gestionamos a través de la [integración de Crowdin](https://crowdin.com/project/consul). * Añade o modifica las traducciones i18n sólo en los idiomas base, inglés (en) y español (es); todos los demás idiomas los gestionamos a través de la [integración de Crowdin](https://translate.consuldemocracy.org/).
Cuando revisemos tu código y te pidamos que cambies alguna cosa, si tienes experiencia con `git rebase` edita los commits existentes en vez de añadir más. Si no tienes experiencia con `git rebase`, puedes saltarte este punto. Cuando revisemos tu código y te pidamos que cambies alguna cosa, si tienes experiencia con `git rebase` edita los commits existentes en vez de añadir más. Si no tienes experiencia con `git rebase`, puedes saltarte este punto.

View File

@@ -13,7 +13,7 @@ Citizen Participation and Open Government Application
![Build status](https://github.com/consuldemocracy/consuldemocracy/workflows/tests/badge.svg) ![Build status](https://github.com/consuldemocracy/consuldemocracy/workflows/tests/badge.svg)
[![Code Climate](https://codeclimate.com/github/consuldemocracy/consuldemocracy/badges/gpa.svg)](https://codeclimate.com/github/consuldemocracy/consuldemocracy) [![Code Climate](https://codeclimate.com/github/consuldemocracy/consuldemocracy/badges/gpa.svg)](https://codeclimate.com/github/consuldemocracy/consuldemocracy)
[![Coverage Status](https://coveralls.io/repos/github/consuldemocracy/consuldemocracy/badge.svg)](https://coveralls.io/github/consuldemocracy/consuldemocracy?branch=master) [![Coverage Status](https://coveralls.io/repos/github/consuldemocracy/consuldemocracy/badge.svg)](https://coveralls.io/github/consuldemocracy/consuldemocracy?branch=master)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/consul/localized.svg)](https://crowdin.com/project/consul) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/consul/localized.svg)](https://translate.consuldemocracy.org/)
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](http://www.gnu.org/licenses/agpl-3.0) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](http://www.gnu.org/licenses/agpl-3.0)
[![Accessibility conformance](https://img.shields.io/badge/accessibility-WAI:AA-green.svg)](https://www.w3.org/WAI/eval/Overview) [![Accessibility conformance](https://img.shields.io/badge/accessibility-WAI:AA-green.svg)](https://www.w3.org/WAI/eval/Overview)
@@ -28,15 +28,15 @@ This is the opensource code repository of the eParticipation website CONSUL DEMO
## Documentation ## Documentation
Check the ongoing documentation at [https://docs.consulproject.org](https://docs.consulproject.org) to learn more about how to start your own CONSUL DEMOCRACY fork, install it, customize it and learn to use it from an administrator/maintainer perspective. Check the ongoing documentation at [https://docs.consuldemocracy.org](https://docs.consuldemocracy.org) to learn more about how to start your own CONSUL DEMOCRACY fork, install it, customize it and learn to use it from an administrator/maintainer perspective.
## CONSUL DEMOCRACY Project main website ## CONSUL DEMOCRACY Project main website
You can access the main website of the project at [http://consulproject.org](http://consulproject.org) where you can find documentation about the use of the platform, videos, and links to the community space. You can access the main website of the project at [http://consuldemocracy.org](http://consuldemocracy.org) where you can find documentation about the use of the platform, videos, and links to the community space.
## Configuration for development and test environments ## Configuration for development and test environments
**NOTE**: For more detailed instructions check the [docs](https://docs.consulproject.org) **NOTE**: For more detailed instructions check the [docs](https://docs.consuldemocracy.org)
Prerequisites: install git, Ruby 3.0.6, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5). Prerequisites: install git, Ruby 3.0.6, CMake, pkg-config, shared-mime-info, Node.js and PostgreSQL (>=9.5).
@@ -80,7 +80,7 @@ See [installer](https://github.com/consuldemocracy/installer)
## Current state ## Current state
Development started on [2015 July 15th](https://github.com/consuldemocracy/consuldemocracy/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6). Code was deployed to production on 2015 september 7th to [decide.madrid.es](https://decide.madrid.es). Since then new features are added often. You can take a look at the current features at the [project's website](http://consulproject.org/) and future features at the [Roadmap](https://github.com/orgs/consuldemocracy/projects/1) and [open issues list](https://github.com/consuldemocracy/consuldemocracy/issues). Development started on [2015 July 15th](https://github.com/consuldemocracy/consuldemocracy/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6). Code was deployed to production on 2015 september 7th to [decide.madrid.es](https://decide.madrid.es). Since then new features are added often. You can take a look at the current features at the [project's website](http://consuldemocracy.org/) and future features at the [Roadmap](https://github.com/orgs/consuldemocracy/projects/1) and [open issues list](https://github.com/consuldemocracy/consuldemocracy/issues).
## License ## License

View File

@@ -13,7 +13,7 @@ Aplicación de Participación Ciudadana y Gobierno Abierto
![Estado de los tests](https://github.com/consuldemocracy/consuldemocracy/workflows/tests/badge.svg) ![Estado de los tests](https://github.com/consuldemocracy/consuldemocracy/workflows/tests/badge.svg)
[![Code Climate](https://codeclimate.com/github/consuldemocracy/consuldemocracy/badges/gpa.svg)](https://codeclimate.com/github/consuldemocracy/consuldemocracy) [![Code Climate](https://codeclimate.com/github/consuldemocracy/consuldemocracy/badges/gpa.svg)](https://codeclimate.com/github/consuldemocracy/consuldemocracy)
[![Coverage Status](https://coveralls.io/repos/github/consuldemocracy/consuldemocracy/badge.svg?branch=master)](https://coveralls.io/github/consuldemocracy/consuldemocracy?branch=master) [![Coverage Status](https://coveralls.io/repos/github/consuldemocracy/consuldemocracy/badge.svg?branch=master)](https://coveralls.io/github/consuldemocracy/consuldemocracy?branch=master)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/consul/localized.svg)](https://crowdin.com/project/consul) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/consul/localized.svg)](https://translate.consuldemocracy.org/)
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](http://www.gnu.org/licenses/agpl-3.0) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](http://www.gnu.org/licenses/agpl-3.0)
[![Accessibility conformance](https://img.shields.io/badge/accessibility-WAI:AA-green.svg)](https://www.w3.org/WAI/eval/Overview) [![Accessibility conformance](https://img.shields.io/badge/accessibility-WAI:AA-green.svg)](https://www.w3.org/WAI/eval/Overview)
@@ -26,15 +26,15 @@ Este es el repositorio de código abierto de la Aplicación de Participación Ci
## Documentación ## Documentación
Por favor visita la documentación que está siendo completada en [https://docs.consulproject.org](https://docs.consulproject.org) para conocer más sobre este proyecto, cómo comenzar tu propio fork, instalarlo, personalizarlo y usarlo como administrador/mantenedor. Por favor visita la documentación que está siendo completada en [https://docs.consuldemocracy.org](https://docs.consuldemocracy.org) para conocer más sobre este proyecto, cómo comenzar tu propio fork, instalarlo, personalizarlo y usarlo como administrador/mantenedor.
## Web CONSUL DEMOCRACY Project ## Web CONSUL DEMOCRACY Project
Puedes acceder a la página principal del proyecto en [http://consulproject.org](http://consulproject.org) donde puedes encontrar documentación sobre el uso de la plataforma, videos y enlaces al espacio de la comunidad. Puedes acceder a la página principal del proyecto en [http://consuldemocracy.org](http://consuldemocracy.org) donde puedes encontrar documentación sobre el uso de la plataforma, videos y enlaces al espacio de la comunidad.
## Configuración para desarrollo y tests ## Configuración para desarrollo y tests
**NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://docs.consulproject.org) **NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://docs.consuldemocracy.org)
Prerequisitos: tener instalado git, Ruby 3.0.6, CMake, pkg-config, shared-mime-info, Node.js y PostgreSQL (9.5 o superior). Prerequisitos: tener instalado git, Ruby 3.0.6, CMake, pkg-config, shared-mime-info, Node.js y PostgreSQL (9.5 o superior).
@@ -74,7 +74,7 @@ Pero para ciertas acciones, como apoyar, necesitarás un usuario verificado, el
## Estado del proyecto ## Estado del proyecto
El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/consuldemocracy/consuldemocracy/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6) y el código fue puesto en producción el día 7 de Septiembre de 2015 en [decide.madrid.es](https://decide.madrid.es). Desde entonces se le añaden mejoras y funcionalidades constantemente. Las funcionalidades actuales se pueden consultar en la [la página del projecto](http://consulproject.org/es) y las futuras funcionalidades en el [Roadmap](https://github.com/consuldemocracy/consuldemocracy/projects/6) y [el listado de issues](https://github.com/consuldemocracy/consuldemocracy/issues). El desarrollo de esta aplicación comenzó el [15 de Julio de 2015](https://github.com/consuldemocracy/consuldemocracy/commit/8db36308379accd44b5de4f680a54c41a0cc6fc6) y el código fue puesto en producción el día 7 de Septiembre de 2015 en [decide.madrid.es](https://decide.madrid.es). Desde entonces se le añaden mejoras y funcionalidades constantemente. Las funcionalidades actuales se pueden consultar en la [la página del projecto](http://consuldemocracy.org/es) y las futuras funcionalidades en el [Roadmap](https://github.com/consuldemocracy/consuldemocracy/projects/6) y [el listado de issues](https://github.com/consuldemocracy/consuldemocracy/issues).
## Licencia ## Licencia

View File

@@ -1386,7 +1386,7 @@ en:
show_results_and_stats: "Show results and stats" show_results_and_stats: "Show results and stats"
results_and_stats_reminder: "Marking these checkboxes the results and/or stats will be publicly available and every user will see them." results_and_stats_reminder: "Marking these checkboxes the results and/or stats will be publicly available and every user will see them."
close_modal: Close modal close_modal: Close modal
example_url: "For example, https://consulproject.org or /help" example_url: "For example, https://consuldemocracy.org or /help"
geozones: geozones:
index: index:
title: Geozone title: Geozone
@@ -1625,7 +1625,7 @@ en:
see_page: View see_page: View
new: new:
title: Create new custom page title: Create new custom page
slug_help: "Text to identify this page on URL, for example <code>https://consulproject.org/page-slug</code>" slug_help: "Text to identify this page on URL, for example <code>https://consuldemocracy.org/page-slug</code>"
page: page:
created_at: Created at created_at: Created at
status: Status status: Status

View File

@@ -1386,7 +1386,7 @@ es:
show_results_and_stats: "Mostrar resultados y estadísticas" show_results_and_stats: "Mostrar resultados y estadísticas"
results_and_stats_reminder: "Si marcas estas casillas los resultados y/o estadísticas serán públicos y podrán verlos todos los usuarios." results_and_stats_reminder: "Si marcas estas casillas los resultados y/o estadísticas serán públicos y podrán verlos todos los usuarios."
close_modal: Cerrar ventana emergente close_modal: Cerrar ventana emergente
example_url: "Por ejemplo, https://consulproject.org o /help" example_url: "Por ejemplo, https://consuldemocracy.org o /help"
geozones: geozones:
index: index:
title: Zonas title: Zonas
@@ -1625,7 +1625,7 @@ es:
see_page: Ver see_page: Ver
new: new:
title: Página nueva title: Página nueva
slug_help: "Texto que identifica esta página en la URL, por ejemplo <code>https://consulproject.org/slug-de-pagina</code>" slug_help: "Texto que identifica esta página en la URL, por ejemplo <code>https://consuldemocracy.org/slug-de-pagina</code>"
page: page:
created_at: Creada created_at: Creada
status: Estado status: Estado

View File

@@ -13,7 +13,7 @@ section "Creating header and cards for the homepage" do
-> { I18n.t("seeds.cards.header.#{attribute}") } -> { I18n.t("seeds.cards.header.#{attribute}") }
end end
).merge( ).merge(
link_url: "http://consulproject.org/", link_url: "http://consuldemocracy.org/",
header: true, header: true,
image_attributes: create_image_attachment("header") image_attributes: create_image_attachment("header")
) )

View File

@@ -1,6 +1,6 @@
require "net/http" require "net/http"
API_ENDPOINT = "https://demo.consulproject.org/graphql".freeze API_ENDPOINT = "https://demo.consuldemocracy.org/graphql".freeze
def make_request(query_string) def make_request(query_string)
uri = URI(API_ENDPOINT) uri = URI(API_ENDPOINT)

View File

@@ -1,7 +1,7 @@
require "net/http" require "net/http"
require "json" require "json"
API_ENDPOINT = "https://demo.consulproject.org/graphql".freeze API_ENDPOINT = "https://demo.consuldemocracy.org/graphql".freeze
def make_request(query_string) def make_request(query_string)
uri = URI(API_ENDPOINT) uri = URI(API_ENDPOINT)

View File

@@ -27,12 +27,12 @@ describe Budgets::BudgetComponent do
expect(header).not_to have_css ".main-link" expect(header).not_to have_css ".main-link"
end end
budget.update!(main_link_text: "Participate now!", main_link_url: "https://consulproject.org") budget.update!(main_link_text: "Participate now!", main_link_url: "https://consuldemocracy.org")
render_inline Budgets::BudgetComponent.new(budget) render_inline Budgets::BudgetComponent.new(budget)
page.find(".budget-header") do |header| page.find(".budget-header") do |header|
expect(header).to have_link "Participate now!", href: "https://consulproject.org", class: "main-link" expect(header).to have_link "Participate now!", href: "https://consuldemocracy.org", class: "main-link"
end end
end end
end end

View File

@@ -8,10 +8,10 @@ describe Budgets::PhasesComponent do
expect(page).not_to have_css(".main-link") expect(page).not_to have_css(".main-link")
budget.current_phase.update!(main_link_text: "Phase link!", main_link_url: "https://consulproject.org") budget.current_phase.update!(main_link_text: "Phase link!", main_link_url: "https://consuldemocracy.org")
render_inline Budgets::PhasesComponent.new(budget) render_inline Budgets::PhasesComponent.new(budget)
expect(page).to have_css(".main-link") expect(page).to have_css(".main-link")
expect(page).to have_link("Phase link!", href: "https://consulproject.org") expect(page).to have_link("Phase link!", href: "https://consuldemocracy.org")
end end
end end

View File

@@ -139,7 +139,7 @@ describe Budget::Phase do
end end
it "is valid if main_link_text and main_link_url are both provided" do it "is valid if main_link_text and main_link_url are both provided" do
budget = build(:budget, main_link_text: "link text", main_link_url: "https://consulproject.org") budget = build(:budget, main_link_text: "link text", main_link_url: "https://consuldemocracy.org")
expect(budget).to be_valid expect(budget).to be_valid
end end

View File

@@ -132,7 +132,7 @@ describe Budget do
end end
it "is valid if main_link_text and main_link_url are both provided" do it "is valid if main_link_text and main_link_url are both provided" do
valid_budget = build(:budget, main_link_text: "Text link", main_link_url: "https://consulproject.org") valid_budget = build(:budget, main_link_text: "Text link", main_link_url: "https://consuldemocracy.org")
expect(valid_budget).to be_valid expect(valid_budget).to be_valid
end end

View File

@@ -201,16 +201,16 @@ describe Setting do
end end
describe ".default_mailer_from_address" do describe ".default_mailer_from_address" do
before { allow(Tenant).to receive(:default_host).and_return("consulproject.org") } before { allow(Tenant).to receive(:default_host).and_return("consuldemocracy.org") }
it "uses the default host for the default tenant" do it "uses the default host for the default tenant" do
expect(Setting.default_mailer_from_address).to eq "noreply@consulproject.org" expect(Setting.default_mailer_from_address).to eq "noreply@consuldemocracy.org"
end end
it "uses the tenant host for other tenants" do it "uses the tenant host for other tenants" do
allow(Tenant).to receive(:current_schema).and_return("new") allow(Tenant).to receive(:current_schema).and_return("new")
expect(Setting.default_mailer_from_address).to eq "noreply@new.consulproject.org" expect(Setting.default_mailer_from_address).to eq "noreply@new.consuldemocracy.org"
end end
context "empty default host" do context "empty default host" do

View File

@@ -44,7 +44,7 @@ describe Widget::Card do
it "is valid if link_text and link_url are both provided" do it "is valid if link_text and link_url are both provided" do
header = build(:widget_card, :header, link_text: "Text link", header = build(:widget_card, :header, link_text: "Text link",
link_url: "https://consulproject.org") link_url: "https://consuldemocracy.org")
expect(header).to be_valid expect(header).to be_valid
end end

View File

@@ -64,14 +64,14 @@ describe "Admin budget phases" do
expect(page).to have_content "Main call to action (optional)" expect(page).to have_content "Main call to action (optional)"
fill_in "Text on the link", with: "Link on the phase" fill_in "Text on the link", with: "Link on the phase"
fill_in "The link takes you to (add a link)", with: "https://consulproject.org" fill_in "The link takes you to (add a link)", with: "https://consuldemocracy.org"
click_button "Save changes" click_button "Save changes"
expect(page).to have_content("Changes saved") expect(page).to have_content("Changes saved")
visit budgets_path visit budgets_path
expect(page).to have_link("Link on the phase", href: "https://consulproject.org") expect(page).to have_link("Link on the phase", href: "https://consuldemocracy.org")
end end
end end
end end

View File

@@ -299,13 +299,13 @@ describe "Admin budgets", :admin do
expect(page).to have_content("Main call to action (optional)") expect(page).to have_content("Main call to action (optional)")
fill_in "Text on the link", with: "Participate now" fill_in "Text on the link", with: "Participate now"
fill_in "The link takes you to (add a link)", with: "https://consulproject.org" fill_in "The link takes you to (add a link)", with: "https://consuldemocracy.org"
click_button "Update Budget" click_button "Update Budget"
expect(page).to have_content "Participatory budget updated successfully" expect(page).to have_content "Participatory budget updated successfully"
visit budgets_path visit budgets_path
expect(page).to have_link("Participate now", href: "https://consulproject.org") expect(page).to have_link("Participate now", href: "https://consuldemocracy.org")
end end
scenario "Changing name for current locale will update the slug if budget is in draft phase" do scenario "Changing name for current locale will update the slug if budget is in draft phase" do

View File

@@ -9,7 +9,7 @@ describe "Budgets wizard, first step", :admin do
fill_in "Name", with: "M30 - Summer campaign" fill_in "Name", with: "M30 - Summer campaign"
fill_in "Text on the link", with: "Participate now!" fill_in "Text on the link", with: "Participate now!"
fill_in "The link takes you to (add a link)", with: "https://consulproject.org" fill_in "The link takes you to (add a link)", with: "https://consuldemocracy.org"
fill_in "Name", with: "M30 - Summer campaign" fill_in "Name", with: "M30 - Summer campaign"
click_button "Continue to groups" click_button "Continue to groups"

View File

@@ -2,7 +2,7 @@ require "rails_helper"
describe "Admin edit translatable records", :admin do describe "Admin edit translatable records", :admin do
before do before do
translatable.main_link_url = "https://consulproject.org" if translatable.is_a?(Budget::Phase) translatable.main_link_url = "https://consuldemocracy.org" if translatable.is_a?(Budget::Phase)
translatable.update!(attributes) translatable.update!(attributes)
end end
@@ -123,7 +123,7 @@ describe "Admin edit translatable records", :admin do
let(:translatable) { create(:budget_investment) } let(:translatable) { create(:budget_investment) }
context "Input field" do context "Input field" do
let(:translatable) { create(:budget, main_link_url: "https://consulproject.org") } let(:translatable) { create(:budget, main_link_url: "https://consuldemocracy.org") }
scenario "Shows validation erros" do scenario "Shows validation erros" do
visit edit_admin_budget_path(translatable) visit edit_admin_budget_path(translatable)

View File

@@ -6,7 +6,7 @@ describe "Localization" do
create(:widget_card, title: "Bienvenido a CONSUL", create(:widget_card, title: "Bienvenido a CONSUL",
description: "Software libre para la participación ciudadana.", description: "Software libre para la participación ciudadana.",
link_text: "Más información", link_text: "Más información",
link_url: "http://consulproject.org/", link_url: "http://consuldemocracy.org/",
header: true) header: true)
end end