From dfc7f6080cb7fc91628df94a7653b3b7ed14c718 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 9 Nov 2024 11:03:54 -0600 Subject: [PATCH 1/3] Removing appendix from locale --- locale/en/LC_MESSAGES/un_sdg/appendix.po | 100 ------------------- locale/es/LC_MESSAGES/un_sdg/appendix.po | 118 ----------------------- locale/pot/un_sdg/appendix.pot | 89 ----------------- 3 files changed, 307 deletions(-) delete mode 100644 locale/en/LC_MESSAGES/un_sdg/appendix.po delete mode 100644 locale/es/LC_MESSAGES/un_sdg/appendix.po delete mode 100644 locale/pot/un_sdg/appendix.pot diff --git a/locale/en/LC_MESSAGES/un_sdg/appendix.po b/locale/en/LC_MESSAGES/un_sdg/appendix.po deleted file mode 100644 index e139f397..00000000 --- a/locale/en/LC_MESSAGES/un_sdg/appendix.po +++ /dev/null @@ -1,100 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2024 pgRouting Developers -# This file is distributed under the same license as the Workshop FOSS4G -# Belém package. -# FIRST AUTHOR , 2024. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: Workshop FOSS4G Belém 3.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-07 03:04+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language: en\n" -"Language-Team: en \n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.16.0\n" - -#: ../../build/docs/un_sdg/appendix.rst:11 -msgid "Appendix: OSGeo UN Challenge Workshop Solutions" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:14 -msgid "Solutions to :doc:`sdg11-cities`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:17 -msgid "**Exercise:** 1 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:19 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 1: Create a point for the city`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:25 -msgid "**Exercise:** 6 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:28 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 6: Counting the number of Waterways`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:34 -msgid "**Exercise:** 7 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:37 -msgid "" -":ref:`un_sdg/sdg11-cities:Exercise 7: Removing the Rivers which are in " -"swamps`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:43 -msgid "**Exercise:** 8 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:45 -msgid "" -":ref:`un_sdg/sdg11-cities:Exercise 8: Get the Connected Components of " -"Waterways`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:51 -msgid "**Exercise:** 9 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:54 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 9: Creating buffer around the city`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:59 -msgid "**Exercise:** 11 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:61 -msgid "" -":ref:`un_sdg/sdg11-cities:Exercise 11: Finding the components " -"intersecting the buffer`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:67 -msgid "**Exercise:** 12 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:70 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 12: Get the rain zones`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:75 -msgid "**Exercise:** 13 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:77 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 13: Create a union of rain zones`" -msgstr "" - diff --git a/locale/es/LC_MESSAGES/un_sdg/appendix.po b/locale/es/LC_MESSAGES/un_sdg/appendix.po deleted file mode 100644 index 7483e26d..00000000 --- a/locale/es/LC_MESSAGES/un_sdg/appendix.po +++ /dev/null @@ -1,118 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2021 Daniel Kastl, Vicky Vergara -# This file is distributed under the same license as the Workshop FOSS4G -# Argentina package. -# FIRST AUTHOR , 2021. -# -# Translators: -# Vicky Vergara , 2022 -msgid "" -msgstr "" -"Project-Id-Version: Workshop FOSS4G Prizren 2.9\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-04 09:53-0600\n" -"PO-Revision-Date: 2024-03-22 18:11+0000\n" -"Last-Translator: Celia Virginia Vergara Castillo \n" -"Language-Team: Spanish \n" -"Language: es\n" -"Language-Team: Spanish \n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.3\n" -"Generated-By: Babel 2.9.1\n" - -#: ../../build/docs/un_sdg/appendix.rst:11 -msgid "Appendix: OSGeo UN Challenge Workshop Solutions" -msgstr "Apéndice: OSGeo Soluciones del taller de ONU - ODS" - -#: ../../build/docs/un_sdg/appendix.rst:14 -msgid "Solutions to :doc:`sdg11-cities`" -msgstr "Soluciones para :doc:`sdg11-cities`" - -#: ../../build/docs/un_sdg/appendix.rst:17 -msgid "**Exercise:** 1 (**Chapter:** SDG 11)" -msgstr "**Ejercicio:** 1 (**Capítulo:** ODS 11)" - -#: ../../build/docs/un_sdg/appendix.rst:19 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 1: Create a point for the city`" -msgstr ":ref:`un_sdg/sdg11-cities:Ejercicio 1: Crear un punto para la ciudad`" - -#: ../../build/docs/un_sdg/appendix.rst:25 -msgid "**Exercise:** 6 (**Chapter:** SDG 11)" -msgstr "**Ejercicio:** 6 (**Capítulo:** ODS 11)" - -#: ../../build/docs/un_sdg/appendix.rst:28 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 6: Counting the number of Waterways`" -msgstr "" -":ref:`un_sdg/sdg11-cities:Ejercicio 6: Contar el número de vías " -"navegables`" - -#: ../../build/docs/un_sdg/appendix.rst:34 -msgid "**Exercise:** 7 (**Chapter:** SDG 11)" -msgstr "**Ejercicio:** 7 (**Capítulo:** ODS 11)" - -#: ../../build/docs/un_sdg/appendix.rst:37 -msgid "" -":ref:`un_sdg/sdg11-cities:Exercise 7: Removing the Rivers which are in " -"swamps`" -msgstr "" -":ref:`un_sdg/sdg11-cities:Ejercicio 7: Eliminar los ríos que están en " -"pantanos`" - -#: ../../build/docs/un_sdg/appendix.rst:43 -msgid "**Exercise:** 8 (**Chapter:** SDG 11)" -msgstr "**Ejercicio:** 8 (**Capítulo:** ODS 11)" - -#: ../../build/docs/un_sdg/appendix.rst:45 -msgid "" -":ref:`un_sdg/sdg11-cities:Exercise 8: Get the Connected Components of " -"Waterways`" -msgstr "" -":ref:`un_sdg/sdg11-cities:Ejercicio 8: Obtener los componentes conectados" -" de las vías fluviales`" - -#: ../../build/docs/un_sdg/appendix.rst:51 -msgid "**Exercise:** 9 (**Chapter:** SDG 11)" -msgstr "**Ejercicio:** 9 (**Capítulo:** ODS 11)" - -#: ../../build/docs/un_sdg/appendix.rst:54 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 9: Creating buffer around the city`" -msgstr "" -":ref:`un_sdg/sdg11-cities:Ejercicio 9: Crear una zona límite alrededor de" -" la ciudad`" - -#: ../../build/docs/un_sdg/appendix.rst:59 -msgid "**Exercise:** 11 (**Chapter:** SDG 11)" -msgstr "**Ejercicio:** 11 (**Capítulo:** ODS 11)" - -#: ../../build/docs/un_sdg/appendix.rst:61 -msgid "" -":ref:`un_sdg/sdg11-cities:Exercise 11: Finding the components " -"intersecting the buffer`" -msgstr "" -":ref:`un_sdg/sdg11-cities:Ejercicio 11: Encontrar los componentes que " -"intersectan la zona limitada`" - -#: ../../build/docs/un_sdg/appendix.rst:67 -msgid "**Exercise:** 12 (**Chapter:** SDG 11)" -msgstr "**Ejercicio:** 12 (**Capítulo:** ODS 11)" - -#: ../../build/docs/un_sdg/appendix.rst:70 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 12: Get the rain zones`" -msgstr ":ref:`un_sdg/sdg11-cities:Ejercicio 12: Obtener las zonas de lluvia`" - -#: ../../build/docs/un_sdg/appendix.rst:75 -msgid "**Exercise:** 13 (**Chapter:** SDG 11)" -msgstr "**Ejercicio:** 13 (**Capítulo:** ODS 11)" - -#: ../../build/docs/un_sdg/appendix.rst:77 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 13: Create a union of rain zones`" -msgstr "" -":ref:`un_sdg/sdg11-cities:Ejercicio 13: Crear una unión de zonas de " -"lluvia`" - diff --git a/locale/pot/un_sdg/appendix.pot b/locale/pot/un_sdg/appendix.pot deleted file mode 100644 index b6f5e9ec..00000000 --- a/locale/pot/un_sdg/appendix.pot +++ /dev/null @@ -1,89 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 2010-2024 pgRouting Developers -# This file is distributed under the same license as the Workshop FOSS4G Belém package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: Workshop FOSS4G Belém 3.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-07 03:04+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../../build/docs/un_sdg/appendix.rst:11 -msgid "Appendix: OSGeo UN Challenge Workshop Solutions" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:14 -msgid "Solutions to :doc:`sdg11-cities`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:17 -msgid "**Exercise:** 1 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:19 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 1: Create a point for the city`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:25 -msgid "**Exercise:** 6 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:28 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 6: Counting the number of Waterways`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:34 -msgid "**Exercise:** 7 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:37 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 7: Removing the Rivers which are in swamps`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:43 -msgid "**Exercise:** 8 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:45 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 8: Get the Connected Components of Waterways`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:51 -msgid "**Exercise:** 9 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:54 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 9: Creating buffer around the city`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:59 -msgid "**Exercise:** 11 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:61 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 11: Finding the components intersecting the buffer`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:67 -msgid "**Exercise:** 12 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:70 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 12: Get the rain zones`" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:75 -msgid "**Exercise:** 13 (**Chapter:** SDG 11)" -msgstr "" - -#: ../../build/docs/un_sdg/appendix.rst:77 -msgid ":ref:`un_sdg/sdg11-cities:Exercise 13: Create a union of rain zones`" -msgstr "" From 4b633b823ea49bcf1571faaf964e3f9489c7c4bf Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 9 Nov 2024 11:17:01 -0600 Subject: [PATCH 2/3] (locale) Adjusting line numbers --- locale/pot/basic/pedestrian.pot | 8 ++++---- locale/pot/basic/sql_function.pot | 6 +++--- locale/pot/general-intro/introduction.pot | 11 ++++++----- locale/pot/index.pot | 8 ++++---- locale/pot/un_sdg/introduction.pot | 4 ++-- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/locale/pot/basic/pedestrian.pot b/locale/pot/basic/pedestrian.pot index 1aef328f..ed27fc30 100644 --- a/locale/pot/basic/pedestrian.pot +++ b/locale/pot/basic/pedestrian.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-04 21:10-0600\n" +"POT-Creation-Date: 2024-11-09 11:14-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -157,7 +157,7 @@ msgstr "" msgid "Calculate routes with costs in *osm2pgRouting* `length` default units." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:-1 +#: ../../build/docs/basic/pedestrian.rst:116 msgid "From the |place_1| to the |place_3|" msgstr "" @@ -208,7 +208,7 @@ msgstr "" msgid "Calculate routes with costs in *osm2pgRouting* ``length_m`` which is in meters." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:-1 +#: ../../build/docs/basic/pedestrian.rst:158 msgid "From |place_1| and |place_2| to |place_3|" msgstr "" @@ -361,7 +361,7 @@ msgstr "" msgid "Get only the cost in minutes." msgstr "" -#: ../../build/docs/basic/pedestrian.rst:-1 +#: ../../build/docs/basic/pedestrian.rst:310 msgid "From the hotels to the |place_4| and |place_5|" msgstr "" diff --git a/locale/pot/basic/sql_function.pot b/locale/pot/basic/sql_function.pot index 7823bbcf..2d7177ea 100644 --- a/locale/pot/basic/sql_function.pot +++ b/locale/pot/basic/sql_function.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-07 03:04+0000\n" +"POT-Creation-Date: 2024-11-09 11:14-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,7 +36,7 @@ msgstr "" msgid "The application requirements" msgstr "" -#: ../../build/docs/basic/sql_function.rst:40 +#: ../../build/docs/basic/sql_function.rst:32 msgid "A front end needs the following routing information:" msgstr "" @@ -241,7 +241,7 @@ msgstr "" msgid "Exercise 1: Get additional information" msgstr "" -#: ../../build/docs/basic/sql_function.rst:-1 +#: ../../build/docs/basic/sql_function.rst:85 msgid "Route showing names" msgstr "" diff --git a/locale/pot/general-intro/introduction.pot b/locale/pot/general-intro/introduction.pot index 84fc2e0f..130a5b1a 100644 --- a/locale/pot/general-intro/introduction.pot +++ b/locale/pot/general-intro/introduction.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-04 21:10-0600\n" +"POT-Creation-Date: 2024-11-09 11:14-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,7 +102,8 @@ msgstr "" msgid "Sponsored by" msgstr "" -#: ../../build/docs/general-intro/introduction.rst:-1 +#: ../../build/docs/general-intro/introduction.rst:59 +#: ../../build/docs/general-intro/introduction.rst:64 msgid "Paragon Corporation" msgstr "" @@ -146,14 +147,14 @@ msgstr "" msgid "Become a sponsor" msgstr "" -#: ../../build/docs/general-intro/introduction.rst:-1 +#: ../../build/docs/general-intro/introduction.rst:105 msgid "The Linux Foundation" msgstr "" -#: ../../build/docs/general-intro/introduction.rst:-1 +#: ../../build/docs/general-intro/introduction.rst:110 msgid "Open Collective" msgstr "" -#: ../../build/docs/general-intro/introduction.rst:-1 +#: ../../build/docs/general-intro/introduction.rst:115 msgid "OSGeo Foundation" msgstr "" diff --git a/locale/pot/index.pot b/locale/pot/index.pot index 0f27a365..dfddacba 100644 --- a/locale/pot/index.pot +++ b/locale/pot/index.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-07 03:04+0000\n" +"POT-Creation-Date: 2024-11-09 11:14-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,14 +36,14 @@ msgstr "" msgid "United Nations Sustainable Development Goals" msgstr "" -#: ../../build/docs/index.rst:55 +#: ../../build/docs/index.rst:54 msgid "Interaction with other software" msgstr "" -#: ../../build/docs/index.rst:67 +#: ../../build/docs/index.rst:66 msgid "Examples from the Internet" msgstr "" -#: ../../build/docs/index.rst:78 +#: ../../build/docs/index.rst:77 msgid "Appendices" msgstr "" diff --git a/locale/pot/un_sdg/introduction.pot b/locale/pot/un_sdg/introduction.pot index 494d0d31..b435d3df 100644 --- a/locale/pot/un_sdg/introduction.pot +++ b/locale/pot/un_sdg/introduction.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Workshop FOSS4G Belém 3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-04 21:10-0600\n" +"POT-Creation-Date: 2024-11-09 11:14-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,7 +36,7 @@ msgstr "" msgid "United Nations" msgstr "" -#: ../../build/docs/un_sdg/introduction.rst:-1 +#: ../../build/docs/un_sdg/introduction.rst:37 msgid "UN Flag" msgstr "" From 9f93c2ede89448e0ffe947a5ee772437a4409341 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Sat, 9 Nov 2024 13:20:55 -0600 Subject: [PATCH 3/3] (build,CI) adjusting the requirements and build options --- .github/workflows/website.yml | 2 +- REQUIREMENTS.txt | 2 +- docs/conf.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 7a9406bd..a5d95114 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -72,7 +72,7 @@ jobs: echo :5432:*:user:user >> .pgpass mkdir build cd build - cmake -DLOCALE=ON -DPGR_WORKSHOP=ON -DES=ON .. + cmake -DES=ON .. env: POSTGRES_HOST: localhost POSTGRES_PORT: 5432 diff --git a/REQUIREMENTS.txt b/REQUIREMENTS.txt index f8157025..7f8bb908 100644 --- a/REQUIREMENTS.txt +++ b/REQUIREMENTS.txt @@ -1,4 +1,4 @@ Sphinx>4.0.0 sphinx_bootstrap_theme>=0.4 -sphinx-intl[transifex] +sphinx-intl sphinx-collapse diff --git a/docs/conf.py b/docs/conf.py index 8e22dbe3..0190df44 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -181,7 +181,9 @@ def setup(app): #html_use_smartypants = True # Custom sidebar templates, maps document names to template names. -#html_sidebars = {} +html_sidebars = { + '**': [] + } # Additional templates that should be rendered to pages, maps page names to # template names.