[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-223-g3b8e21e58
git at osgeo.org
git at osgeo.org
Thu Jan 13 12:13:32 PST 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 3b8e21e586aa649ee8c9c79814755b1d6eece148 (commit)
via 26d51b23a1f967771df731b91bba5fd5e3cd735e (commit)
from 897549055ec702cb5dc75cd93b874cfa93157bdf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3b8e21e586aa649ee8c9c79814755b1d6eece148
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 13 21:12:59 2022 +0100
Have Debbie always build localized-html
diff --git a/ci/debbie/postgis_release_docs.sh b/ci/debbie/postgis_release_docs.sh
index 28eb71868..39c7dd4c5 100644
--- a/ci/debbie/postgis_release_docs.sh
+++ b/ci/debbie/postgis_release_docs.sh
@@ -71,16 +71,7 @@ cp html/images/* images
make epub
make -e chunked-html-web 2>&1 | tee -a doc-errors.log
-if [[ "$reference" == *"master"* ]]; then #only do this for master branch because only master follows transifex
- make update-pot
- make pull-tx
- make -C po/it_IT/ local-html
- make -C po/pt_BR/ local-html
- make -C po/ja/ local-html
- make -C po/de/ local-html
- make -C po/ko_KR/ local-html
- #make pdf-localized
-fi
+make -C doc/ html-localized
package="doc-html-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.tar.gz"
commit 26d51b23a1f967771df731b91bba5fd5e3cd735e
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 13 21:09:42 2022 +0100
Drop references to Transifex, we go Weblate now
Update doc/po/README accordingly
diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index c6b0bee49..c64f00b1b 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -84,10 +84,6 @@ Release procedure
4. Update code.
- - For first micro of a minor, make sure to pull the latest translations from transifex
- TODO: more detail here - there is a job on debbie for 3.1 for examples
- https://debbie.postgis.net/view/PostGIS/job/PostGIS_docs_translations_3.1
- and she's setup with an api key to pull and push translations.
- Update the README.md to reflect new to be created buildbot badges
(this should only be needed for trunk release)
- Edit README.postgis and set release date and version.
diff --git a/doc/.tx/config b/doc/.tx/config
deleted file mode 100644
index c0a798ec7..000000000
--- a/doc/.tx/config
+++ /dev/null
@@ -1,238 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[postgis.extras_address_standardizerxmlpot]
-file_filter = po/<lang>/extras_address_standardizer.xml.po
-source_file = po/templates/extras_address_standardizer.xml.pot
-source_lang = en
-
-[postgis.extras_historytablexmlpot]
-file_filter = po/<lang>/extras_historytable.xml.po
-source_file = po/templates/extras_historytable.xml.pot
-source_lang = en
-
-[postgis.extras_tigergeocoderxmlpot]
-file_filter = po/<lang>/extras_tigergeocoder.xml.po
-source_file = po/templates/extras_tigergeocoder.xml.pot
-source_lang = en
-
-[postgis.extras_topologyxmlpot]
-file_filter = po/<lang>/extras_topology.xml.po
-source_file = po/templates/extras_topology.xml.pot
-source_lang = en
-
-[postgis.extrasxmlpot]
-file_filter = po/<lang>/extras.xml.po
-source_file = po/templates/extras.xml.pot
-source_lang = en
-
-[postgis.faq_rasterxmlpot]
-file_filter = po/<lang>/faq_raster.xml.po
-source_file = po/templates/faq_raster.xml.pot
-source_lang = en
-
-[postgis.faqxmlpot]
-file_filter = po/<lang>/faq.xml.po
-source_file = po/templates/faq.xml.pot
-source_lang = en
-
-[postgis.installationxmlpot]
-file_filter = po/<lang>/installation.xml.po
-source_file = po/templates/installation.xml.pot
-source_lang = en
-
-[postgis.introductionxmlpot]
-file_filter = po/<lang>/introduction.xml.po
-source_file = po/templates/introduction.xml.pot
-source_lang = en
-
-[postgis.performance_tipsxmlpot]
-file_filter = po/<lang>/performance_tips.xml.po
-source_file = po/templates/performance_tips.xml.pot
-source_lang = en
-
-[postgis.postgisxmlpot]
-file_filter = po/<lang>/postgis.xml.po
-source_file = po/templates/postgis.xml.pot
-source_lang = en
-
-[postgis.reference_accessorxmlpot]
-file_filter = po/<lang>/reference_accessor.xml.po
-source_file = po/templates/reference_accessor.xml.pot
-source_lang = en
-
-[postgis.reference_constructorxmlpot]
-file_filter = po/<lang>/reference_constructor.xml.po
-source_file = po/templates/reference_constructor.xml.pot
-source_lang = en
-
-[postgis.reference_editorxmlpot]
-file_filter = po/<lang>/reference_editor.xml.po
-source_file = po/templates/reference_editor.xml.pot
-source_lang = en
-
-[postgis.reference_exceptionxmlpot]
-file_filter = po/<lang>/reference_exception.xml.po
-source_file = po/templates/reference_exception.xml.pot
-source_lang = en
-
-[postgis.reference_gucxmlpot]
-file_filter = po/<lang>/reference_guc.xml.po
-source_file = po/templates/reference_guc.xml.pot
-source_lang = en
-
-[postgis.reference_lrsxmlpot]
-file_filter = po/<lang>/reference_lrs.xml.po
-source_file = po/templates/reference_lrs.xml.pot
-source_lang = en
-
-[postgis.reference_managementxmlpot]
-file_filter = po/<lang>/reference_management.xml.po
-source_file = po/templates/reference_management.xml.pot
-source_lang = en
-
-[postgis.reference_measurexmlpot]
-file_filter = po/<lang>/reference_measure.xml.po
-source_file = po/templates/reference_measure.xml.pot
-source_lang = en
-
-[postgis.reference_sfcgalxmlpot]
-file_filter = po/<lang>/reference_sfcgal.xml.po
-source_file = po/templates/reference_sfcgal.xml.pot
-source_lang = en
-
-[postgis.reference_operatorxmlpot]
-file_filter = po/<lang>/reference_operator.xml.po
-source_file = po/templates/reference_operator.xml.pot
-source_lang = en
-
-[postgis.reference_outputxmlpot]
-file_filter = po/<lang>/reference_output.xml.po
-source_file = po/templates/reference_output.xml.pot
-source_lang = en
-
-[postgis.reference_processingxmlpot]
-file_filter = po/<lang>/reference_processing.xml.po
-source_file = po/templates/reference_processing.xml.pot
-source_lang = en
-
-[postgis.reference_rasterxmlpot]
-file_filter = po/<lang>/reference_raster.xml.po
-source_file = po/templates/reference_raster.xml.pot
-source_lang = en
-
-[postgis.reference_transactionxmlpot]
-file_filter = po/<lang>/reference_transaction.xml.po
-source_file = po/templates/reference_transaction.xml.pot
-source_lang = en
-
-[postgis.reference_typexmlpot]
-file_filter = po/<lang>/reference_type.xml.po
-source_file = po/templates/reference_type.xml.pot
-source_lang = en
-
-[postgis.referencexmlpot]
-file_filter = po/<lang>/reference.xml.po
-source_file = po/templates/reference.xml.pot
-source_lang = en
-
-[postgis.release_notesxmlpot]
-file_filter = po/<lang>/release_notes.xml.po
-source_file = po/templates/release_notes.xml.pot
-source_lang = en
-
-[postgis.reportingxmlpot]
-file_filter = po/<lang>/reporting.xml.po
-source_file = po/templates/reporting.xml.pot
-source_lang = en
-
-[postgis.using_postgis_appxmlpot]
-file_filter = po/<lang>/using_postgis_app.xml.po
-source_file = po/templates/using_postgis_app.xml.pot
-source_lang = en
-
-[postgis.using_postgis_datamanxmlpot]
-file_filter = po/<lang>/using_postgis_dataman.xml.po
-source_file = po/templates/using_postgis_dataman.xml.pot
-source_lang = en
-
-[postgis.using_postgis_querypot]
-file_filter = po/<lang>/using_postgis_query.xml.po
-source_file = po/templates/using_postgis_query.xml.pot
-source_lang = en
-
-[postgis.using_raster_datamanxmlpot]
-file_filter = po/<lang>/using_raster_dataman.xml.po
-source_file = po/templates/using_raster_dataman.xml.pot
-source_lang = en
-
-[postgis.reference_bboxxmlpot]
-file_filter = po/<lang>/reference_bbox.xml.po
-source_file = po/templates/reference_bbox.xml.pot
-source_lang = en
-
-[postgis.reference_clusterxmlpot]
-file_filter = po/<lang>/reference_cluster.xml.po
-source_file = po/templates/reference_cluster.xml.pot
-source_lang = en
-
-[postgis.reference_inputxmlpot]
-file_filter = po/<lang>/reference_input.xml.po
-source_file = po/templates/reference_input.xml.pot
-source_lang = en
-
-[postgis.reference_relationshipxmlpot]
-file_filter = po/<lang>/reference_relationship.xml.po
-source_file = po/templates/reference_relationship.xml.pot
-source_lang = en
-
-[postgis.reference_srsxmlpot]
-file_filter = po/<lang>/reference_srs.xml.po
-source_file = po/templates/reference_srs.xml.pot
-source_lang = en
-
-[postgis.reference_trajectoryxmlpot]
-file_filter = po/<lang>/reference_trajectory.xml.po
-source_file = po/templates/reference_trajectory.xml.pot
-source_lang = en
-
-[postgis.reference_transformationxmlpot]
-file_filter = po/<lang>/reference_transformation.xml.po
-source_file = po/templates/reference_transformation.xml.pot
-source_lang = en
-
-[postgis.reference_troubleshootingxmlpot]
-file_filter = po/<lang>/reference_troubleshooting.xml.po
-source_file = po/templates/reference_troubleshooting.xml.pot
-source_lang = en
-
-[postgis.reference_validationxmlpot]
-file_filter = po/<lang>/reference_validation.xml.po
-source_file = po/templates/reference_validation.xml.pot
-source_lang = en
-
-[postgis.reference_versionxmlpot]
-file_filter = po/<lang>/reference_version.xml.po
-source_file = po/templates/reference_version.xml.pot
-source_lang = en
-
-[postgis.administrationxmlpot]
-file_filter = po/<lang>/administration.xml.po
-source_file = po/templates/administration.xml.pot
-source_lang = en
-
-[postgis.database_tuningxmlpot]
-file_filter = po/<lang>/database_tuning.xml.po
-source_file = po/templates/database_tuning.xml.pot
-source_lang = en
-
-[postgis.reference_overlayxmlpot]
-file_filter = po/<lang>/reference_overlay.xml.po
-source_file = po/templates/reference_overlay.xml.pot
-source_lang = en
-
-[postgis.using_postgis_queryxmlpot]
-file_filter = po/<lang>/using_postgis_query.xml.po
-source_file = po/templates/using_postgis_query.xml.pot
-source_lang = en
-
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 003292921..fc67aec1f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -206,24 +206,6 @@ update-po: $(XML_INPUTS_POT)
done
endif
-pull-tx:
- tx pull --all
- $(MAKE) update-po
-
-push-tx:
- tx push -s -t --skip
-
-# Register transifex resources, run when adding a new .xml file
-update-tx:
- for f in $(XML_INPUTS_POT); do \
- f=`basename $${f} .pot`; \
- res=`echo "$${f}" | sed 's/\.//g'`pot; \
- tx set --auto-local -r postgis.$${res} "po/<lang>/$${f}.po" \
- --source-lang en --source-file "po/templates/$${f}.pot" \
- --execute; \
- done
-
-
ifeq ($(XSLTPROC),)
postgis_aggs_mm.xml: requirements_not_met_xsltproc
else
diff --git a/doc/po/README b/doc/po/README
index 2293f0120..d2b16e964 100644
--- a/doc/po/README
+++ b/doc/po/README
@@ -33,54 +33,17 @@ Adding new languages implies (relative to doc/ dir):
- Add to the git repository the changes in the Makefile.in
and all the new files in the po/<newlanguage>/
-Using transifex
----------------
-
-Transifex web-ui to translation was setup here:
-https://www.transifex.com/projects/p/postgis
-
-Run ``make update-tx`` from the parent (doc) directory to
-update the transifex command-line tool configuration,
-found in ../.tx/config (only needed when new doc sources
-are added);
-
-Run ``make pull-tx`` to import remotely updated translations
-and ``make push-tx`` to upload the locally update ones, after
-making sure they are well-formed (``make html-localized`` succeeds).
-
-NOTE: the recommended workflow is:
-
- make pull-tx
- do:
- make html-localized || edit
- until success
- if edits:
- make push-tx
- make pull-tx
- commit changes to repo
- fi
-
-Using weblate [EXPERIMENTAL]
-----------------------------
+Using weblate
+-------------
Weblate web-ui to translation was setup here:
https://weblate.osgeo.org/projects/postgis
Translations made via Weblate will automatically be pushed
-to the a configured repository (currently robe's fork) with
-'weblate' as a committer, see commit 2d5247b0c as an example.
-
-Changes to the templates should be automatically fetched by Weblate
-via webhook, see https://git.osgeo.org/gitea/postgis/postgis/settings/hooks
-(currently broken because the configured repository does not match the
-URL of the official repository)
-
-Local changes to the translation files can be uploaded manually
-to weblate with a command like the following:
-
- wlc upload \
- postgis/introductionxml/it \
- --input po/it_IT/introduction.xml.po
+to the master branch of the official repository.
-NOTE: wlc 1.2 is known to be not functional, while wlc 1.12
- (current latest when installed via pip) seems fine
+Translation directly pushed to the master branch of the
+official reporitory will be automatically pulled by Weblate,
+as well as changes to the templates (.pot files).
+Pulling is triggered by a webhook, see
+https://git.osgeo.org/gitea/postgis/postgis/settings/hooks
-----------------------------------------------------------------------
Summary of changes:
HOWTO_RELEASE | 4 -
ci/debbie/postgis_release_docs.sh | 11 +-
doc/.tx/config | 238 --------------------------------------
doc/Makefile.in | 18 ---
doc/po/README | 53 ++-------
5 files changed, 9 insertions(+), 315 deletions(-)
delete mode 100644 doc/.tx/config
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list