diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml index 8c3bfe8ecc..fb53adbf2a 100644 --- a/.github/workflows/doc-check.yml +++ b/.github/workflows/doc-check.yml @@ -52,7 +52,7 @@ jobs: strategy: fail-fast: false matrix: - language: [en,es,zh_Hans] + language: [en,es,zh_Hans,sv] steps: - uses: actions/checkout@v5 @@ -62,7 +62,7 @@ jobs: - name: check modified files id: check_files run: | - # allways processing english, no matter what the change was + # always processing english, no matter what the change was if [[ "${{ matrix.language }}" == "en" ]]; then echo "PROCESS=true" >> $GITHUB_ENV; exit 0; fi # when this file changes all languages are tested @@ -116,6 +116,7 @@ jobs: mkdir build cd build cmake -DBUILD_LINKCHECK=ON \ + -DSPHINX_FLAGS='-W -v -j auto --keep-going' \ -DPOSTGRESQL_VERSION=${PGVER} .. - name: Check Documentation diff --git a/NEWS.md b/NEWS.md index 273f1a5933..3bea304322 100644 --- a/NEWS.md +++ b/NEWS.md @@ -34,7 +34,8 @@ Documentation build * The doxygen documentation is build by default * The HTML documentation is build by default -* The translated languages (en, es, zh_Hans) HTML documentation is build by default +* The translated languages (en, es, sv, zh_Hans) HTML documentation is build by + default * `WITH-DOC` is not used anymore User's Documentation is not build when diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 56474b5a95..f5ca9064e7 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -61,7 +61,7 @@ add_custom_target(doc ALL COMMENT "Building documentation with Sphinx") #--------------------------------------------- # LANGUAGES SETTINGS #--------------------------------------------- -list(APPEND PROJECT_LANGUAGES_TRANSLATED "EN" "ES" "ZH_HANS") +list(APPEND PROJECT_LANGUAGES_TRANSLATED "EN" "ES" "SV" "ZH_HANS") list(APPEND PROJECT_LANGUAGES "de" "en" "es" "ja" "ko" "sv" "zh_Hans") foreach(lang ${PROJECT_LANGUAGES}) diff --git a/doc/_static/page_history.js b/doc/_static/page_history.js index cadff18276..6fca23a5c9 100644 --- a/doc/_static/page_history.js +++ b/doc/_static/page_history.js @@ -5,11 +5,12 @@ function createInfo(file, newat, altnames = '', removedat = '') { this.removedat = removedat; } -const versionsArr = ['4.0', '3.8','3.7', '3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0']; -var unsuportedArr = ['2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0']; +const versionsArr = ['4.0']; +var unsuportedArr = ['3.8','3.7', '3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0','2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0']; var titles = [ {k: 'en', v: ['Supported versions', 'Unsupported versions']}, {k: 'es', v: ['Versiones soportadas', 'Versiones no soportadas']}, + {k: 'sv', v: ['understödda versioner', 'Viversioner som inte stöds']}, {k: 'zh-Hans', v: ['Supported versions', 'Unsupported versions']}, ]; @@ -323,9 +324,6 @@ function get_history(name, lang) { if (versionsArr[i] < data.newat) break; if (data.removedat != '' && versionsArr[i] > data.newat) break; - /* for zh-Hans non translated versions use english */ - validlang = (lang == 'zh-Hans' && versionsArr[i] >= '3.7')? 'zh_Hans' : 'en'; - let link = `${home}${versionsArr[i]}/` link += get_vdata(data.altnames, versionsArr[i], data.file, validlang); if (versionsArr[i] == latest) result += '(' + link + ') '; @@ -342,6 +340,10 @@ function get_history(name, lang) { /* for spanish non translated versions use english */ validlang = (lang == 'es' && unsuportedArr[i] == '2.0')? 'es' : validlang; + /* for zh-Hans non translated versions use english */ + validlang = (lang == 'zh-Hans' && versionsArr[i] >= '3.7')? 'zh_Hans' : 'en'; + /* for swedish non translated versions use english */ + validlang = (lang == 'sv' && versionsArr[i] >= '4.0')? 'sv' : 'en'; if (data.newat > unsuportedArr[i]) break; var link = home + unsuportedArr[i] + '/'; @@ -351,4 +353,3 @@ function get_history(name, lang) { } return result; } - diff --git a/doc/src/pgRouting-installation.rst b/doc/src/pgRouting-installation.rst index b74930d026..405c5a2140 100644 --- a/doc/src/pgRouting-installation.rst +++ b/doc/src/pgRouting-installation.rst @@ -230,7 +230,8 @@ BUILD_MAN BOOL=OFF If ON, turn on/off building MAN pages DOC_USE_BOOTSTRAP BOOL=OFF If ON, use sphinx-bootstrap for HTML pages of the users documentation EN BOOL=ON if OFF the English documentation will no be built -ES BOOL=ON if OFF the Spaish documentation will no be built +ES BOOL=ON if OFF the Spanish documentation will no be built +SV BOOL=ON if OFF the Swedish documentation will no be built ZH_HANS BOOL=ON if OFF the Chinese simplified documentation will no be built ================== ========= ============================ diff --git a/doc/src/pgRouting-introduction.rst b/doc/src/pgRouting-introduction.rst index fa79aa18c5..e2f965584d 100644 --- a/doc/src/pgRouting-introduction.rst +++ b/doc/src/pgRouting-introduction.rst @@ -80,7 +80,18 @@ pgRouting, pgRoutingLayer, workshop. Translators (in alphabetical order) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Dapeng Wang +Chinese: + +- Dapeng Wang + +Spanish: + +- Vicky Vergara + +Swedish: + +- Daniel Nylander + Corporate Sponsors in this release (in alphabetical order) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index 30399d42ea..3532189fe0 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -69,7 +69,8 @@ Documentation build * The doxygen documentation is build by default * The HTML documentation is build by default -* The translated languages (en, es, zh_Hans) HTML documentation is build by default +* The translated languages (en, es, sv, zh_Hans) HTML documentation is build by + default * `WITH-DOC` is not used anymore User's Documentation is not build when diff --git a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po index 35c322f6cd..0e82f9da23 100644 --- a/locale/es/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/es/LC_MESSAGES/pgrouting_doc_strings.po @@ -8393,7 +8393,7 @@ msgid "Fixing a gap" msgstr "" msgid "Routing from :math:`1` to :math:`2` gives no solution." -msgstr "La ruta de :math:`1` a :math:`2`no da ninguna solución." +msgstr "La ruta de :math:`1` a :math:`2` no da ninguna solución." msgid "Analyze the network for gaps." msgstr "Analizar la red por espacios." diff --git a/locale/sv/LC_MESSAGES/pgrouting_doc_strings.po b/locale/sv/LC_MESSAGES/pgrouting_doc_strings.po index 032ed63b62..682c72dbd9 100644 --- a/locale/sv/LC_MESSAGES/pgrouting_doc_strings.po +++ b/locale/sv/LC_MESSAGES/pgrouting_doc_strings.po @@ -65,13 +65,13 @@ msgid "Description" msgstr "Beskrivning" msgid "`Edges SQL`_" -msgstr "`Edges SQL`_" +msgstr "`Kanter SQL`_" msgid "``TEXT``" msgstr "``TEXT``" msgid "`Edges SQL`_ as described below." -msgstr "`Edges SQL`_ enligt beskrivningen nedan." +msgstr "`Kanter SQL`_ enligt beskrivningen nedan." msgid "**root vid**" msgstr "**root vid**" @@ -108,16 +108,16 @@ msgid "Where:" msgstr "Var:" msgid "ANY-INTEGER" -msgstr "ANY-INTEGER" +msgstr "ANY-TAL" msgid "SMALLINT, INTEGER, BIGINT" -msgstr "SMALLINT, HELTAL, BIGINT" +msgstr "SMALLINT, INTEGER, BIGINT" msgid "ANY-NUMERIC" msgstr "VALFRI NUMERISK" msgid "SMALLINT, INTEGER, BIGINT, REAL, FLOAT, NUMERIC" -msgstr "SMALLINT, HELTAL, BIGINT, REAL, FLOAT, NUMERISK" +msgstr "SMALLINT, INTEGER, BIGINT, REAL, FLOAT, NUMERIC" msgid "BFS optional parameters" msgstr "Valfria parametrar för BFS" @@ -457,13 +457,13 @@ msgstr "" "algoritmen kan passera två gånger på samma vertex." msgid "`Edges SQL`_ query as described." -msgstr "`Edges SQL`_-fråga enligt beskrivningen." +msgstr "`Kanter SQL`_-fråga enligt beskrivningen." msgid "`Restrictions SQL`_" -msgstr "\"Begränsningar SQL" +msgstr "`Begränsningar SQL`_" msgid "`Restrictions SQL`_ query as described." -msgstr "`Restrictions SQL`_-fråga enligt beskrivningen." +msgstr "`Begränsningar SQL`_-fråga enligt beskrivningen." msgid "**via vertices**" msgstr "**via toppar**" @@ -858,16 +858,16 @@ msgid "Used in :doc:`pgr_pickDeliverEuclidean`" msgstr "Används i :doc:`pgr_pickDeliverEuclidean`" msgid "`Orders SQL`_" -msgstr "beställningar SQL" +msgstr "`beställningar SQL`_" msgid "`Orders SQL`_ as described below." -msgstr "`Orders SQL`_ enligt beskrivningen nedan." +msgstr "`beställningar SQL`_ enligt beskrivningen nedan." msgid "`Vehicles SQL`_" -msgstr "fordon SQL" +msgstr "`Fordon SQL`_" msgid "`Vehicles SQL`_ as described below." -msgstr "`Vehicles SQL`_ enligt beskrivningen nedan." +msgstr "`Fordon SQL`_ enligt beskrivningen nedan." msgid "Used in :doc:`pgr_pickDeliver`" msgstr "Används i :doc:`pgr_pickDeliver`" @@ -938,13 +938,13 @@ msgstr "" "fram" msgid "Orders SQL" -msgstr "Beställningar SQL" +msgstr "`beställningar SQL`_" msgid "Common columns for the orders SQL in both implementations:" msgstr "Gemensamma kolumner för order SQL i båda implementationerna:" msgid "|ANY-INTEGER|" -msgstr "|ANY-INTEGER" +msgstr "|ANY-INTEGER|" msgid "Identifier of the pick-delivery order pair." msgstr "Identifierare för orderparet plockning-leverans." @@ -953,7 +953,7 @@ msgid "``demand``" msgstr "``efterfrågan``" msgid "|ANY-NUMERICAL|" -msgstr "|ANY-NUMERISK|" +msgstr "|ANY-NUMERICAL|" msgid "Number of units in the order" msgstr "Antal enheter i ordern" @@ -1181,7 +1181,7 @@ msgid "Matrix SQL" msgstr "Matrix SQL" msgid "Set of |matrix-result|" -msgstr "Uppsättning av |matris-resultat|" +msgstr "Uppsättning av |matrix-result|" msgid "Identifier of the starting vertex." msgstr "Identifierare för startvertexen." @@ -1398,16 +1398,16 @@ msgstr "" "beaktas." msgid "`Capacity and Demand Units Handling`_" -msgstr "\"Hantering av enheter för kapacitet och efterfrågan" +msgstr "`Hantering av kapacitets- och efterfrågeenheter`_" msgid "`Locations`_" msgstr "`Lokaliseringar`_" msgid "`Time Handling`_" -msgstr "tidshantering" +msgstr "`Tidshantering`_" msgid "`Factor Handling`_" -msgstr "\"Faktorhantering" +msgstr "`Faktorhantering`_" msgid "Capacity and Demand Units Handling" msgstr "Hantering av kapacitets- och efterfrågeenheter" @@ -1587,7 +1587,7 @@ msgid ":math:`7.5*60 = 540`" msgstr ":math:`7.5*60 = 540`" msgid "Factor handling" -msgstr "Hantering av faktorer" +msgstr "Faktorhantering" msgid "" "``factor`` acts as a multiplier to convert from distance values to time " @@ -1983,7 +1983,7 @@ msgid "When `start_vid` = `end_vid`, the `agg_cost` = 0." msgstr "När `start_vid` = `slut_vid` är `agg_cost` = 0." msgid "**Recommended, use a bounding box of no more than 3500 edges.**" -msgstr "**Rekommendation: använd en avgränsande box med högst 3500 kanter" +msgstr "**Rekommendation: använd en avgränsande box med högst 3500 kanter**" msgid "Optional parameters" msgstr "Valfria parametrar" @@ -2920,7 +2920,7 @@ msgstr "Färg på noden." msgid "" "`Boost: `__" msgstr "" -"`Boost: `____" +"`Boost: `__" msgid "Components - Family of functions" msgstr "Komponenter - Familj av funktioner" @@ -3200,7 +3200,7 @@ msgid "Used in:" msgstr "Används i:" msgid "`Edges SQL`_ as described below" -msgstr "`Edges SQL`_ enligt beskrivningen nedan" +msgstr "`Kanter SQL`_ enligt beskrivningen nedan" msgid "**start vids**" msgstr "**starta videor**" @@ -3624,7 +3624,7 @@ msgid "**Root vids**" msgstr "**Root vids**" msgid "``ARRAY[ANY-INTEGER]``" -msgstr "``ARRAY[VALFRITT HELTAL]``" +msgstr "``ARRAY[ANY-TAL]``" msgid "**distance**" msgstr "**Distans**" @@ -3633,7 +3633,7 @@ msgid "Upper limit for the inclusion of a node in the result." msgstr "Övre gräns för när en nod ska inkluderas i resultatet." msgid "Returns set of |result-spantree|" -msgstr "Returnerar uppsättning av |resultat-spantree|" +msgstr "Returnerar uppsättning av |result-spantree|" msgid ":math:`depth-1` is the depth of ``pred``" msgstr ":math:`depth-1` is the depth of ``pred``" @@ -4266,7 +4266,7 @@ msgid ":doc:`withPoints-family` - Functions based on Dijkstra algorithm." msgstr ":doc:`withPoints-family` - Functions based on Dijkstra algorithm." msgid "From the :doc:`TRSP-family`:" -msgstr "Från :doc:`TRSP-familjen`:" +msgstr "Från :doc:`TRSP-familjen `:" msgid "Available Functions but not official pgRouting functions" msgstr "Tillgängliga funktioner men inte officiella pgRouting-funktioner" @@ -4314,7 +4314,7 @@ msgid "pgr_bdDijkstra" msgstr "pgr_bdDijkstra" msgid "Output columns standardized to |short-generic-result|" -msgstr "Utdatakolumner standardiserade till |kort-generiskt-resultat|" +msgstr "Utdatakolumner standardiserade till |short-generic-result|" msgid "pgr_bdDijkstraCost" msgstr "pgr_bdDijkstraCost" @@ -4341,7 +4341,7 @@ msgid ":" msgstr ":" msgid "Standardizing output columns to |result-spantree|" -msgstr "Standardisering av utdatakolumner till |resultat-spantree|" +msgstr "Standardisering av utdatakolumner till |result-spantree|" msgid "pgr_contraction" msgstr "pgr_contraction" @@ -4374,7 +4374,7 @@ msgid "pgr_edgeDisjointPaths" msgstr "pgr_edgeDisjointPaths" msgid "Output columns standardized to |generic-result|" -msgstr "Utdatakolumner standardiserade till |generiskt resultat" +msgstr "Utdatakolumner standardiserade till |generic-result|" msgid "pgr_edmondsKarp" msgstr "pgr_edmondsKarp" @@ -4484,7 +4484,7 @@ msgid "pgr_turnRestrictedPath" msgstr "pgr_turnRestrictedPath" msgid "Output columns standardized to |nksp-result|" -msgstr "Utdatakolumner standardiserade till |nksp-resultat|" +msgstr "Utdatakolumner standardiserade till |nksp-result|" msgid "pgr_withPoints" msgstr "pgr_withPoints" @@ -4511,7 +4511,7 @@ msgid "**Driving side** parameter is unnamed and compulsory." msgstr "*parametern *Driving side** är inte namngiven och är obligatorisk." msgid "Output columns standardized to |matrix-result|" -msgstr "Utmatningskolumner standardiserade till |matris-resultat" +msgstr "Utmatningskolumner standardiserade till |matrix-result|" msgid "pgr_withpointscost(text,text,anyarray,anyarray,boolean,character)" msgstr "pgr_withpointscost(text,text,anyarray,anyarray,boolean,character)" @@ -4781,7 +4781,7 @@ msgstr "" "pgr_DAGshortestPath" msgid "Standardized to |matrix-result|" -msgstr "Standardiserat till |matris-resultat" +msgstr "Standardiserat till |matrix-result|" msgid "" "`#2905 `__ " @@ -4798,7 +4798,7 @@ msgstr "" "pgr_withPointsCostMatrix" msgid "Standardized to |generic-result|" -msgstr "Standardiserat till |generiskt-resultat|" +msgstr "Standardiserat till |generic-result|" msgid "" "`#2909 `__ " @@ -4840,7 +4840,7 @@ msgstr "" "pgr_sequentialVertexColoring" msgid "Standardized to |result-spantree|" -msgstr "Standardiserad till |resultat-spantree|" +msgstr "Standardiserad till |result-spantree|" msgid "" "`#2931 `__ " @@ -5567,19 +5567,19 @@ msgid ":ref:`pgRouting-concepts:Result columns for cost functions`" msgstr ":ref:`pgRouting-concepts:Result columns for cost functions`" msgid "|matrix-result|" -msgstr "|matris-resultat" +msgstr "|matrix-result|" msgid ":ref:`pgRouting-concepts:Result columns for single path functions`" msgstr ":ref:`pgRouting-concepts:Result columns for single path functions`" msgid "|short-generic-result|" -msgstr "|kort-generiskt-resultat|" +msgstr "|short-generic-result|" msgid ":ref:`pgRouting-concepts:Result columns for spanning tree functions`" msgstr ":ref:`pgRouting-concepts:Result columns for spanning tree functions`" msgid "|result-spantree|" -msgstr "|resultat-spantree|" +msgstr "|result-spantree|" msgid "Function" msgstr "Funktion" @@ -5600,7 +5600,7 @@ msgid ":doc:`pgr_drivingDistance`" msgstr ":doc:`pgr_drivingDistance`" msgid "`Migration of spanning tree functions`_" -msgstr "`Migration av funktioner för spänningsträd" +msgstr "`Migration av funktioner för spänningsträd`_" msgid ":doc:`pgr_withPointsDD`" msgstr ":doc:`pgr_withPointsDD`" @@ -5615,7 +5615,7 @@ msgid ":doc:`pgr_bipartite`" msgstr ":doc:`pgr_bipartite`" msgid "`Migration of output column name change`_" -msgstr "`Migrering av namnändring för utdatakolumn`" +msgstr "`Migrering av namnändring för utdatakolumn`_" msgid ":doc:`pgr_breadthFirstSearch`" msgstr ":doc:`pgr_breadthFirstSearch`" @@ -5627,7 +5627,7 @@ msgid ":doc:`pgr_edgeColoring`" msgstr ":doc:`pgr_edgeColoring`" msgid "`Migration of multiple paths functions`_" -msgstr "`Migrering av funktioner för flera sökvägar`" +msgstr "`Migrering av funktioner för flera sökvägar`_" msgid ":doc:`pgr_sequentialVertexColoring`" msgstr ":doc:`pgr_sequentialVertexColoring`" @@ -5648,8 +5648,8 @@ msgid "" "The standardized :ref:`pgRouting-concepts:Result columns for cost functions` " "are |matrix-result|" msgstr "" -"De standardiserade :ref:`pgRouting-concepts:Result-kolumnerna för " -"kostnadsfunktioner` är |matrix-result|" +"De standardiserade :ref:`pgRouting-concepts:Result columns for cost functions` " +"är |matrix-result|" msgid "" "The following functions need to be migrated when they are being used in an " @@ -5669,13 +5669,13 @@ msgid "v < 4.0" msgstr "v < 4.0" msgid "|matrix-pid|" -msgstr "|matris-pid|" +msgstr "|matrix-pid|" msgid "``pgr_withPointsCostMatrix``" msgstr "``pgr_medPunkterKostnadsmatris``" msgid "**to** |matrix-result|" -msgstr "**till** |matris-resultat|" +msgstr "**till** |matrix-result|" msgid "Migration of |matrix-pid|" msgstr "Migrering av |matrix-pid|" @@ -5709,7 +5709,7 @@ msgstr "" "uppdatering av pgRouting" msgid "New output columns are |matrix-result|" -msgstr "Nya utdatakolumner är |matris-resultat|" +msgstr "Nya utdatakolumner är |matrix-result|" msgid "" "To get the old version column names: rename ``start_vid`` to ``start_pid`` " @@ -5787,8 +5787,8 @@ msgid "" "The standardized :ref:`pgRouting-concepts:Result columns for single path " "functions` are |nksp-result|" msgstr "" -"De standardiserade :ref:`pgRouting-concepts:Result-kolumnerna för funktioner " -"med en enda sökväg` är |nksp-result|" +"De standardiserade :ref:`pgRouting-concepts:Result columns for single path " +"functions` är |nksp-result|" msgid "``pgr_KSP``" msgstr "``pgr_KSP``" @@ -5806,13 +5806,13 @@ msgid ":ref:`from_result_disjoint`" msgstr ":ref:`from_result_disjoint`" msgid "Migration of |ksp-result|" -msgstr "Migrering av |ksp-resultat|" +msgstr "Migrering av |ksp-result|" msgid "|nksp-result|" -msgstr "|nksp-resultat|" +msgstr "|nksp-result|" msgid "Before updating pgRouting, enumerate the |ksp-result|" -msgstr "Innan du uppdaterar pgRouting, räkna upp |ksp-resultatet" +msgstr "Innan du uppdaterar pgRouting, räkna upp |ksp-result|" msgid "One to One example using ``pgr_KSP``" msgstr "Ett till ett exempel med hjälp av ``pgr_KSP``" @@ -5825,10 +5825,10 @@ msgstr "" "html#signatures>`__ exemplet." msgid "Migration of |result-disjoint|" -msgstr "Migrering av |resultat-disjoint|" +msgstr "Migrering av |result-disjoint|" msgid "Before updating pgRouting, enumerate the |result-disjoint|" -msgstr "Innan du uppdaterar pgRouting, räkna upp |resultat-disjunkta|" +msgstr "Innan du uppdaterar pgRouting, räkna upp |result-disjoint|" msgid "Skip when applicable, ``start_vid``" msgstr "Hoppa över när det är tillämpligt, ``start_vid``" @@ -5847,7 +5847,7 @@ msgstr "" "pgr_edgeDisjointPaths.html#one-to-one>`__ exempel." msgid "Before updating pgRouting enumerate the columns: |ksp-result|" -msgstr "Innan du uppdaterar pgRouting räkna upp kolumnerna: |ksp-resultat|" +msgstr "Innan du uppdaterar pgRouting räkna upp kolumnerna: |ksp-result|" msgid "Migration of single path functions" msgstr "Migrering av funktioner med en enda sökväg" @@ -5856,8 +5856,8 @@ msgid "" "The standardized :ref:`pgRouting-concepts:Result columns for single path " "functions` are |short-generic-result|" msgstr "" -"De standardiserade :ref:`pgRouting-concepts:Result-kolumnerna för funktioner " -"med en enda sökväg` är |short-generic-result|" +"De standardiserade :ref:`pgRouting-concepts:Result columns for single path " +"functions` är |short-generic-result|" msgid "``pgr_dijkstra``" msgstr "``pgr_dijkstra``" @@ -5866,7 +5866,7 @@ msgid "v < 3.5" msgstr "v < 3.5" msgid "|old-generic-result|" -msgstr "|old-generiskt-resultat|" +msgstr "|old-generic-result|" msgid "``pgr_aStar``" msgstr "``pgr_aStar``" @@ -5881,7 +5881,7 @@ msgid "``pgr_dagShortestPath``" msgstr "``pgr_dagShortestPath``" msgid "|result-1-1|" -msgstr "|resultat-1-1|" +msgstr "|result-1-1|" msgid "``pgr_edwardMoore``" msgstr "``pgr_edwardMoore``" @@ -5890,7 +5890,7 @@ msgid "``pgr_withPoints``" msgstr "``pgr_medPunkter``" msgid "|old-pid-result|" -msgstr "|old-pid-resultat|" +msgstr "|old-pid-result|" msgid "Migration of |old-generic-result|" msgstr "Migrering av |old-generic-result|" @@ -5902,7 +5902,7 @@ msgstr "" "Innan du uppdaterar pgRouting, räkna upp motsvarande kolumner i signaturen" msgid "Migration of |old-pid-result|" -msgstr "Migrering av |old-pid-resultat|" +msgstr "Migrering av |old-pid-result|" msgid "To get the old version column names, depending on the signature:" msgstr "För att få den gamla versionen kolumnnamn, beroende på signaturen:" @@ -5927,7 +5927,7 @@ msgstr "" "av pgRouting" msgid "Migration of |result-1-1|" -msgstr "Migrering av |resultat-1-1|" +msgstr "Migrering av |result-1-1|" msgid "To get the old version column names:" msgstr "För att få kolumnnamnen i den gamla versionen:" @@ -5949,7 +5949,7 @@ msgstr "" "html#one-to-one>`__ exempel." msgid "Before updating pgRouting enumerate the columns: |result-1-1|" -msgstr "Innan du uppdaterar pgRouting räkna upp kolumnerna: |resultat-1-1|" +msgstr "Innan du uppdaterar pgRouting räkna upp kolumnerna: |result-1-1|" msgid "Using ``pgr_bdDijkstra``" msgstr "Använda ``pgr_bdDijkstra``" @@ -5988,7 +5988,7 @@ msgstr "" "html#one-to-many>`__ exempel." msgid "Before updating pgRouting enumerate the columns: |result-1-m|" -msgstr "Innan uppdatering av pgRouting räknas kolumnerna upp: |resultat-1-m|" +msgstr "Innan uppdatering av pgRouting räknas kolumnerna upp: |result-1-m|" msgid "Using ``pgr_withPoints``" msgstr "Använda ``pgr_withPoints``" @@ -6021,7 +6021,7 @@ msgstr "" "html#many-to-one>`__ exempel." msgid "Before updating pgRouting enumerate the columns: |result-m-1|" -msgstr "Innan uppdatering av pgRouting räknas kolumnerna upp: |resultat-m-1|" +msgstr "Innan uppdatering av pgRouting räknas kolumnerna upp: |result-m-1|" msgid "Using ``pgr_dijkstra``" msgstr "Använda ``pgr_dijkstra``" @@ -6063,8 +6063,8 @@ msgid "" "The standardized :ref:`pgRouting-concepts:Result columns for spanning tree " "functions` are |result-spantree|" msgstr "" -"De standardiserade :ref:`pgRouting-concepts:Result-kolumnerna för spanning " -"tree-funktioner` är |result-spantree|" +"De standardiserade :ref:`pgRouting-concepts:Result columns for spanning tree " +"functions` är |result-spantree|" msgid "``pgr_drivingDistance``" msgstr "``pgr_drivingDistance``" @@ -6112,7 +6112,7 @@ msgid "``pgr_depthFisrtSearch``" msgstr "``pgr_djupFisrtSearch``" msgid "to |result-spantree|" -msgstr "till |resultat-spantree|" +msgstr "till |result-spantree|" msgid "Migration from |result-bfs|." msgstr "Migrering från |result-bfs|." @@ -6124,7 +6124,7 @@ msgid "Multiple vertices" msgstr "Flera hörn" msgid "Before updating pgRouting enumerate the columns: |result-bfs|" -msgstr "Innan uppdatering av pgRouting räknas kolumnerna upp: |resultat-bfs|" +msgstr "Innan uppdatering av pgRouting räknas kolumnerna upp: |result-bfs|" msgid "Single vertex example using ``pgr_kruskalDD``" msgstr "Exempel på enstaka toppar med ``pgr_kruskalDD``" @@ -6137,7 +6137,7 @@ msgstr "" "html#single-vertex>`__ exempel." msgid "Before updating pgRouting enumerate the columns: |result-bfs|." -msgstr "Innan uppdatering av pgRouting räknas kolumnerna upp: |resultat-bfs|." +msgstr "Innan uppdatering av pgRouting räknas kolumnerna upp: |result-bfs|." msgid "Multiple vertices example using ``pgr_kruskalDFS``" msgstr "Exempel på flera vertikaler med hjälp av ``pgr_kruskalDFS``" @@ -6150,7 +6150,7 @@ msgstr "" "html#multiple-vertices>`__ exempel." msgid "Migration from |result-dij-dd|" -msgstr "Migrering från |resultat-dij-dd|" +msgstr "Migrering från |result-dij-dd|" msgid "Migration depends on the signature." msgstr "Migrationen beror på signaturen." @@ -6168,7 +6168,7 @@ msgid "Changes must be done after updating pgRouting." msgstr "Ändringar måste göras efter uppdatering av pgRouting." msgid "To get the old version column names |result-dij-dd-m|:" -msgstr "För att få den gamla versionens kolumnnamn |resultat-dij-dd-m|:" +msgstr "För att få den gamla versionens kolumnnamn |result-dij-dd-m|:" msgid "filter out the column ``pred`` and ``depth`` and" msgstr "filtrera bort kolumnen ``pred`` och ``depth`` och" @@ -6187,7 +6187,7 @@ msgstr "" "pgr_drivingDistance.html#single-vertex>`__ exempel." msgid "Before updating pgRouting, enumerate |result-1-1-no-seq| columns" -msgstr "Innan du uppdaterar pgRouting, räkna upp kolumnerna |result-1-1-no-seq" +msgstr "Innan du uppdaterar pgRouting, räkna upp kolumnerna |result-1-1-no-seq|" msgid "Multiple vertices example using ``pgr_drivingDistance``" msgstr "Exempel på flera toppar med hjälp av ``pgr_drivingDistance``" @@ -6224,7 +6224,7 @@ msgstr "" "**avstånd**." msgid "Enumerate |result-m-1-no-seq| columns" -msgstr "Räkna upp |resultat-m-1-no-seq|-kolumner" +msgstr "Räkna upp |result-m-1-no-seq|-kolumner" msgid "Validity of **driving side** parameter" msgstr "Giltighet för parametern **förarsida**" @@ -6275,10 +6275,10 @@ msgid "The standardized result columns:" msgstr "De standardiserade resultatkolumnerna:" msgid "|result_edge_color|" -msgstr "|resultat_kant_färg|" +msgstr "|result_edge_color|" msgid "|result_node_color|" -msgstr "|resultat_node_färg|" +msgstr "|result_node_color|" msgid "|result_node_order|" msgstr "|result_node_order|" @@ -6342,7 +6342,7 @@ msgid "Migration from |old-edge-color|" msgstr "Migrering från |old-edge-color|" msgid "Migration to: |result_edge_color|" -msgstr "Migration till: |resultat_kant_färg|" +msgstr "Migration till: |result_edge_color|" msgid "Rename ``edge_id`` to ``edge`` and ``color_id`` to ``color``." msgstr "Byt namn på ``edge_id`` till ``edge`` och ``color_id`` till ``color``." @@ -6351,7 +6351,7 @@ msgid "Migration from |old-node-color|" msgstr "Migrering från |old-node-color|" msgid "Migration to: |result_node_color|" -msgstr "Migration till: |resultat_node_färg|" +msgstr "Migration till: |result_node_color|" msgid "Rename ``vertex_id`` to ``node`` and ``color_id`` to ``color``." msgstr "" @@ -6690,7 +6690,7 @@ msgid ":doc:`pgr_trsp`" msgstr ":doc:`pgr_trsp`" msgid "`Migration of restrictions`_" -msgstr "\"Flyttning av restriktioner" +msgstr "`Flyttning av restriktioner`_" msgid "Use ``pgr_dijkstra`` when there are no restrictions." msgstr "Använd ``pgr_dijkstra`` när det inte finns några begränsningar." @@ -6784,10 +6784,10 @@ msgstr "" "doc:`pgr_withPointsKSP` standardiseras resultatkolumnerna." msgid "|ksp-result|" -msgstr "|ksp-resultat|" +msgstr "|ksp-result|" msgid "|generic-result|" -msgstr "|generiskt resultat|" +msgstr "|generic-result|" msgid "" "And ``driving side`` parameter changed from named optional to unnamed " @@ -6799,13 +6799,13 @@ msgstr "" "för riktade och oriktade grafer." msgid "``pgr_withPointsKSP`` (`One to One`)" -msgstr "``pgr_withPointsKSP`` (`One to One`)" +msgstr "``pgr_withPointsKSP`` (`En till en`)" msgid "Before Migration" msgstr "Före migration" msgid "Output columns were |old-pid-result|" -msgstr "Utgångskolumnerna var |old-pid-resultat|" +msgstr "Utgångskolumnerna var |old-pid-result|" msgid "the columns ``start_vid`` and ``end_vid`` do not exist." msgstr "kolumnerna ``start_vid`` och ``end_vid`` finns inte." @@ -6817,7 +6817,7 @@ msgid "Be aware of the existence of the additional result Columns." msgstr "Var medveten om att det finns ytterligare resultat Kolumner." msgid "New output columns are |generic-result|" -msgstr "Nya utdatakolumner är |generiskt-resultat|" +msgstr "Nya utdatakolumner är |generic-result|" msgid "" "Using `this /dev/null || exit 1 +# IMPORTANT +# Copy this file into the root of your repository +# Adjust to your developing needs +# - Some example of adjustments are mentioned -# copy this file into the root of your repository -# adjust to your needs - -# This run.sh is intended for 3.x.x +# This run.sh is intended for 4.x.x VERSION=$(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) -# For macOS Homebrew + +# EXAMPLE: For macOS Homebrew instead of the above use with ggrep as follows # VERSION=$(ggrep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) + echo "pgRouting VERSION ${VERSION}" # set up your postgres version, port and compiler (if more than one) -# For macOS Homebrew comment the line +# EXAMPLE: For macOS Homebrew this line is not needed PGVERSION="15" PGBIN="/usr/lib/postgresql/${PGVERSION}/bin" -# For macOS Homebrew + +# EXAMPLE: For macOS Homebrew it has a different path # PGBIN="/opt/homebrew/bin" PGPORT="5432" + # When more than one compiler is installed GCC="" +# -------------- documentation queries and tap tests --------------- + +# To process all subdirectories QUERIES_DIRS=$(ls -1 docqueries) TAP_DIRS=$(ls -1 pgtap) +# To process a particular subdirectory QUERIES_DIRS="dijkstra" TAP_DIRS="dijkstra" +# To skip processing queries and tap tests +QUERIES_DIRS="" +TAP_DIRS="" + function set_cmake { - # Using all defaults - #cmake .. + # inspect options + # cmake -LH .. + + # Building using clang + #CXX=clang++ CC=clang cmake -DPOSTGRESQL_BIN=${PGBIN} .. + + # Building using default compiler (g++) + #cmake -DPOSTGRESQL_BIN=${PGBIN} .. # Options Release RelWithDebInfo MinSizeRel Debug - #cmake -DCMAKE_BUILD_TYPE=Debug .. + #cmake -DCMAKE_BUILD_TYPE=Debug .. - # Additional debug information - #cmake -DPgRouting_DEBUG=ON -DCMAKE_BUILD_TYPE=Debug .. + # Build documentation with booststrap + #cmake -DDOC_USE_BOOTSTRAP=ON .. - # with documentation (like the one the website) - #cmake -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON .. + # Build only english documentation + #cmake -DES=OFF -DZH_HANS=OFF .. - # with developers documentation - #cmake -DWITH_DOC=ON -DBUILD_DOXY=ON .. + # sphinx flags + #cmake -DSPHINX_FLAGS='-E -W' .. - # using a particular PostgreSQL configuration - #cmake -DPOSTGRESQL_PG_CONFIG="/usr/lib/postgresql/${PGVERSION}/bin/pg_config" .. + # Dont build documentation + #cmake -DBUILD_HTML=OFF .. - # Building using clang - #CXX=clang++ CC=clang cmake -DPOSTGRESQL_BIN=${PGBIN} -DCMAKE_BUILD_TYPE=Debug -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=OFF .. + # Additional debug information + #cmake -DPROJECT_DEBUG=ON .. + + # For some checks + #cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .. - # Building with debug on - #cmake -DPOSTGRESQL_BIN=${PGBIN} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DBUILD_LATEX=ON -DCMAKE_BUILD_TYPE=Debug -DES=ON -DPROJECT_DEBUG=ON .. + # build developers documentation + #cmake -DBUILD_DOXY=ON .. - # building languages -DES=ON -DJA=ON -DZH_HANS=ON -DDE=ON -DKO=ON and CMAKE_EXPORT_COMPILE_COMMANDS for static analysis tools. - #cmake -DPOSTGRESQL_BIN=${PGBIN} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DBUILD_LATEX=ON -DES=ON -DCMAKE_BUILD_TYPE=Debug .. + # build all languages (all others are on by default) + #cmake -DDOC_USE_BOOTSTRAP=ON -DJA=ON -DDE=ON -DKO=ON .. + + # build one language for checking warnings, for example swedish + cmake -DDOC_USE_BOOTSTRAP=ON -DBUILD_HTML=ON -DEN=ON -DES=OFF -DSV=ON -DZH_HANS=OFF -DSPHINX_FLAGS='-W -w sphinx-errs.txt -v -n -j auto --keep-going' .. # check link in documentation - #cmake -DPOSTGRESQL_BIN=${PGBIN} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DES=ON -DLINKCHECK=ON -DCMAKE_BUILD_TYPE=Release .. + #cmake -DBUILD_LINKCHECK=ON .. + + # build locale + #cmake -DBUILD_LOCALE=ON .. + + # Put all options into one convenient line + cmake -DPOSTGRESQL_BIN=${PGBIN} -DCMAKE_BUILD_TYPE=Debug -DBUILD_HTML=ON -DES=OFF -DZH_HANS=OFF -DSV=OFF -DDOC_USE_BOOTSTRAP=ON .. + + # Working with code only + cmake -DPOSTGRESQL_BIN=${PGBIN} -DCMAKE_BUILD_TYPE=Debug -DBUILD_HTML=OFF .. - # build only english - cmake -DPOSTGRESQL_BIN=${PGBIN} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DBUILD_LATEX=ON -DCMAKE_BUILD_TYPE=Debug .. + # Use clang tidy + #cmake -DUSE_CLANG_TIDY=ON .. } function tap_test { @@ -91,7 +125,6 @@ function tap_test { dropdb --if-exists -p $PGPORT ___pgr___test___ createdb -p $PGPORT ___pgr___test___ - echo $PGPORT tools/testers/pg_prove_tests.sh "$PGUSER" $PGPORT dropdb -p $PGPORT ___pgr___test___ } @@ -124,9 +157,10 @@ function set_compiler { function build_doc { pushd build > /dev/null || exit 1 - #rm -rf doc/* ; rm -rf locale/*/*/*.mo + # Start from scratch + #rm -rf locale/*/*/*.mo # Clean only generated files while preserving custom content - find doc -type f \( -name "*.html" -o -name "*.pdf" \) -delete + #find doc -type f \( -name "*.html" -o -name "*.pdf" \) -delete make doc #example on how to only build spanish html #make html-es @@ -166,10 +200,9 @@ function build { set_cmake #make -j 16 VERBOSE=1 make -j 16 - #make sudo make install - # Use this one only for macOS Homebrew + # EXAMPLE: For macOS Homebrew # make install popd > /dev/null || exit 1 @@ -189,8 +222,8 @@ function test_compile { do # generate the documentation queries #tools/testers/doc_queries_generator.pl -alg "docqueries/${d}" -documentation -pgport "${PGPORT}" - # Show warnings - #tools/testers/doc_queries_generator.pl -alg "docqueries/${d}" -level WARNING -pgport "${PGPORT}" + # Show debug messages from pgrouting + #tools/testers/doc_queries_generator.pl -alg "docqueries/${d}" -level DEBUG3 -pgport "${PGPORT}" # Compare differences on results tools/testers/doc_queries_generator.pl -alg "docqueries/${d}" -pgport "${PGPORT}" done diff --git a/tools/testers/types_check.sql b/tools/testers/types_check.sql index 716fce9e68..9a2332809d 100644 --- a/tools/testers/types_check.sql +++ b/tools/testers/types_check.sql @@ -286,7 +286,7 @@ BEGIN RETURN QUERY SELECT has_function(fn); IF NOT min_version(standard_v) THEN - RETURN QUERY SELECT skip(1, fn || ': Standarized on version ' || standard_v); + RETURN QUERY SELECT skip(1, fn || ': Standardized on version ' || standard_v); RETURN; END IF;