From 221c0de9ed9edfb7ed46213b008c5ae0b625bb29 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 19 Feb 2019 16:57:33 +0100
Subject: [PATCH] Translate insert
---
src/module_vmap/module/lang/lang-en.json | 25 +++++++++-
src/module_vmap/module/lang/lang-fr.json | 25 +++++++++-
.../module/template/tools/insert.html | 46 +++++++++----------
.../module/template/tools/insert_mobile.html | 14 +++---
.../template/tools/location_mobile.html | 16 +++----
5 files changed, 86 insertions(+), 40 deletions(-)
diff --git a/src/module_vmap/module/lang/lang-en.json b/src/module_vmap/module/lang/lang-en.json
index 1e5e73d7..a58642ce 100644
--- a/src/module_vmap/module/lang/lang-en.json
+++ b/src/module_vmap/module/lang/lang-en.json
@@ -509,6 +509,10 @@
"VMAP_BASKET": "Basket",
"VMAP_REPORT": "Report",
"VMAP_REPORTS": "Reports",
+ "VMAP_ATTRS": "Attributs",
+ "VMAP_SAVE": "Save",
+ "VMAP_YES": "Yes",
+ "VMAP_NO": "No",
"": "",
"VMAP_LAYERTREE_DATASETS": "Datasets",
"VMAP_LAYERTREE_MAP_1": "Map 1",
@@ -563,6 +567,25 @@
"VMAP_BASICTOOLS_MAP_COMPARE": "Map compare",
"VMAP_BASICTOOLS_CONTROL_TOOLS": "Control tools",
"": "",
- "VMAP_BASICTOOLS_COMPARE_MAP_TOGGLE": "Toggle map compare",
+ "VMAP_COMPARE_MAP_TOGGLE": "Toggle map compare",
+ "": "",
+ "VMAP_INSERT_CREATE_OBJECT": "Create object",
+ "VMAP_INSERT_NO_OBJECT": "No business object or insufficient permissions",
+ "VMAP_INSERT_ADD_PART": "Add part",
+ "VMAP_INSERT_MODIFY_GEOM": "Modify geom",
+ "VMAP_INSERT_DELETE_PART": "Delete part",
+ "VMAP_INSERT_ADD_HOLE": "Add hole",
+ "VMAP_INSERT_DELETE_HOLE": "Delete hole",
+ "VMAP_INSERT_EDIT_ATTRS": "Edit attributes",
+ "VMAP_INSERT_VECTOR_SNAPPING": "Vector snapping",
+ "VMAP_INSERT_VECTOR_SNAPPING_DEF": "Define if the business object id snappable",
+ "VMAP_INSERT_SNAPPING_OPTIONS": "Snapping options",
+ "VMAP_INSERT_SNAPPING_MAX_SCALE": "Maximum scale reached",
+ "VMAP_INSERT_SNAPPING_MIN_SCALE": "Minimum scale reached",
+ "VMAP_INSERT_RESET_DEFAULT_PARAMS": "Reset default params",
+ "": "",
+ "VMAP_LOCATION_SEE_ON_MAP": "See on map",
+ "VMAP_LOCATION_NEW_SCALE": "New scale",
+ "VMAP_LOCATION_NEW_SCALE_DEF": "Set a nez scale an click on \"Add\"",
"": ""
}
diff --git a/src/module_vmap/module/lang/lang-fr.json b/src/module_vmap/module/lang/lang-fr.json
index 5cc3b1e7..3e0c3ccc 100644
--- a/src/module_vmap/module/lang/lang-fr.json
+++ b/src/module_vmap/module/lang/lang-fr.json
@@ -510,6 +510,10 @@
"VMAP_BASKET": "Panier",
"VMAP_REPORT": "Rapport",
"VMAP_REPORTS": "Rapports",
+ "VMAP_ATTRS": "Attributs",
+ "VMAP_SAVE": "Sauvegarder",
+ "VMAP_YES": "Oui",
+ "VMAP_NO": "Non",
"": "",
"VMAP_LAYERTREE_DATASETS": "Jeux de données",
"VMAP_LAYERTREE_MAP_1": "Carte 1",
@@ -564,6 +568,25 @@
"VMAP_BASICTOOLS_MAP_COMPARE": "Comparaison de carte",
"VMAP_BASICTOOLS_CONTROL_TOOLS": "Outils de contrôle",
"": "",
- "VMAP_BASICTOOLS_COMPARE_MAP_TOGGLE": "Activer / Désactiver le mode comparaison",
+ "VMAP_COMPARE_MAP_TOGGLE": "Activer / Désactiver le mode comparaison",
+ "": "",
+ "VMAP_INSERT_CREATE_OBJECT": "Créer un objet",
+ "VMAP_INSERT_NO_OBJECT": "Aucun objet métier ou pas de droits en insertion",
+ "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_EDIT_ATTRS": "Éditer les attributs",
+ "VMAP_INSERT_VECTOR_SNAPPING": "Accrochage vectoriel",
+ "VMAP_INSERT_VECTOR_SNAPPING_DEF": "Definit si l'objet métier est accrochable",
+ "VMAP_INSERT_SNAPPING_OPTIONS": "Options d'accrochage",
+ "VMAP_INSERT_SNAPPING_MAX_SCALE": "Échelle maximale de saisie atteinte",
+ "VMAP_INSERT_SNAPPING_MIN_SCALE": "Échelle minimale de saisie atteinte",
+ "VMAP_INSERT_RESET_DEFAULT_PARAMS": "Rétablir les paramètres par défaut",
+ "": "",
+ "VMAP_LOCATION_SEE_ON_MAP": "Voir sur la carte",
+ "VMAP_LOCATION_NEW_SCALE": "Nouvelle échelle",
+ "VMAP_LOCATION_NEW_SCALE_DEF": "Saisissez une nouvelle échelle puis cliquez sur \"Ajouter\"",
"": ""
}
diff --git a/src/module_vmap/module/template/tools/insert.html b/src/module_vmap/module/template/tools/insert.html
index b18ed599..b0dfbd89 100644
--- a/src/module_vmap/module/template/tools/insert.html
+++ b/src/module_vmap/module/template/tools/insert.html
@@ -5,7 +5,7 @@
<!--selecteur d'objet métier-->
<div class="padding-sides-10 margin-10" ng-show="vmapScope.sizeOf(aInsertableBOs) > 0">
<div id="select-insert-layer-dropdown-button-group" class="btn-group width-100">
- <label class="control-label text-center">Créer un objet</label>
+ <label class="control-label text-center">{{ 'VMAP_INSERT_CREATE_OBJECT' | translate }}</label>
<select id="{{:refresh:field.id}}"
class="form-control"
ng-model="selectedBoId">
@@ -16,7 +16,7 @@
</div>
<div ng-show="!vmapScope.sizeOf(aInsertableBOs) > 0">
<label class="margin-10 margin-sides-10">
- Aucun objet métier ou pas de droits en insertion
+ {{ 'VMAP_INSERT_NO_OBJECT' | translate }}
</label>
</div>
@@ -31,7 +31,7 @@
style="width: 80%"
ng-class="{'white color-gray': ctrl.currentAction === 'basicTools-insert-insertPoint' || ctrl.currentAction === 'basicTools-insert-insertLineString' || ctrl.currentAction === 'basicTools-insert-insertPolygon' || ctrl.currentAction === 'basicTools-insert-insertCircle'}"
ng-click="ctrl.addPartGeomType !== '' ? ctrl.startInsertion('insert' + ctrl.addPartGeomType, ctrl.currentAction === 'basicTools-insert-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"
@@ -79,7 +79,7 @@
ng-click="ctrl.startInsertion('editFeature', ctrl.currentAction === 'basicTools-insert-editFeature')"
ng-show="featuresLength > 0">
<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">
@@ -88,7 +88,7 @@
ng-click="ctrl.startInsertion('deleteFeature', ctrl.currentAction === 'basicTools-insert-deleteFeature')"
ng-show="featuresLength > 0">
<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">
@@ -97,7 +97,7 @@
ng-class="{'active': ctrl.currentAction === 'basicTools-insert-addHole'}"
ng-click="ctrl.startInsertion('addHole', ctrl.currentAction === 'basicTools-insert-addHole')">
<span class="icon-dot-circle-o"></span>
- <span class="margin-sides-10">Ajouter trou</span>
+ <span class="margin-sides-10">{{ 'VMAP_INSERT_ADD_HOLE' | translate }}</span>
</a>
</li>
<li class="basic-tools-dropdown-btn">
@@ -106,7 +106,7 @@
ng-class="{'active': ctrl.currentAction === 'basicTools-insert-deleteHole'}"
ng-click="ctrl.startInsertion('deleteHole', ctrl.currentAction === 'basicTools-insert-deleteHole')">
<span class="icon-dot-circle-o"></span>
- <span class="margin-sides-10">Supprimer trou</span>
+ <span class="margin-sides-10">{{ 'VMAP_INSERT_DELETE_HOLE' | translate }}</span>
</a>
</li>
</ul>
@@ -118,7 +118,7 @@
<a class="btn-draw"
ng-click="ctrl.displayEditFrom()">
<span class="icon-format_list_bulleted"></span>
- <span class="margin-sides-10">Éditer les attributs</span>
+ <span class="margin-sides-10">{{ 'VMAP_INSERT_EDIT_ATTRS' | translate }}</span>
</a>
</li>
</ul>
@@ -128,7 +128,7 @@
<div class="basic-tools-dropdown-btn vmap-insert-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>
@@ -145,7 +145,7 @@
style="cursor:pointer"
ng-model="oBo.bo_snapping_enabled"
ng-click="ctrl.loadVectorSnappingData()">
- <label for="vmap-insert-snapping-menu-checkbox-{{$index}}" style="cursor:pointer" title="Definit si l'objet métier est accrochable">
+ <label for="vmap-insert-snapping-menu-checkbox-{{$index}}" style="cursor:pointer" title="{{ 'VMAP_INSERT_VECTOR_SNAPPING_DEF' | translate }}">
{{oBo.bo_title}}
</label>
</div>
@@ -170,7 +170,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>
@@ -179,10 +179,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; padding: 0px 8px;">
@@ -190,7 +190,7 @@
class="btn btn-info btn-sm btn-block"
ng-click="ctrl.submitInsertion()">
<span class="glyphicon glyphicon-share-alt margin-sides-2"></span>
- Sauvegarder
+ {{ 'VMAP_SAVE' | translate }}
</button>
</div>
</div>
@@ -204,7 +204,7 @@
<div class="modal-content" style="">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
- <h4 class="modal-title">Attributs</h4>
+ <h4 class="modal-title">{{ 'VMAP_ATTRS' | translate }}</h4>
</div>
<div class="modal-body modal-body-big-with-footer-3 font-12 width-100">
@@ -221,12 +221,12 @@
<div class="modal-footer modal-footer-sm text-left">
<button class="btn btn-info"
ng-click="ctrl.validateForm()">
- Modifier la géométrie
+ {{ 'VMAP_INSERT_MODIFY_GEOM' | translate }}
</button>
<button type="submit" class="btn btn-primary" form="basictools-insert-form-reader-form"
ng-click="ctrl.trySubmitInsertion()">
<span class="glyphicon glyphicon-share-alt margin-2"></span>
- Sauvegarder
+ {{ 'VMAP_SAVE' | translate }}
</button>
</div>
</div>
@@ -266,11 +266,11 @@
<h5 data-translate="FORM_SNAPPING_VISIBILITY_CONFIGURATION_CONFIGURATION_VMAP_CONFIG"></h5>
<div class="radio radio-inline">
<input type="radio" name="vmap_insert_snap_visible" id="vmap_insert_snap_visible_1" ng-model="ctrl.tmpSnapOptions.visible" ng-value="true">
- <label for="vmap_insert_snap_visible_1">Oui</label>
+ <label for="vmap_insert_snap_visible_1">{{ 'VMAP_YES' | translate }}</label>
</div>
<div class="radio radio-inline">
<input type="radio" name="vmap_insert_snap_visible" id="vmap_insert_snap_visible_2" ng-model="ctrl.tmpSnapOptions.visible" ng-value="false">
- <label for="vmap_insert_snap_visible_2">Non</label>
+ <label for="vmap_insert_snap_visible_2">{{ 'VMAP_NO' | translate }}</label>
</div>
</div>
</div>
@@ -293,7 +293,7 @@
id="vmap_insert_snap_avoid_superpositions_1_{{$index}}"
ng-model="ctrl.tmpSnapOptions.avoidSuperpositions[bo.bo_id]"
ng-value="true">
- <label for="vmap_insert_snap_avoid_superpositions_1_{{$index}}">Oui</label>
+ <label for="vmap_insert_snap_avoid_superpositions_1_{{$index}}">{{ 'VMAP_YES' | translate }}</label>
</div>
<div class="radio radio-inline">
<input type="radio"
@@ -301,7 +301,7 @@
id="vmap_insert_snap_avoid_superpositions_2_{{$index}}"
ng-model="ctrl.tmpSnapOptions.avoidSuperpositions[bo.bo_id]"
ng-value="false">
- <label for="vmap_insert_snap_avoid_superpositions_2_{{$index}}">Non</label>
+ <label for="vmap_insert_snap_avoid_superpositions_2_{{$index}}">{{ 'VMAP_NO' | translate }}</label>
</div>
</div>
</div>
@@ -310,10 +310,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>
diff --git a/src/module_vmap/module/template/tools/insert_mobile.html b/src/module_vmap/module/template/tools/insert_mobile.html
index 768c5b0f..db047b1a 100755
--- a/src/module_vmap/module/template/tools/insert_mobile.html
+++ b/src/module_vmap/module/template/tools/insert_mobile.html
@@ -10,18 +10,18 @@
<div class="modal-header">
<!-- Bouton retour -->
<div class="btn btn-default vmap_mobile_return_modal right" data-dismiss="modal" onclick="oVmap.getToolsManager().getBasicTools().toggleOutTools()">
- <span class="icon-caret-left"></span> Retour
+ <span class="icon-caret-left"></span> {{ 'VMAP_BACK' | translate }}
</div>
- <h4 class="modal-title">Attributs</h4>
+ <h4 class="modal-title">{{ 'VMAP_ATTRS' | translate }}</h4>
</div>
<div class="modal-body modal-body-big-with-footer-3 font-12 width-100">
<!--Form reader-->
<div id="basictools-insert-form-reader"
- app-form-reader
- app-form-definition-name="oInsertObject.sFormDefinitionName"
+ app-form-reader
+ app-form-definition-name="oInsertObject.sFormDefinitionName"
app-form-definition="oInsertObject.oFormDefinition"
- app-form-values="oInsertObject.oFormValues"
+ app-form-values="oInsertObject.oFormValues"
app-properties="ctrl.properties"
app-token="ctrl.token"></div>
@@ -30,9 +30,9 @@
<button type="submit" class="btn btn-primary" form="basictools-insert-form-reader-form"
ng-click="ctrl.trySubmitInsertion()">
<span class="glyphicon glyphicon-share-alt margin-2"></span>
- Sauvegarder
+ {{ 'VMAP_SAVE' | translate }}
</button>
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/module_vmap/module/template/tools/location_mobile.html b/src/module_vmap/module/template/tools/location_mobile.html
index 11517915..11c6bd2c 100755
--- a/src/module_vmap/module/template/tools/location_mobile.html
+++ b/src/module_vmap/module/template/tools/location_mobile.html
@@ -10,7 +10,7 @@
class="form-control minus left margin-5 margin-sides-10"
ng-if="sizeOf(ctrl.oBusinessObjects) > 0"
ng-model="ctrl.sSelectedLocationService"
- ng-change="ctrl.searchLocation()">
+ ng-change="ctrl.searchLocation()">
<!--Géocodeurs-->
<option ng-repeat="(key, value) in ctrl.locationServices"
value="{{key}}">{{value.title}}</option>
@@ -29,7 +29,7 @@
<!--Résultats-->
<div id="vmap_menu_location_results">
<div class="panel list-group">
- <!--Objet métier-->
+ <!--Objet métier-->
<div ng-if="locationServiceType === 'business_object'" ng-repeat="node in ctrl.locationResults">
<a href="#" class="list-group-item" data-toggle="collapse" data-target="#vmap_menu_location_results_{{$index}}" data-parent="#vmap_menu_location_results" onclick="$('#vmap_menu_location_results .in').collapse('hide');">
<span ng-bind-html="node['bo_summary'][ctrl.oBusinessObjects[ctrl.sSelectedLocationService].bo_result_field]"></span>
@@ -41,13 +41,13 @@
ng-bind-html="key + ': '+node['bo_summary'][key]">
</li>
<div style="margin: 10px;">
- <button type="button" name="button" class="btn btn-primary btn-sm pull-right" ng-click="ctrl.addToSelection(node, ctrl.oBusinessObjects[ctrl.sSelectedLocationService])">Voir sur la carte</button>
+ <button type="button" name="button" class="btn btn-primary btn-sm pull-right" ng-click="ctrl.addToSelection(node, ctrl.oBusinessObjects[ctrl.sSelectedLocationService])">{{ 'VMAP_LOCATION_SEE_ON_MAP' | translate }}</button>
</div>
</ul>
</div>
</div>
</div>
- <!--Géocodeur-->
+ <!--Géocodeur-->
<div ng-if="locationServiceType === 'geocoder'" ng-repeat="node in ctrl.locationResults">
<a href="#" class="list-group-item" data-toggle="collapse" data-target="#vmap_menu_location_results_{{$index}}" data-parent="#vmap_menu_location_results" onclick="$('#vmap_menu_location_results .in').collapse('hide');">
{{node.title}}
@@ -57,7 +57,7 @@
<ul style="margin: 10px 0px 40px 0px;">
<li ng-repeat="oSummaryElement in node.summary">{{oSummaryElement.label}}: {{oSummaryElement.value}}</li>
<div style="margin: 10px;">
- <button type="button" name="button" class="btn btn-primary btn-sm pull-right" ng-click="ctrl.locatePlace(node)">Voir sur la carte</button>
+ <button type="button" name="button" class="btn btn-primary btn-sm pull-right" ng-click="ctrl.locatePlace(node)">{{ 'VMAP_LOCATION_SEE_ON_MAP' | translate }}</button>
</div>
</ul>
</div>
@@ -77,17 +77,17 @@
<form ng-submit="ctrl.addScale()">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">×</button>
- <h4 class="modal-title">Nouvelle échelle</h4>
+ <h4 class="modal-title">{{ 'VMAP_LOCATION_NEW_SCALE' | translate }}</h4>
</div>
<div class="modal-body">
- <i>Saisissez une nouvelle échelle puis cliquez sur "ajouter"</i>
+ {{ 'VMAP_LOCATION_NEW_SCALE_DEF' | translate }}</i>
<div class="input-group">
<span class="input-group-addon" id="new-scale-describer">1:</span>
<input type="number" class="form-control" id="new-scale-input" aria-describedby="new-scale-describer" required>
</div>
</div>
<div class="modal-footer">
- <button type="submit" class="btn btn-primary">Ajouter</button>
+ <button type="submit" class="btn btn-primary">{{ 'VMAP_ADD' | translate }}</button>
</div>
</form>
</div>
--
GitLab