From cc22fd7b400254e6fb7f0aef351befc9543318b0 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 28 Sep 2022 13:45:54 -0500 Subject: [PATCH 1/9] fixing typos --- doc/allpairs/pgr_floydWarshall.rst | 2 +- doc/bellman_ford/pgr_edwardMoore.rst | 10 +++++----- .../pgr_binaryBreadthFirstSearch.rst | 2 +- doc/dagShortestPath/pgr_dagShortestPath.rst | 2 +- doc/max_flow/flow-family.rst | 2 +- doc/withPoints/pgr_withPointsCost.rst | 20 +++++++++---------- doc/withPoints/pgr_withPointsCostMatrix.rst | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/allpairs/pgr_floydWarshall.rst b/doc/allpairs/pgr_floydWarshall.rst index d726563d182..cca1770d29b 100644 --- a/doc/allpairs/pgr_floydWarshall.rst +++ b/doc/allpairs/pgr_floydWarshall.rst @@ -67,7 +67,7 @@ Signatures .. admonition:: \ \ :class: signatures - pgr floydWarshall(`Edges SQL`_, [``directed``]) + pgr_floydWarshall(`Edges SQL`_, [``directed``]) | RETURNS SET OF |matrix-result| | OR EMPTY SET diff --git a/doc/bellman_ford/pgr_edwardMoore.rst b/doc/bellman_ford/pgr_edwardMoore.rst index 29083f22c66..044637cb5ba 100644 --- a/doc/bellman_ford/pgr_edwardMoore.rst +++ b/doc/bellman_ford/pgr_edwardMoore.rst @@ -112,7 +112,7 @@ One to One .. admonition:: \ \ :class: signatures - | pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vid**, [``directed``]); + | pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vid**, [``directed``]) | RETURNS SET OF |result-1-1| | OR EMPTY SET @@ -132,7 +132,7 @@ One to Many .. admonition:: \ \ :class: signatures - | pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vids**, [``directed``]); + | pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vids**, [``directed``]) | RETURNS SET OF |result-1-m| | OR EMPTY SET @@ -153,7 +153,7 @@ Many to One .. admonition:: \ \ :class: signatures - | pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vid**, [``directed``]); + | pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vid**, [``directed``]) | RETURNS SET OF |result-m-1| | OR EMPTY SET @@ -174,7 +174,7 @@ Many to Many .. admonition:: \ \ :class: signatures - | pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vids**, [``directed``]); + | pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vids**, [``directed``]) | RETURNS SET OF |short-generic-result| | OR EMPTY SET @@ -195,7 +195,7 @@ Combinations .. admonition:: \ \ :class: signatures - | pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``]); + | pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``]) | RETURNS SET OF |short-generic-result| | OR EMPTY SET diff --git a/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst b/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst index 9ddffaeee00..10765e873a3 100644 --- a/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst +++ b/doc/breadthFirstSearch/pgr_binaryBreadthFirstSearch.rst @@ -94,7 +94,7 @@ Signatures | pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vid**, **end vids**, [``directed``]) | pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vid**, [``directed``]) | pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vids**, [``directed``]) - | pgr_binaryBreadthFirstSearch(`Edges SQL`_, **Combinations SQL**, [``directed``]) + | pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, [``directed``]) | RETURNS SET OF |old-generic-result| | OR EMPTY SET diff --git a/doc/dagShortestPath/pgr_dagShortestPath.rst b/doc/dagShortestPath/pgr_dagShortestPath.rst index 236797ede23..186a1dfc510 100644 --- a/doc/dagShortestPath/pgr_dagShortestPath.rst +++ b/doc/dagShortestPath/pgr_dagShortestPath.rst @@ -194,7 +194,7 @@ Combinations .. admonition:: \ \ :class: signatures - | pgr_dagShortestPath(`Edges SQL`_, Combinations) + | pgr_dagShortestPath(`Edges SQL`_, `Combinations SQL`_) | RETURNS SET OF |result-1-1| | OR EMPTY SET diff --git a/doc/max_flow/flow-family.rst b/doc/max_flow/flow-family.rst index 29301ed9fdf..0401a4579e9 100644 --- a/doc/max_flow/flow-family.rst +++ b/doc/max_flow/flow-family.rst @@ -101,7 +101,7 @@ Flow Functions General Information .. characteristics_end -:doc:`pgr_maxFlow` is the maximum Flow and that maximum is guaranteed to be +:doc:`pgr_maxFlow` is the maximum Flow and that maximum is guaranteed to be the same on the functions :doc:`pgr_pushRelabel`, :doc:`pgr_edmondsKarp`, :doc:`pgr_boykovKolmogorov`, but the actual flow through each edge may vary. diff --git a/doc/withPoints/pgr_withPointsCost.rst b/doc/withPoints/pgr_withPointsCost.rst index f9a95701f2d..3c16bb979b7 100644 --- a/doc/withPoints/pgr_withPointsCost.rst +++ b/doc/withPoints/pgr_withPointsCost.rst @@ -108,11 +108,11 @@ Signatures .. admonition:: \ \ :class: signatures - | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, **[options**]) - | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vids**, **[options**]) - | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vid**, **[options**]) - | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vids**, **[options**]) - | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, **[options**]) + | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, [**options**]) + | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vids**, [**options**]) + | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vid**, [**options**]) + | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vids**, [**options**]) + | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, [**options**]) | **options:** ``[directed, driving_side]`` | RETURNS SET OF |matrix-pid| @@ -130,7 +130,7 @@ One to One .. admonition:: \ \ :class: signatures - | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, **[options**]) + | pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, [**options**]) | **options:** ``[directed, driving_side]`` | RETURNS SET OF |matrix-pid| @@ -151,7 +151,7 @@ One to Many .. admonition:: \ \ :class: signatures - | pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, **[options**]) + | pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, [**options**]) | **options:** ``[directed, driving_side]`` | RETURNS SET OF |matrix-pid| @@ -173,7 +173,7 @@ Many to One .. admonition:: \ \ :class: signatures - | pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, **[options**]) + | pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, [**options**]) | **options:** ``[directed, driving_side]`` | RETURNS SET OF |matrix-pid| @@ -194,7 +194,7 @@ Many to Many .. admonition:: \ \ :class: signatures - | pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, **[options**]) + | pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, [**options**]) | **options:** ``[directed, driving_side]`` | RETURNS SET OF |matrix-pid| @@ -216,7 +216,7 @@ Combinations .. admonition:: \ \ :class: signatures - | pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, **[options**]) + | pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, [**options**]) | **options:** ``[directed, driving_side]`` | RETURNS SET OF |matrix-pid| diff --git a/doc/withPoints/pgr_withPointsCostMatrix.rst b/doc/withPoints/pgr_withPointsCostMatrix.rst index d6e6efb490e..93538ea3e8e 100644 --- a/doc/withPoints/pgr_withPointsCostMatrix.rst +++ b/doc/withPoints/pgr_withPointsCostMatrix.rst @@ -67,7 +67,7 @@ Signatures .. admonition:: \ \ :class: signatures - | pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, **[options**]) + | pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, [**options**]) | **options:** ``[directed, driving_side]`` | RETURNS SET OF |matrix-result| From 504960cc9484ba8b1047851c3f7578de148fcd10 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 28 Sep 2022 20:00:51 -0500 Subject: [PATCH 2/9] [locale] ignore changes on index.rst that has the glossary --- tools/transifex/update_locale.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/transifex/update_locale.sh b/tools/transifex/update_locale.sh index 56778420d9b..e31bd1cc312 100755 --- a/tools/transifex/update_locale.sh +++ b/tools/transifex/update_locale.sh @@ -29,4 +29,7 @@ bash tools/transifex/remove_obsolete_entries.sh while read -r f; do git add "$f"; done < build/doc/locale_changes_po_pot.txt +git restore --staged locale/*/LC_MESSAGES/index.po +git restore locale/*/LC_MESSAGES/index.po + popd > /dev/null || exit 1 From 28c0b17ede57b76fd42be98bafa9f1ac76037b1f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 28 Sep 2022 20:16:14 -0500 Subject: [PATCH 3/9] [CI] adding an action to update the locale --- .github/workflows/update-locale.yml | 93 +++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 .github/workflows/update-locale.yml diff --git a/.github/workflows/update-locale.yml b/.github/workflows/update-locale.yml new file mode 100644 index 00000000000..83f0907fbdd --- /dev/null +++ b/.github/workflows/update-locale.yml @@ -0,0 +1,93 @@ +name: Update Locale + +# This action runs: +# - When this file changes +# - When changes on documentation (doc) +# - When is triggered manually + +on: + workflow_dispatch: + push: + paths: + - '.github/workflows/update-locale.yml' + - 'doc/**' + +permissions: + contents: read + +jobs: + update-locale: + permissions: + contents: write # for Git to git push + name: Update Locale and Website + runs-on: ubuntu-latest + + strategy: + fail-fast: false + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Get postgres version + run: | + sudo service postgresql start + PGVER=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + PROJECT_VERSION=$(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) + echo "PGVER=${PGVER}" >> $GITHUB_ENV + echo "PGPORT=5432" >> $GITHUB_ENV + echo "PGIS=3" >> $GITHUB_ENV + echo "PROJECT_VERSION=${PROJECT_VERSION}" >> $GITHUB_ENV + + - name: Extract branch name and commit hash + run: | + branch=${GITHUB_REF#refs/heads/} + echo "BRANCH=$branch" >> $GITHUB_ENV + git_hash=$(git rev-parse --short "$GITHUB_SHA") + echo "GIT_HASH=$git_hash" >> $GITHUB_ENV + + - name: Add PostgreSQL APT repository + run: | + sudo apt-get install curl ca-certificates gnupg + curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - + sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \ + $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' + + - name: Install python + uses: actions/setup-python@v3 + with: + python-version: '3.x' + + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + libboost-graph-dev \ + postgresql-${PGVER} \ + postgresql-${PGVER}-postgis-${PGIS} \ + postgresql-${PGVER}-postgis-${PGIS}-scripts \ + postgresql-server-dev-${PGVER} \ + graphviz \ + doxygen + python -m pip install --upgrade pip + pip install Sphinx + pip install sphinx-bootstrap-theme + pip install sphinx-intl[transifex] + pip list + + - name: Initialize mandatory git config + run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + + - name: Update locale + run: | + bash tools/transifex/update_locale.sh + + # Add the files, commit and push + git diff --staged --quiet || git commit -m "Update locale: commit ${{ env.GIT_HASH }}" + git restore . # Remove the unstaged changes before rebasing + git rebase "origin/${{ env.BRANCH }}" + git push "origin ${{ env.BRANCH }}" From bb37e075317a7af86b4c18a8de2cffa9f2be2b1b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 28 Sep 2022 20:17:05 -0500 Subject: [PATCH 4/9] [build][locale] Avoid ja as the pot file has errors --- .github/workflows/update-locale.yml | 17 +++++++++++++---- doc/CMakeLists.txt | 2 +- tools/transifex/update_locale.sh | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update-locale.yml b/.github/workflows/update-locale.yml index 83f0907fbdd..908be8086d3 100644 --- a/.github/workflows/update-locale.yml +++ b/.github/workflows/update-locale.yml @@ -12,6 +12,17 @@ on: - '.github/workflows/update-locale.yml' - 'doc/**' + branches-ignore: + - 'gh-pages' + + pull_request: + paths: + - '.github/workflows/update-locale.yml' + - 'doc/**' + + branches-ignore: + - 'gh-pages' + permissions: contents: read @@ -19,7 +30,7 @@ jobs: update-locale: permissions: contents: write # for Git to git push - name: Update Locale and Website + name: Update Locale runs-on: ubuntu-latest strategy: @@ -44,7 +55,6 @@ jobs: - name: Extract branch name and commit hash run: | branch=${GITHUB_REF#refs/heads/} - echo "BRANCH=$branch" >> $GITHUB_ENV git_hash=$(git rev-parse --short "$GITHUB_SHA") echo "GIT_HASH=$git_hash" >> $GITHUB_ENV @@ -89,5 +99,4 @@ jobs: # Add the files, commit and push git diff --staged --quiet || git commit -m "Update locale: commit ${{ env.GIT_HASH }}" git restore . # Remove the unstaged changes before rebasing - git rebase "origin/${{ env.BRANCH }}" - git push "origin ${{ env.BRANCH }}" + git push diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 8fad87ef3b0..31c9c7a7286 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -236,7 +236,7 @@ if (LOCALE) "${PGR_DOCUMENTATION_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/locale/pot" - COMMAND sphinx-intl update -d ${CMAKE_SOURCE_DIR}/locale -l en,es,ja > locale_changes.txt + COMMAND sphinx-intl update -d ${CMAKE_SOURCE_DIR}/locale -l en,es > locale_changes.txt #COMMAND sphinx-intl update -p ${CMAKE_SOURCE_DIR}/locale/pot -d ${CMAKE_SOURCE_DIR}/locale --language=${SPHINXINTL_LANGUAGE} #COMMAND sphinx-intl update-txconfig-resources --locale-dir ${CMAKE_SOURCE_DIR}/locale --pot-dir ${CMAKE_SOURCE_DIR}/locale/pot --transifex-project-name pgrouting diff --git a/tools/transifex/update_locale.sh b/tools/transifex/update_locale.sh index e31bd1cc312..3e331b25c4b 100755 --- a/tools/transifex/update_locale.sh +++ b/tools/transifex/update_locale.sh @@ -12,6 +12,7 @@ DIR=$(git rev-parse --show-toplevel) pushd "${DIR}" > /dev/null || exit 1 +mkdir -p build pushd build > /dev/null || exit 1 cmake -DWITH_DOC=ON -DCMAKE_BUILD_TYPE=Release -DLOCALE=ON .. From ca02306e660df7b23cbdf308120f9bfdd6620314 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 28 Sep 2022 20:55:23 -0500 Subject: [PATCH 5/9] [CI] Only run when top level build changes --- .github/workflows/boost_version.yml | 4 ++-- .github/workflows/clang.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml index fb3f6989458..c93c4c57a45 100644 --- a/.github/workflows/boost_version.yml +++ b/.github/workflows/boost_version.yml @@ -28,7 +28,7 @@ on: - 'include/**' - 'pgtap/**' - 'tools/testers/**' - - 'CMakeLists.txt' + - './CMakeLists.txt' branches-ignore: - 'gh-pages' @@ -42,7 +42,7 @@ on: - 'include/**' - 'pgtap/**' - 'tools/testers/**' - - 'CMakeLists.txt' + - './CMakeLists.txt' branches-ignore: - 'gh-pages' diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index 9d12a7b64d3..401889257f1 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -18,7 +18,7 @@ on: - 'include/**' - 'pgtap/**' - 'tools/testers/**' - - 'CMakeLists.txt' + - './CMakeLists.txt' branches-ignore: - 'gh-pages' @@ -32,7 +32,7 @@ on: - 'include/**' - 'pgtap/**' - 'tools/testers/**' - - 'CMakeLists.txt' + - './CMakeLists.txt' branches-ignore: - 'gh-pages' From 5ed805964324f706e62c521d0069acc337ef8d04 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 28 Sep 2022 21:21:39 -0500 Subject: [PATCH 6/9] [build][locale] let weblate recreate other languages po files --- doc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 31c9c7a7286..96349c18e6d 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -236,7 +236,7 @@ if (LOCALE) "${PGR_DOCUMENTATION_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/locale/pot" - COMMAND sphinx-intl update -d ${CMAKE_SOURCE_DIR}/locale -l en,es > locale_changes.txt + COMMAND sphinx-intl update -d ${CMAKE_SOURCE_DIR}/locale -l en > locale_changes.txt #COMMAND sphinx-intl update -p ${CMAKE_SOURCE_DIR}/locale/pot -d ${CMAKE_SOURCE_DIR}/locale --language=${SPHINXINTL_LANGUAGE} #COMMAND sphinx-intl update-txconfig-resources --locale-dir ${CMAKE_SOURCE_DIR}/locale --pot-dir ${CMAKE_SOURCE_DIR}/locale/pot --transifex-project-name pgrouting From c4db1339eb3d0667537cdd85bb533c41398ca8e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 02:24:13 +0000 Subject: [PATCH 7/9] Update locale: commit 5ed805964 --- .../en/LC_MESSAGES/pgrouting_doc_strings.po | 59 +++++-------------- locale/pot/pgrouting_doc_strings.pot | 49 +++++---------- 2 files changed, 29 insertions(+), 79 deletions(-) diff --git a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po index 2ed1b988f76..7d734f4bd03 100644 --- a/locale/en/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/en/LC_MESSAGES/pgrouting_doc_strings.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-23 16:50+0000\n" +"POT-Creation-Date: 2022-09-29 02:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4329,8 +4329,8 @@ msgid "By aggregation of the incoming flow to the targets" msgstr "" msgid "" -":doc:`pgr_maxFlow` is the maximum Flow and that maximum is guaranteed " -"to be the same on the functions :doc:`pgr_pushRelabel`, " +":doc:`pgr_maxFlow` is the maximum Flow and that maximum is guaranteed to " +"be the same on the functions :doc:`pgr_pushRelabel`, " ":doc:`pgr_edmondsKarp`, :doc:`pgr_boykovKolmogorov`, but the actual flow " "through each edge may vary." msgstr "" @@ -9316,7 +9316,7 @@ msgid "" msgstr "" msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, **Combinations SQL**, " +"pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, " "[``directed``])" msgstr "" @@ -9325,11 +9325,6 @@ msgid "" "(i.e :math:`1``)" msgstr "" -msgid "" -"pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, " -"[``directed``])" -msgstr "" - msgid "Optional Parameters" msgstr "" @@ -10559,9 +10554,6 @@ msgid "" "**undirected** graph" msgstr "" -msgid "pgr_dagShortestPath(`Edges SQL`_, Combinations)" -msgstr "" - msgid "Resturn Columns" msgstr "" @@ -11993,27 +11985,6 @@ msgstr "" msgid "pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" -msgid "pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vid**, [``directed``]);" -msgstr "" - -msgid "" -"pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vids**, " -"[``directed``]);" -msgstr "" - -msgid "" -"pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vid**, " -"[``directed``]);" -msgstr "" - -msgid "" -"pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vids**, " -"[``directed``]);" -msgstr "" - -msgid "pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``]);" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" msgstr "" @@ -12664,7 +12635,7 @@ msgid "" "implementation which runs in :math:`\\Theta(V^3)` time," msgstr "" -msgid "pgr floydWarshall(`Edges SQL`_, [``directed``])" +msgid "pgr_floydWarshall(`Edges SQL`_, [``directed``])" msgstr "" msgid "For a directed subgraph with edges :math:`\\{1, 2, 3, 4\\}`." @@ -15865,27 +15836,27 @@ msgstr "" msgid "" "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end " -"vid**, **[options**])" +"vid**, [**options**])" msgstr "" msgid "" "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end " -"vids**, **[options**])" +"vids**, [**options**])" msgstr "" msgid "" "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end " -"vid**, **[options**])" +"vid**, [**options**])" msgstr "" msgid "" "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end " -"vids**, **[options**])" +"vids**, [**options**])" msgstr "" msgid "" "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, " -"**[options**])" +"[**options**])" msgstr "" msgid "**options:** ``[directed, driving_side]``" @@ -15904,17 +15875,17 @@ msgstr "" msgid "" "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end " -"vids**, **[options**])" +"vids**, [**options**])" msgstr "" msgid "" "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end " -"vid**, **[options**])" +"vid**, [**options**])" msgstr "" msgid "" "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end " -"vids**, **[options**])" +"vids**, [**options**])" msgstr "" msgid "" @@ -15924,7 +15895,7 @@ msgstr "" msgid "" "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, " -"**[options**])" +"[**options**])" msgstr "" msgid "Identifier of the starting vertex or point." @@ -15992,7 +15963,7 @@ msgstr "" msgid "" "pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, " -"**[options**])" +"[**options**])" msgstr "" msgid "" diff --git a/locale/pot/pgrouting_doc_strings.pot b/locale/pot/pgrouting_doc_strings.pot index eeb542317d9..491bf7bbc15 100644 --- a/locale/pot/pgrouting_doc_strings.pot +++ b/locale/pot/pgrouting_doc_strings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pgRouting v3.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-23 16:50+0000\n" +"POT-Creation-Date: 2022-09-29 02:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3727,7 +3727,7 @@ msgstr "" msgid "By aggregation of the incoming flow to the targets" msgstr "" -msgid ":doc:`pgr_maxFlow` is the maximum Flow and that maximum is guaranteed to be the same on the functions :doc:`pgr_pushRelabel`, :doc:`pgr_edmondsKarp`, :doc:`pgr_boykovKolmogorov`, but the actual flow through each edge may vary." +msgid ":doc:`pgr_maxFlow` is the maximum Flow and that maximum is guaranteed to be the same on the functions :doc:`pgr_pushRelabel`, :doc:`pgr_edmondsKarp`, :doc:`pgr_boykovKolmogorov`, but the actual flow through each edge may vary." msgstr "" msgid "Capacity edges" @@ -7666,15 +7666,12 @@ msgstr "" msgid "pgr_binaryBreadthFirstSearch(`Edges SQL`_, **start vids**, **end vids**, [``directed``])" msgstr "" -msgid "pgr_binaryBreadthFirstSearch(`Edges SQL`_, **Combinations SQL**, [``directed``])" +msgid "pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" msgid "**Note:** Using the :doc:`sampledata` Network as all weights are same (i.e :math:`1``)" msgstr "" -msgid "pgr_binaryBreadthFirstSearch(`Edges SQL`_, `Combinations SQL`_, [``directed``])" -msgstr "" - msgid "Optional Parameters" msgstr "" @@ -8602,9 +8599,6 @@ msgstr "" msgid "From vertices :math:`\\{5, 15\\}` to vertices :math:`\\{11, 17\\}` on an **undirected** graph" msgstr "" -msgid "pgr_dagShortestPath(`Edges SQL`_, Combinations)" -msgstr "" - msgid "Resturn Columns" msgstr "" @@ -9730,21 +9724,6 @@ msgstr "" msgid "pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``])" msgstr "" -msgid "pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vid**, [``directed``]);" -msgstr "" - -msgid "pgr_edwardMoore(`Edges SQL`_, **start vid**, **end vids**, [``directed``]);" -msgstr "" - -msgid "pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vid**, [``directed``]);" -msgstr "" - -msgid "pgr_edwardMoore(`Edges SQL`_, **start vids**, **end vids**, [``directed``]);" -msgstr "" - -msgid "pgr_edwardMoore(`Edges SQL`_, `Combinations SQL`_, [``directed``]);" -msgstr "" - msgid "https://en.wikipedia.org/wiki/Shortest_Path_Faster_Algorithm" msgstr "" @@ -10270,7 +10249,7 @@ msgstr "" msgid "The Floyd-Warshall algorithm, also known as Floyd's algorithm, is a good choice to calculate the sum of the costs of the shortest path for each pair of nodes in the graph, for *dense graphs*. We use Boost's implementation which runs in :math:`\\Theta(V^3)` time," msgstr "" -msgid "pgr floydWarshall(`Edges SQL`_, [``directed``])" +msgid "pgr_floydWarshall(`Edges SQL`_, [``directed``])" msgstr "" msgid "For a directed subgraph with edges :math:`\\{1, 2, 3, 4\\}`." @@ -12658,19 +12637,19 @@ msgstr "" msgid "Running time: :math:`O(| start\\_vids | * (V \\log V + E))`" msgstr "" -msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, **[options**])" +msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vid**, [**options**])" msgstr "" -msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vids**, **[options**])" +msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vid**, **end vids**, [**options**])" msgstr "" -msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vid**, **[options**])" +msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vid**, [**options**])" msgstr "" -msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vids**, **[options**])" +msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, **start vids**, **end vids**, [**options**])" msgstr "" -msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, **[options**])" +msgid "pgr_withPointsCost(`Edges SQL`_, 'Points SQL`_, `Combinations SQL`_, [**options**])" msgstr "" msgid "**options:** ``[directed, driving_side]``" @@ -12685,19 +12664,19 @@ msgstr "" msgid "From point :math:`1` to vertex :math:`10` with defaults" msgstr "" -msgid "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, **[options**])" +msgid "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vid**, **end vids**, [**options**])" msgstr "" -msgid "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, **[options**])" +msgid "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vid**, [**options**])" msgstr "" -msgid "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, **[options**])" +msgid "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, **start vids**, **end vids**, [**options**])" msgstr "" msgid "From point :math:`15` and vertex :math:`6` to point :math:`3` and vertex :math:`1`" msgstr "" -msgid "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, **[options**])" +msgid "pgr_withPointsCost(`Edges SQL`_, `Points SQL`_, `Combinations SQL`_, [**options**])" msgstr "" msgid "Identifier of the starting vertex or point." @@ -12742,7 +12721,7 @@ msgstr "" msgid "``pgr_withPointsCostMatrix`` - Calculates a cost matrix using :doc:`pgr_withPoints`." msgstr "" -msgid "pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, **[options**])" +msgid "pgr_withPointsCostMatrix(`Edges SQL`_, `Points SQL`_, **start vids**, [**options**])" msgstr "" msgid "Cost matrix for points :math:`\\{1, 6\\}` and vertices :math:`\\{10, 11\\}` on an **undirected** graph" From 5b6d2bdabe3c202a42ea7e8f9d508f5e963c9438 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 28 Sep 2022 21:29:57 -0500 Subject: [PATCH 8/9] [CI] action that only updates the website --- .../{locale-and-website.yml => website.yml} | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) rename .github/workflows/{locale-and-website.yml => website.yml} (84%) diff --git a/.github/workflows/locale-and-website.yml b/.github/workflows/website.yml similarity index 84% rename from .github/workflows/locale-and-website.yml rename to .github/workflows/website.yml index 02e62a8ac36..640a6d671a5 100644 --- a/.github/workflows/locale-and-website.yml +++ b/.github/workflows/website.yml @@ -1,4 +1,4 @@ -name: Update Locale and Website +name: Website on: workflow_dispatch: @@ -14,7 +14,7 @@ jobs: release: permissions: contents: write # for Git to git push - name: Update Locale and Website + name: Update Website runs-on: ubuntu-latest if: ${{ github.repository_owner == 'pgRouting' }} @@ -86,19 +86,6 @@ jobs: git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - - name: Update locale - if: github.ref == 'refs/heads/develop' - run: | - bash tools/transifex/update_locale.sh - - # Add the files, commit and push - for line in `cat build/doc/locale_changes_po_pot.txt`; do git add "$line"; done - git diff --staged --quiet || git commit -m "Update locale: commit ${{ env.GIT_HASH }}" - git fetch origin develop - git restore . # Remove the unstaged changes before rebasing - git rebase origin/develop - git push origin develop - - name: Update Users Documentation run: | From 236812f47e27d122c9c53f668ca8e438eb590360 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Wed, 28 Sep 2022 21:39:54 -0500 Subject: [PATCH 9/9] [CI] update locale does not work on a PR --- .github/workflows/update-locale.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/update-locale.yml b/.github/workflows/update-locale.yml index 908be8086d3..d80e1bedf5f 100644 --- a/.github/workflows/update-locale.yml +++ b/.github/workflows/update-locale.yml @@ -15,14 +15,6 @@ on: branches-ignore: - 'gh-pages' - pull_request: - paths: - - '.github/workflows/update-locale.yml' - - 'doc/**' - - branches-ignore: - - 'gh-pages' - permissions: contents: read