From 63821ba9231d77f7fcd4f46c10da54e9fd32c2b8 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 20 Feb 2019 09:46:37 +0100
Subject: [PATCH] Translate Measures
---
src/module_vmap/module/lang/lang-en.json | 14 ++++++++
src/module_vmap/module/lang/lang-fr.json | 15 +++++++-
.../template/tools/location_mobile.html | 4 +--
.../module/template/tools/measure.html | 36 +++++++++----------
.../module/template/tools/measure_mobile.html | 13 ++++---
5 files changed, 54 insertions(+), 28 deletions(-)
diff --git a/src/module_vmap/module/lang/lang-en.json b/src/module_vmap/module/lang/lang-en.json
index 4ee0c232..a3ff6a7e 100644
--- a/src/module_vmap/module/lang/lang-en.json
+++ b/src/module_vmap/module/lang/lang-en.json
@@ -515,6 +515,15 @@
"VMAP_NO": "No",
"VMAP_DETAILS": "Details",
"VMAP_MORE_RESULTS": "More results",
+ "VMAP_MEASURE": "Measure",
+ "VMAP_MEASURES": "Measures",
+ "VMAP_EDIT": "Edit",
+ "VMAP_DELETE": "Delete",
+ "VMAP_EMPTY": "Empty",
+ "VMAP_TYPE": "Type",
+ "VMAP_RADIUS": "Radius",
+ "VMAP_SEE_ON_MAP": "See on map",
+ "VMAP_CSV_EXPORT": "Export to CSV",
"": "",
"VMAP_LAYERTREE_DATASETS": "Datasets",
"VMAP_LAYERTREE_MAP_1": "Map 1",
@@ -598,5 +607,10 @@
"VMAP_LOCATION_GO": "Go",
"VMAP_LOCATION_GO_TO_PREV_EXTENT": "Next extent",
"VMAP_LOCATION_GO_TO_NEXT_EXTENT": "Previous extent",
+ "": "",
+ "VMAP_MEASURE_SHOW_HIDE_ANOTATIONS": "Show / Hide Anotations",
+ "VMAP_MEASURE_SHOW_MEASURES": "Display measures",
+ "VMAP_MEASURE_NO_MEASURES": "No measure to display",
+ "VMAP_COORDINATES_PROJ": "Coordinates projection",
"": ""
}
diff --git a/src/module_vmap/module/lang/lang-fr.json b/src/module_vmap/module/lang/lang-fr.json
index 3f1ebdb1..fac07fe4 100644
--- a/src/module_vmap/module/lang/lang-fr.json
+++ b/src/module_vmap/module/lang/lang-fr.json
@@ -516,6 +516,15 @@
"VMAP_NO": "Non",
"VMAP_DETAILS": "Détails",
"VMAP_MORE_RESULTS": "Plus de résultats",
+ "VMAP_MEASURE": "Mesure",
+ "VMAP_MEASURES": "Mesures",
+ "VMAP_EDIT": "Editer",
+ "VMAP_DELETE": "Supprimer",
+ "VMAP_EMPTY": "Vider",
+ "VMAP_TYPE": "Type",
+ "VMAP_RADIUS": "Rayon",
+ "VMAP_SEE_ON_MAP": "Voir sur la carte",
+ "VMAP_CSV_EXPORT": "Exporter en CSV",
"": "",
"VMAP_LAYERTREE_DATASETS": "Jeux de données",
"VMAP_LAYERTREE_MAP_1": "Carte 1",
@@ -587,7 +596,6 @@
"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\"",
"VMAP_LOCATION_SEARCH_RESULTS": "Résultats de la recherche",
@@ -599,5 +607,10 @@
"VMAP_LOCATION_GO": "Aller",
"VMAP_LOCATION_GO_TO_PREV_EXTENT": "Aller à l'étendue précédente",
"VMAP_LOCATION_GO_TO_NEXT_EXTENT": "Aller à l'étendue suivante",
+ "": "",
+ "VMAP_MEASURE_SHOW_HIDE_ANOTATIONS": "Afficher / Cacher les annotations",
+ "VMAP_MEASURE_SHOW_MEASURES": "Afficher les mesures",
+ "VMAP_MEASURE_NO_MEASURES": "Aucune mesure à afficher",
+ "VMAP_COORDINATES_PROJ": "Projection des coordonnées",
"": ""
}
diff --git a/src/module_vmap/module/template/tools/location_mobile.html b/src/module_vmap/module/template/tools/location_mobile.html
index 11c6bd2c..471955dc 100755
--- a/src/module_vmap/module/template/tools/location_mobile.html
+++ b/src/module_vmap/module/template/tools/location_mobile.html
@@ -41,7 +41,7 @@
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])">{{ 'VMAP_LOCATION_SEE_ON_MAP' | translate }}</button>
+ <button type="button" name="button" class="btn btn-primary btn-sm pull-right" ng-click="ctrl.addToSelection(node, ctrl.oBusinessObjects[ctrl.sSelectedLocationService])">{{ 'VMAP_SEE_ON_MAP' | translate }}</button>
</div>
</ul>
</div>
@@ -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)">{{ 'VMAP_LOCATION_SEE_ON_MAP' | translate }}</button>
+ <button type="button" name="button" class="btn btn-primary btn-sm pull-right" ng-click="ctrl.locatePlace(node)">{{ 'VMAP_SEE_ON_MAP' | translate }}</button>
</div>
</ul>
</div>
diff --git a/src/module_vmap/module/template/tools/measure.html b/src/module_vmap/module/template/tools/measure.html
index 4bde3781..8febc844 100755
--- a/src/module_vmap/module/template/tools/measure.html
+++ b/src/module_vmap/module/template/tools/measure.html
@@ -5,10 +5,10 @@
</div>
<div style="display: none" class="checkbox checkbox-success">
<input id="measure-anotations" type="checkbox" style="cursor:pointer" ng-click="ctrl.showHideAnotations()" checked>
- <label for="measure-anotations" style="cursor:pointer">Afficher / Cacher les annotations</label>
+ <label for="measure-anotations" style="cursor:pointer">{{ 'VMAP_MEASURE_SHOW_HIDE_ANOTATIONS' | translate }}</label>
</div>
-<i class="basic-tools-dropdown-title">Mesure</i>
+<i class="basic-tools-dropdown-title">{{ 'VMAP_MEASURE' | translate }}</i>
<ul class="basic-tools-dropdown-menu">
<li role="separator" class="divider"></li>
@@ -20,7 +20,7 @@
: ctrl.currentAction === 'basicTools-measurePoint'}"
ng-click="ctrl.drawPoint(ctrl.currentAction === 'basicTools-measurePoint')">
<span class="icon-point"></span>
- <span class="margin-sides-10">Point</span>
+ <span class="margin-sides-10">{{ 'VMAP_POINT' | translate }}</span>
</a>
</li>
<li class="basic-tools-dropdown-btn">
@@ -30,7 +30,7 @@
'active': ctrl.currentAction === 'basicTools-measureLineString'}"
ng-click="ctrl.measureLine(ctrl.currentAction === 'basicTools-measureLineString')">
<span class="icon-line"></span>
- <span class="margin-sides-10">Ligne</span>
+ <span class="margin-sides-10">{{ 'VMAP_LINE' | translate }}</span>
</a>
</li>
<li class="basic-tools-dropdown-btn">
@@ -40,7 +40,7 @@
'active': ctrl.currentAction === 'basicTools-measurePolygon'}"
ng-click="ctrl.measurePolygon(ctrl.currentAction === 'basicTools-measurePolygon')">
<span class="icon-polygon"></span>
- <span class="margin-sides-10">Polygone</span>
+ <span class="margin-sides-10">{{ 'VMAP_POLYGON' | translate }}</span>
</a>
</li>
<li class="basic-tools-dropdown-btn">
@@ -51,7 +51,7 @@
: ctrl.currentAction === 'basicTools-measureCircle'}"
ng-click="ctrl.measureCircle(ctrl.currentAction === 'basicTools-measureCircle')">
<span class="icon-circle"></span>
- <span class="margin-sides-10">Cercle</span>
+ <span class="margin-sides-10">{{ 'VMAP_CIRCLE' | translate }}</span>
</a>
</li>
@@ -65,7 +65,7 @@
: ctrl.currentAction === 'basicTools-modifyMeasure'}"
ng-click="ctrl.modifyFeature(ctrl.currentAction === 'basicTools-modifyMeasure')">
<span class="glyphicon glyphicon-pencil"></span>
- <span class="margin-sides-10">Editer</span>
+ <span class="margin-sides-10">{{ 'VMAP_EDIT' | translate }}</span>
</a>
</li>
<li class="basic-tools-dropdown-btn">
@@ -75,13 +75,13 @@
'active': ctrl.currentAction === 'basicTools-deleteMeasure'}"
ng-click="ctrl.deleteFeature(ctrl.currentAction === 'basicTools-deleteMeasure')">
<span class="glyphicon glyphicon-remove"></span>
- <span class="margin-sides-10">Supprimer</span>
+ <span class="margin-sides-10">{{ 'VMAP_DELETE' | translate }}</span>
</a>
</li>
<li class="basic-tools-dropdown-btn">
<a id="measure-deleteAllFeatures-btn" class="btn-measure" ng-click="ctrl.deleteAllFeatures()">
<span class="glyphicon glyphicon-trash"></span>
- <span class="margin-sides-10">Vider</span>
+ <span class="margin-sides-10">{{ 'VMAP_EMPTY' | translate }}</span>
</a>
</li>
@@ -90,7 +90,7 @@
data-toggle="modal"
data-target="#measureAndDrawModal"
ng-click="ctrl.displayFeatures()">
- Afficher les mesures
+ {{ 'VMAP_MEASURE_SHOW_MEASURES' | translate }}
</a></li>
</ul>
@@ -102,19 +102,19 @@
<div class="modal-content">
<div class="modal-header">
<button id="modal-display-measure-close" type="button" class="close" data-dismiss="modal">×</button>
- <h4 class="modal-title">Mesures</h4>
+ <h4 class="modal-title">{{ 'VMAP_MEASURES' | translate }}</h4>
</div>
<div class="modal-body modal-body-big" style="height:82%">
<div ng-if="ctrl.sketches.length === 0">
- <b>Aucune mesure à afficher</b>
+ <b>{{ 'VMAP_MEASURE_NO_MEASURES' | translate }}</b>
</div>
<div ng-repeat="feature in ctrl.sketches">
<div ng-if="feature.get('Type') === 'Cercle'">
<div class="font-15" class="font-14">
- <div><b class="font-15">Type: </b>{{feature.get('Type')}}</div>
- <div><b class="font-15">Rayon: </b>{{feature.get('Rayon')}}</div>
- <div><b class="font-15">Projection des coordonnées </b>{{ctrl.oProjections[feature.get('Projection')]}}</div>
+ <div><b class="font-15">{{ 'VMAP_TYPE' | translate }}: </b>{{feature.get('Type')}}</div>
+ <div><b class="font-15">{{ 'VMAP_RADIUS' | translate }}: </b>{{feature.get('Rayon')}}</div>
+ <div><b class="font-15">{{ 'VMAP_COORDINATES_PROJ' | translate }}: </b>{{ctrl.oProjections[feature.get('Projection')]}}</div>
</div>
<table class="table table-striped bordered margin-10 font-14">
<thead>
@@ -137,7 +137,7 @@
<div class="font-15" ng-repeat="key in feature.get('Keys')" ng-if="key === 'Coordonnées'">
<b class="font-15">{{key}}: </b>{{ctrl.transform(feature.get('Coordonnées'), ctrl.projection, feature.get('Projection'))}}
</div>
- <div><b class="font-15">Projection des coordonnées: </b>{{ctrl.oProjections[feature.get('Projection')]}}</div>
+ <div><b class="font-15">{{ 'VMAP_COORDINATES_PROJ' | translate }}: </b>{{ctrl.oProjections[feature.get('Projection')]}}</div>
</div>
<table class="table table-striped bordered margin-10 font-14" ng-if="feature.get('Type') !== 'Point' || feature.get('Type') !== 'Cercle'">
@@ -156,7 +156,7 @@
</tr>
</tbody>
</table>
- <button type="button" class="btn btn-primary right margin-sides-5" data-dismiss="modal" ng-click="ctrl.zoomToFeature(feature)">Voir sur la carte</button>
+ <button type="button" class="btn btn-primary right margin-sides-5" data-dismiss="modal" ng-click="ctrl.zoomToFeature(feature)">{{ 'VMAP_SEE_ON_MAP' | translate }}</button>
<br>
<br>
</div>
@@ -164,7 +164,7 @@
</div>
<!--/.modal-body modal-body-big-->
<div class="modal-footer" ng-if="ctrl.sketches.length !== 0">
- <a id="export-csv-button" class="btn btn-primary" download='Mesures.csv' href="" >Exporter tout en CSV</a>
+ <a id="export-csv-button" class="btn btn-primary" download='Mesures.csv' href="" >{{ 'VMAP_CSV_EXPORT' | translate }}</a>
</div>
</div>
</div>
diff --git a/src/module_vmap/module/template/tools/measure_mobile.html b/src/module_vmap/module/template/tools/measure_mobile.html
index b69fba21..e0f2512c 100755
--- a/src/module_vmap/module/template/tools/measure_mobile.html
+++ b/src/module_vmap/module/template/tools/measure_mobile.html
@@ -1,14 +1,13 @@
-<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileMeasurePoint()"><span class="icon-point mobile_menu_logo"></span> Point</a>
-<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileMeasureLine()"><span class="icon-line mobile_menu_logo"></span> Ligne</a>
-<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileMeasurePolygon()"><span class="icon-polygon mobile_menu_logo"></span> Polygone</a>
-<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileMeasureCircle()"><span class="icon-circle mobile_menu_logo"></span> Cercle</a>
-<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileDeleteAllFeatures()"><span class="icon-trash mobile_menu_logo"></span> Vider</a>
+<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileMeasurePoint()"><span class="icon-point mobile_menu_logo"></span> {{ 'VMAP_POINT' | translate }}</a>
+<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileMeasureLine()"><span class="icon-line mobile_menu_logo"></span> {{ 'VMAP_LINE' | translate }}</a>
+<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileMeasurePolygon()"><span class="icon-polygon mobile_menu_logo"></span> {{ 'VMAP_POLYGON' | translate }}</a>
+<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileMeasureCircle()"><span class="icon-circle mobile_menu_logo"></span> {{ 'VMAP_CIRCLE' | translate }}</a>
+<a class="list-group-item sublist-group-item" ng-click="ctrl.mobileDeleteAllFeatures()"><span class="icon-trash mobile_menu_logo"></span> {{ 'VMAP_EMPTY' | translate }}</a>
<div style="display: none">
<input id="geodesic" type="checkbox" style="cursor:pointer" checked>use geodesic measures
</div>
<div style="display: none" class="checkbox checkbox-success">
<input id="measure-anotations" type="checkbox" style="cursor:pointer" ng-click="ctrl.showHideAnotations()" checked>
- <label for="measure-anotations" style="cursor:pointer">Afficher / Cacher les annotations</label>
+ <label for="measure-anotations" style="cursor:pointer">{{ 'VMAP_MEASURE_SHOW_HIDE_ANOTATIONS' | translate }}</label>
</div>
-
--
GitLab