Upgrade to master

camptocamp · Sep 4, 2024 · aaadd12 · aaadd12
1 parent 6691c16
commit aaadd12
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/CONST_create_template/Dockerfile b/CONST_create_template/Dockerfile
@@ -13,7 +13,7 @@ ENV CONFIG_VARS sqlalchemy.url sqlalchemy.pool_recycle sqlalchemy.pool_size sqla
     reset_password fulltextsearch global_headers headers authorized_referers hooks stats db_chooser \
     dbsessions urllogin host_forward_host headers_whitelist headers_blacklist \
     smtp c2c.base_path welcome_email \
-    lingua_extractor interfaces_config interfaces devserver_url api authentication intranet metrics pdfreport \
+    lingva_extractor interfaces_config interfaces devserver_url api authentication intranet metrics pdfreport \
     vector_tiles i18next main_ogc_server
 
 COPY . /tmp/config/

diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ ENV CONFIG_VARS sqlalchemy.url sqlalchemy.pool_recycle sqlalchemy.pool_size sqla
     reset_password fulltextsearch global_headers headers authorized_referers hooks stats db_chooser \
     dbsessions urllogin host_forward_host headers_whitelist headers_blacklist \
     smtp c2c.base_path welcome_email \
-    lingua_extractor interfaces_config interfaces devserver_url api authentication intranet metrics pdfreport \
+    lingva_extractor interfaces_config interfaces devserver_url api authentication intranet metrics pdfreport \
     vector_tiles i18next main_ogc_server
 
 COPY . /tmp/config/

diff --git a/geoportal/CONST_Makefile b/geoportal/CONST_Makefile
@@ -54,7 +54,7 @@ build: $(BUILD_RULES)
 PO_FILES = $(addprefix $(PACKAGE)_geoportal/locale/, $(addsuffix /LC_MESSAGES/$(PACKAGE)_geoportal-server.po, $(LANGUAGES)))
 
 .INTERMEDIATE: $(PACKAGE)_geoportal/locale/$(PACKAGE)_geoportal-server.pot
-$(PACKAGE)_geoportal/locale/$(PACKAGE)_geoportal-server.pot: lingua-server.cfg $(SRC_FILES)
+$(PACKAGE)_geoportal/locale/$(PACKAGE)_geoportal-server.pot: lingva-server.cfg $(SRC_FILES)
 	mkdir --parent $(dir $@)
 	[ -z "$(SRC_FILES)" ] || pot-create --width=110 --config=$< --keyword=_ --output=$@ $(SRC_FILES)
 

diff --git a/geoportal/CONST_config-schema.yaml b/geoportal/CONST_config-schema.yaml
@@ -693,7 +693,7 @@ mapping:
                     sequence:
                       - *map
 
-      lingua_extractor:
+      lingva_extractor:
         type: map
         mapping:
           host_map:

diff --git a/geoportal/CONST_vars.yaml b/geoportal/CONST_vars.yaml
@@ -972,7 +972,7 @@ vars:
   pdfreport:
     print_url: '{PRINT_URL}'
 
-  lingua_extractor: {}
+  lingva_extractor: {}
 
   content_security_policy_main_default_src_extra: ''
   # Google Maps uses map.google.com and map.googleapis.com

diff --git a/geoportal/lingua-client.cfg → geoportal/lingva-client.cfg b/geoportal/lingua-client.cfg → geoportal/lingva-client.cfg
diff --git a/geoportal/lingua-server.cfg → geoportal/lingva-server.cfg b/geoportal/lingua-server.cfg → geoportal/lingva-server.cfg