diff --git a/DisplayObjects/mobile/assets/i18n/en.json b/DisplayObjects/mobile/assets/i18n/en.json index da26c7f..51141cb 100644 --- a/DisplayObjects/mobile/assets/i18n/en.json +++ b/DisplayObjects/mobile/assets/i18n/en.json @@ -25,5 +25,8 @@ "Action_2": "Action 2", "Identifier": "ID", "lines":"lines", - "columns":"Columns" + "columns":"Columns", + "maps_markers": "Please select from the following elements the columns that will define your markers. You must sort your columns in the following order: label, latitude, longitude.", + "maps_circles": "Please select from the following elements the columns that will define your circles. You must sort your columns in the following order: label, latitude, longitude, radius in meters.", + "maps_polygons": "Please select from the following elements the columns that will define your polygons. You must sort your columns in the following order: label, latitude, longitude. For the latitude and longitude columns, these must be lookup fields containing multiple latitude and longitude values." } \ No newline at end of file diff --git a/DisplayObjects/mobile/assets/i18n/fr.json b/DisplayObjects/mobile/assets/i18n/fr.json index f051f4f..31d084e 100644 --- a/DisplayObjects/mobile/assets/i18n/fr.json +++ b/DisplayObjects/mobile/assets/i18n/fr.json @@ -25,5 +25,8 @@ "Value": "Valeur", "Identifier": "Identifiant", "lines":"Lignes", - "columns":"Colonnes" + "columns":"Colonnes", + "maps_markers": "Veuillez sélectionner parmi les éléments suivants les colonnes qui définiront vos repères. Vous devez trier vos colonnes dans l'ordre suivant : libellé, latitude, longitude.", + "maps_circles": "Veuillez sélectionner parmi les éléments suivants les colonnes qui définiront vos cercles. Vous devez trier vos colonnes dans l'ordre suivant : libellé, latitude, longitude, rayon en métres.", + "maps_polygons": "Veuillez sélectionner parmi les éléments suivants les colonnes qui définiront vos polygones. Vous devez trier vos colonnes dans l'ordre suivant : libellé, latitude, longitude. Pour les colonnes de latitude et longitude, celles-ci devront être des champs rapportés comportant plusieurs valeurs pour latitude et longitude." } \ No newline at end of file diff --git a/_c8oProject/mobilePages/BrowseTables.yaml b/_c8oProject/mobilePages/BrowseTables.yaml index 85b861b..770a5d8 100644 --- a/_c8oProject/mobilePages/BrowseTables.yaml +++ b/_c8oProject/mobilePages/BrowseTables.yaml @@ -645,7 +645,7 @@ title: First page textValue: - xmlizable: - ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType - - MobileSmartSourceType: plain:notice2 + - MobileSmartSourceType: 'script:(this.local.txt_i18n != null ? this.local.txt_i18n : ''notice2'') | translate' ↓Style [ngx.components.UIStyle-1678905330241]: styleContent: - xmlizable: @@ -3227,6 +3227,9 @@ title: First page page.local.target = "table"; if(page.navParams.data.target == "table"){ page.local.type = "table"; + if(page.navParams.data.type == "maps_markers" || page.navParams.data.type == "maps_circles" || page.navParams.data.type == "maps_polygons"){ + page.local.txt_i18n = page.navParams.data.type; + } page.local.target = "table"; } else if(page.navParams.data.type == "select" || page.navParams.data.type == "checkbox" || page.navParams.data.type == "radio"){ diff --git a/c8oProject.yaml b/c8oProject.yaml index 33c6cab..fad5eed 100644 --- a/c8oProject.yaml +++ b/c8oProject.yaml @@ -14,7 +14,7 @@ contextTimeout: ${lib_baserow.context_timout=3600} corsOrigin: =Origin httpSessionTimeout: ${lib_baserow.session_timout=3600} - version: 1.1.9 + version: 1.1.10 ↓Baserow_API_spec [connectors.HttpConnector]: 🗏 connectors/Baserow_API_spec.yaml ↓MediaConnector [connectors.HttpConnector]: 🗏 connectors/MediaConnector.yaml ↓_disabled_formssource_GetSelectDataOld [sequences.GenericSequence]: 🗏 sequences/_disabled_formssource_GetSelectDataOld.yaml diff --git a/project.md b/project.md index e057557..628cdc0 100644 --- a/project.md +++ b/project.md @@ -30,7 +30,7 @@ see [documentation](http://localhost:18080/convertigo/xsd/couchdb/CouchDb.xsd) ## ![](https://github.com/convertigo/convertigo/blob/develop/engine/src/com/twinsoft/convertigo/beans/references/images/ProjectSchemaReference_16x16.png?raw=true "ProjectSchemaReference") lib_ExtendedComponents_ui_ngx -see [readme](https://github.com/convertigo/c8oprj-lib-extended-components-ui-ngx/tree/8.4.0.0#readme) +see [readme](https://github.com/convertigo/c8oprj-lib-extended-components-ui-ngx/tree/3baccc787893e26c44e258b413cac0b79112bbff#readme)