From fab6711c7afd44203f8eb39d50dd8c0c1b8521ee Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 20 Feb 2019 10:56:31 +0100
Subject: [PATCH] Translate selection
---
src/module_vmap/module/lang/lang-en.json | 7 +++
src/module_vmap/module/lang/lang-fr.json | 11 +++-
.../module/template/tools/select.html | 60 +++++++++----------
3 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/src/module_vmap/module/lang/lang-en.json b/src/module_vmap/module/lang/lang-en.json
index 0812753b..99967b4b 100644
--- a/src/module_vmap/module/lang/lang-en.json
+++ b/src/module_vmap/module/lang/lang-en.json
@@ -529,6 +529,10 @@
"VMAP_SCALE": "Scale",
"VMAP_RESOLUTION": "Resolution",
"VMAP_PRINT": "Print",
+ "VMAP_WMS_QUERY_RESULT": "WMS request result (GetFeatureInfo)",
+ "VMAP_WITH_RESULT": "With result",
+ "VMAP_WITHOUT_RESULT": "Without result",
+ "VMAP_NO_RESULTS_AVAILABLE": "No result available",
"": "",
"VMAP_LAYERTREE_DATASETS": "Datasets",
"VMAP_LAYERTREE_MAP_1": "Map 1",
@@ -621,5 +625,8 @@
"VMAP_PRINT_NO_MODEL_ASSOCIATE": "No model associated",
"VMAP_PRINT_MODIFY_MAP_PRINT_ZONE": "Modify print zone on map",
"VMAP_PRINT_MODIFY_COMPARE_MAP_PRINT_ZONE": "Modify print zone on compare map",
+ "": "",
+ "VMAP_SELECTION_MULTIPLE_SELECTION": "Multiple selection",
+ "VMAP_SELECTION_VALIDATE_GEOM": "Validate geometry",
"": ""
}
diff --git a/src/module_vmap/module/lang/lang-fr.json b/src/module_vmap/module/lang/lang-fr.json
index 3d268395..a95f03ad 100644
--- a/src/module_vmap/module/lang/lang-fr.json
+++ b/src/module_vmap/module/lang/lang-fr.json
@@ -530,6 +530,10 @@
"VMAP_SCALE": "Échelle",
"VMAP_RESOLUTION": "Résolution",
"VMAP_PRINT": "Imprimer",
+ "VMAP_WMS_QUERY_RESULT": "Résultat requête WMS (GetFeatureInfo)",
+ "VMAP_WITH_RESULT": "Avec résultat",
+ "VMAP_WITHOUT_RESULT": "Sans résultat",
+ "VMAP_NO_RESULTS_AVAILABLE": "Aucun résultat disponible",
"": "",
"VMAP_LAYERTREE_DATASETS": "Jeux de données",
"VMAP_LAYERTREE_MAP_1": "Carte 1",
@@ -591,8 +595,8 @@
"VMAP_INSERT_ADD_PART": "Ajouter une partie",
"VMAP_INSERT_MODIFY_GEOM": "Modifier la géométrie",
"VMAP_INSERT_DELETE_PART": "Supprimer une partie",
- "VMAP_INSERT_ADD_HOLE": "Ajouter trou",
- "VMAP_INSERT_DELETE_HOLE": "Supprimer trou",
+ "VMAP_INSERT_ADD_HOLE": "Ajouter un trou",
+ "VMAP_INSERT_DELETE_HOLE": "Supprimer un trou",
"VMAP_INSERT_EDIT_ATTRS": "Éditer les attributs",
"VMAP_INSERT_VECTOR_SNAPPING": "Accrochage vectoriel",
"VMAP_INSERT_VECTOR_SNAPPING_DEF": "Definit si l'objet métier est accrochable",
@@ -621,5 +625,8 @@
"VMAP_PRINT_NO_MODEL_ASSOCIATE": "Aucun modèle d'impression associé",
"VMAP_PRINT_MODIFY_MAP_PRINT_ZONE": "Modification de la zone d'impression sur la carte",
"VMAP_PRINT_MODIFY_COMPARE_MAP_PRINT_ZONE": "Modification de la zone d'impression sur la carte de comparaison",
+ "": "",
+ "VMAP_SELECTION_MULTIPLE_SELECTION": "Sélection multiple",
+ "VMAP_SELECTION_VALIDATE_GEOM": "Valider géométrie",
"": ""
}
diff --git a/src/module_vmap/module/template/tools/select.html b/src/module_vmap/module/template/tools/select.html
index f801d83e..ce4e247d 100644
--- a/src/module_vmap/module/template/tools/select.html
+++ b/src/module_vmap/module/template/tools/select.html
@@ -6,7 +6,7 @@
<li role="presentation" style="position: inherit" class="basic-tools-dropdown">
<a class="basic-tools-element pointer"
id="basic-tools-dropdown-select-btn"
- title="Sélection multiple"
+ title="{{ 'VMAP_SELECTION_MULTIPLE_SELECTION' | translate }}"
onclick="oVmap.getToolsManager().getBasicTools().toggleTool(this)">
<span class="icon-info" aria-hidden="true"></span> +
</a>
@@ -32,7 +32,7 @@
style="width: 80%"
ng-class="{'white color-gray': ctrl.currentAction === 'basicTools-select-insertPoint' || ctrl.currentAction === 'basicTools-select-insertLineString' || ctrl.currentAction === 'basicTools-select-insertPolygon' || ctrl.currentAction === 'basicTools-select-insertCircle'}"
ng-click="ctrl.addPartGeomType !== '' ? ctrl.startEdition('insert' + ctrl.addPartGeomType, ctrl.currentAction === 'basicTools-select-insert' + ctrl.addPartGeomType) : angular.noop">
- Ajouter une partie
+ {{ 'VMAP_INSERT_ADD_PART' | translate }}
</button>
<button type="button"
class="btn btn-sm btn-default dropdown-toggle"
@@ -50,22 +50,22 @@
<li><a href="javascript:void(0)"
ng-show="ctrl.editableFeatureType === 'GEOMETRYCOLLECTION' || ctrl.editableFeatureType === 'GEOMETRY' || ctrl.editableFeatureType === 'POINT' || ctrl.editableFeatureType === 'MULTIPOINT'"
ng-click="ctrl.addPartGeomType = 'Point'; ctrl.startEdition('insertPoint', false)">
- <span class="icon-point"></span> Point
+ <span class="icon-point"></span> {{ 'VMAP_POINT' | translate }}
</a></li>
<li><a href="javascript:void(0)"
ng-show="ctrl.editableFeatureType === 'GEOMETRYCOLLECTION' || ctrl.editableFeatureType === 'GEOMETRY' || ctrl.editableFeatureType === 'LINESTRING' || ctrl.editableFeatureType === 'MULTILINESTRING'"
ng-click="ctrl.addPartGeomType = 'LineString'; ctrl.startEdition('insertLineString', false)">
- <span class="icon-line"></span> Ligne
+ <span class="icon-line"></span> {{ 'VMAP_LINE' | translate }}
</a></li>
<li><a href="javascript:void(0)"
ng-show="ctrl.editableFeatureType === 'GEOMETRYCOLLECTION' || ctrl.editableFeatureType === 'GEOMETRY' || ctrl.editableFeatureType === 'POLYGON' || ctrl.editableFeatureType === 'MULTIPOLYGON'"
ng-click="ctrl.addPartGeomType = 'Polygon'; ctrl.startEdition('insertPolygon', false)">
- <span class="icon-polygon"></span> Polygone
+ <span class="icon-polygon"></span> {{ 'VMAP_POLYGON' | translate }}
</a></li>
<li><a href="javascript:void(0)"
ng-show="ctrl.editableFeatureType === 'GEOMETRYCOLLECTION' || ctrl.editableFeatureType === 'GEOMETRY' || ctrl.editableFeatureType === 'POLYGON' || ctrl.editableFeatureType === 'MULTIPOLYGON'"
ng-click="ctrl.addPartGeomType = 'Circle'; ctrl.startEdition('insertCircle', false)">
- <span class="icon-circle"></span> Cercle
+ <span class="icon-circle"></span> {{ 'VMAP_CIRCLE' | translate }}
</a></li>
</ul>
</div>
@@ -77,7 +77,7 @@
ng-class="{'active': ctrl.currentAction === 'basicTools-select-editFeature'}"
ng-click="ctrl.startEdition('editFeature', ctrl.currentAction === 'basicTools-select-editFeature')">
<span class="icon-edit"></span>
- <span class="margin-sides-10">Modifier la géométrie</span>
+ <span class="margin-sides-10">{{ 'VMAP_INSERT_MODIFY_GEOM' | translate }}</span>
</a>
</li>
<li class="basic-tools-dropdown-btn">
@@ -85,7 +85,7 @@
ng-class="{'active': ctrl.currentAction === 'basicTools-select-deleteFeature'}"
ng-click="ctrl.startEdition('deleteFeature', ctrl.currentAction === 'basicTools-select-deleteFeature')">
<span class="icon-trash"></span>
- <span class="margin-sides-10">Supprimer une partie</span>
+ <span class="margin-sides-10">{{ 'VMAP_INSERT_DELETE_PART' | translate }}</span>
</a>
</li>
<li class="basic-tools-dropdown-btn">
@@ -94,7 +94,7 @@
ng-class="{'active': ctrl.currentAction === 'basicTools-select-addHole'}"
ng-click="ctrl.startEdition('addHole', ctrl.currentAction === 'basicTools-select-addHole')">
<span class="icon-dot-circle-o"></span>
- <span class="margin-sides-10">Ajouter un trou</span>
+ <span class="margin-sides-10">{{ 'VMAP_INSERT_ADD_HOLE' | translate }}</span>
</a>
</li>
<li class="basic-tools-dropdown-btn">
@@ -103,7 +103,7 @@
ng-class="{'active': ctrl.currentAction === 'basicTools-select-deleteHole'}"
ng-click="ctrl.startEdition('deleteHole', ctrl.currentAction === 'basicTools-select-deleteHole')">
<span class="icon-dot-circle-o"></span>
- <span class="margin-sides-10">Supprimer un trou</span>
+ <span class="margin-sides-10">{{ 'VMAP_INSERT_DELETE_HOLE' | translate }}</span>
</a>
</li>
</ul>
@@ -113,7 +113,7 @@
<div class="basic-tools-dropdown-btn vmap-select-snapping-collapse-button "
ng-click="ctrl.isSnapMenuCollapse = !ctrl.isSnapMenuCollapse">
<span class ="glyphicon glyphicon-magnet" ></span>
- <span class="margin-sides-10"> Accrochage vectoriel </span>
+ <span class="margin-sides-10"> {{ 'VMAP_INSERT_VECTOR_SNAPPING' | translate }} </span>
<span class="glyphicon"
ng-class="{'glyphicon-menu-down': ctrl.isSnapMenuCollapse, 'glyphicon-menu-right': !ctrl.isSnapMenuCollapse }"></span>
</div>
@@ -130,7 +130,7 @@
style="cursor:pointer"
ng-model="oBo.bo_snapping_enabled"
ng-click="ctrl.loadVectorSnappingData()">
- <label for="vmap-select-snapping-menu-checkbox-{{$index}}" style="cursor:pointer" title="Definit si l'objet métier est accrochable">
+ <label for="vmap-select-snapping-menu-checkbox-{{$index}}" style="cursor:pointer" title="{{ 'VMAP_INSERT_VECTOR_SNAPPING_DEF' | translate }}">
{{oBo.bo_title}}
</label>
</div>
@@ -155,7 +155,7 @@
class="btn btn-info btn-xs width-100"
ng-click="ctrl.showSnappingOptionsModal()">
<span class="fa fa-cog margin-sides-2"></span>
- Options d'accrochage
+ {{ 'VMAP_INSERT_SNAPPING_OPTIONS' | translate }}
</button>
</div>
</div>
@@ -164,10 +164,10 @@
</div>
<!--Messages d'alerte pour l'échelle d'édition-->
<div class="alert alert-warning vmap-select-scale-alert" role="alert" ng-show="!ctrl.isMaxScaleOk">
- <span class="glyphicon glyphicon-warning-sign"></span> Échelle maximale de saisie atteinte
+ <span class="glyphicon glyphicon-warning-sign"></span> {{ 'VMAP_INSERT_SNAPPING_MAX_SCALE' | translate }}
</div>
<div class="alert alert-warning vmap-select-scale-alert" role="alert" ng-show="!ctrl.isMinScaleOk">
- <span class="glyphicon glyphicon-warning-sign"></span> Échelle minimale de saisie atteinte
+ <span class="glyphicon glyphicon-warning-sign"></span> {{ 'VMAP_INSERT_SNAPPING_MIN_SCALE' | translate }}
</div>
<!--Boutons-->
<div style="text-align: center">
@@ -175,21 +175,21 @@
class="btn btn-info btn-sm"
ng-click="ctrl.finishEdition()">
<span class="glyphicon glyphicon-remove margin-sides-2"></span>
- Annuler
+ {{ 'VMAP_CANCEL' | translate }}
</button>
<button type="button"
class="btn btn-info btn-sm"
ng-show="ctrl.editGeometryFromForm"
ng-click="ctrl.validateGeomAndDisplayEditForm()">
<span class="glyphicon glyphicon-share-alt margin-sides-2"></span>
- Valider géométrie
+ {{ 'VMAP_SELECTION_VALIDATE_GEOM' | translate }}
</button>
<button type="button"
class="btn btn-info btn-sm"
ng-show="!ctrl.editGeometryFromForm"
ng-click="ctrl.submitGeomEdition(); ctrl.finishEdition();">
<span class="glyphicon glyphicon-share-alt margin-sides-2"></span>
- Sauvegarder
+ {{ 'VMAP_SAVE' | translate }}
</button>
</div>
</div>
@@ -200,14 +200,14 @@
<div id="getFeatureInfo-result-window" class="basic-tools-dropdown-element basic-tools-dropdown-select-getFeatureInfo-content dropdown-menu">
<div class="modal-header">
<button type="button" class="close" ng-click="ctrl.closeGetFeatureInfoResultWindow()">×</button>
- <h4 class="modal-title">Résultat requête WMS (GetFeatureInfo)</h4>
+ <h4 class="modal-title">{{ 'VMAP_WMS_QUERY_RESULT' | translate }}</h4>
</div>
<div class="modal-body modal-body-big">
<div class="row" style="height: 99%;">
<!-- Bouttons calques -->
<div class="col-md-4">
<div ng-if="ctrl.iGetFeatureInfoWithResultLayers > 0" class="">
- <i>Avec résultat</i>
+ <i>{{ 'VMAP_WITH_RESULT' | translate }}</i>
<ul class="nav nav-pills nav-stacked" style="width: 180px">
<li data-toggle="pill"
class="list-group-item list-group-item-modal"
@@ -222,7 +222,7 @@
</ul>
</div>
<div ng-if="ctrl.iGetFeatureInfoWithoutResultLayers > 0" class="margin-20">
- <i>Sans résultat</i>
+ <i>{{ 'VMAP_WITHOUT_RESULT' | translate }}</i>
<ul class="nav nav-pills nav-stacked" style="width: 180px">
<li data-toggle="pill"
class="list-group-item list-group-item-modal"
@@ -274,7 +274,7 @@
</div>
<div ng-if="!ctrl.aGetFeatureInfoResult[ctrl.aGetFeatureInfoSelectedLayer].aSubLayers[ctrl.aGetFeatureInfoSelectedSubLayer].result">
<br>
- Aucun résultat disponible
+ {{ 'VMAP_NO_RESULTS_AVAILABLE' | translate }}
</div>
</div>
</div>
@@ -314,11 +314,11 @@
<h5 data-translate="FORM_SNAPPING_VISIBILITY_CONFIGURATION_CONFIGURATION_VMAP_CONFIG"></h5>
<div class="radio radio-inline">
<input type="radio" name="vmap_select_snap_visible" id="vmap_select_snap_visible_1" ng-model="ctrl.tmpSnapOptions.visible" ng-value="true">
- <label for="vmap_select_snap_visible_1">Oui</label>
+ <label for="vmap_select_snap_visible_1">{{ 'VMAP_YES' | translate }}</label>
</div>
<div class="radio radio-inline">
<input type="radio" name="vmap_select_snap_visible" id="vmap_select_snap_visible_2" ng-model="ctrl.tmpSnapOptions.visible" ng-value="false">
- <label for="vmap_select_snap_visible_2">Non</label>
+ <label for="vmap_select_snap_visible_2">{{ 'VMAP_NO' | translate }}</label>
</div>
</div>
</div>
@@ -341,7 +341,7 @@
id="vmap_select_snap_avoid_superpositions_1_{{$index}}"
ng-model="ctrl.tmpSnapOptions.avoidSuperpositions[bo.bo_id]"
ng-value="true">
- <label for="vmap_select_snap_avoid_superpositions_1_{{$index}}">Oui</label>
+ <label for="vmap_select_snap_avoid_superpositions_1_{{$index}}">{{ 'VMAP_YES' | translate }}</label>
</div>
<div class="radio radio-inline">
<input type="radio"
@@ -349,7 +349,7 @@
id="vmap_select_snap_avoid_superpositions_2_{{$index}}"
ng-model="ctrl.tmpSnapOptions.avoidSuperpositions[bo.bo_id]"
ng-value="false">
- <label for="vmap_select_snap_avoid_superpositions_2_{{$index}}">Non</label>
+ <label for="vmap_select_snap_avoid_superpositions_2_{{$index}}">{{ 'VMAP_NO' | translate }}</label>
</div>
</div>
</div>
@@ -358,10 +358,10 @@
</div>
<div class="modal-footer modal-footer-sm text-left">
<button class="btn btn-primary" ng-click="ctrl.resetSnapOptions()">
- Rétablir les paramètres par défaut
+ {{ 'VMAP_INSERT_RESET_DEFAULT_PARAMS' | translate }}
</button>
<button class="btn btn-primary" ng-click="ctrl.submitSnappingOptionsModal()">
- Valider
+ {{ 'VMAP_VALIDATE' | translate }}
</button>
</div>
</div>
@@ -409,12 +409,12 @@
<div class="modal-footer modal-footer-sm text-left">
<button class="btn btn-primary" ng-click="ctrl.editFormFeature(ctrl.editSelection)" ng-if="!$root.is_mobile">
<span class="icon-line margin-2"></span>
- Modifier la géométrie
+ {{ 'VMAP_INSERT_MODIFY_GEOM' | translate }}
</button>
<button class="btn btn-primary"
onclick="oVmap.simuleClick('basictools-select-form-reader-submit-btn')">
<span class="glyphicon glyphicon-share-alt margin-2"></span>
- Sauvegarder
+ {{ 'VMAP_SAVE' | translate }}
</button>
</div>
</div>
--
GitLab