From 4b3a2c042f57b5a2fb311812710befa555418d09 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 20 Feb 2019 12:41:36 +0100
Subject: [PATCH] Translate mymap
---
src/module_vmap/module/lang/lang-en.json | 8 +++++-
src/module_vmap/module/lang/lang-fr.json | 7 +++++-
.../template/layers/mapmodal/mymap.html | 25 +++++++++----------
3 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/module_vmap/module/lang/lang-en.json b/src/module_vmap/module/lang/lang-en.json
index 77c571d4..e048be70 100644
--- a/src/module_vmap/module/lang/lang-en.json
+++ b/src/module_vmap/module/lang/lang-en.json
@@ -542,6 +542,9 @@
"VMAP_REPROJECT": "Reproject",
"VMAP_CREATE_AND_USE": "Create and use",
"VMAP_ALL": "All",
+ "VMAP_ZOOM": "Zoom",
+ "VMAP_EXTENT": "Extent",
+ "VMAP_DOWNLOAD": "Download",
"": "",
"VMAP_LAYERTREE_DATASETS": "Datasets",
"VMAP_LAYERTREE_MAP_1": "Map 1",
@@ -570,7 +573,7 @@
"VMAP_MAP_CANCEL_OPERATION": "Cancel operation",
"": "",
"VMAP_MAPS": "MAPS",
- "VMAP_MAPS_MANAGEMENT": "MAPS MANAGEMENT",
+ "VMAP_MAPS_MANAGEMENT": "MAP MANAGER",
"": "",
"VMAP_ADVANCEDSELECT_TABLE": "Resulting table",
"VMAP_ADVANCEDSELECT_GRAPHIC_SELECTION": "Graphic selection",
@@ -666,5 +669,8 @@
"VMAP_MAPMODAL_OSM": "Open Street Map",
"VMAP_MAPMODAL_BING": "Bing Maps",
"VMAP_MAPMODAL_ADD_LAYERS": "Add layers",
+ "": "",
+ "VMAP_MYMAP_TITLE": "Running map",
+ "VMAP_MYMAP_DELETE_SHEET": "Remove sheet from map",
"": ""
}
diff --git a/src/module_vmap/module/lang/lang-fr.json b/src/module_vmap/module/lang/lang-fr.json
index cab803b0..875b239d 100644
--- a/src/module_vmap/module/lang/lang-fr.json
+++ b/src/module_vmap/module/lang/lang-fr.json
@@ -543,6 +543,9 @@
"VMAP_REPROJECT": "Reprojeter",
"VMAP_CREATE_AND_USE": "Créér et utiliser",
"VMAP_ALL": "Tous",
+ "VMAP_ZOOM": "Zoom",
+ "VMAP_EXTENT": "Étendue",
+ "VMAP_DOWNLOAD": "Télécharger",
"": "",
"VMAP_LAYERTREE_DATASETS": "Jeux de données",
"VMAP_LAYERTREE_MAP_1": "Carte 1",
@@ -552,7 +555,6 @@
"VMAP_LAYERTREE_TITLE_VISIBLE_LAYER": "Définit si la couche est visible",
"VMAP_LAYERTREE_TITLE_VISIBLE_ALL_LAYER": "Définit si les couches sont visibles",
"VMAP_LAYERTREE_TITLE_WMS_QUERYABLE_SHEET": "Definit si le calque est interrogeable par requête WMS",
- "VMAP_LAYERTREE_TITLE_WMS_QUERYABLE_LAYER": "Definit si la couche est interrogeable par requête WMS",
"VMAP_LAYERTREE_FILTER": "Filtre",
"VMAP_LAYERTREE_LAYER_FILTER": "Filtre de la couche",
"VMAP_LAYERTREE_TRANSPARENCY": "Transparence",
@@ -667,5 +669,8 @@
"VMAP_MAPMODAL_OSM": "Open Street Map",
"VMAP_MAPMODAL_BING": "Bing Maps",
"VMAP_MAPMODAL_ADD_LAYERS": "Ajout de couches",
+ "": "",
+ "VMAP_MYMAP_TITLE": "Carte en cours",
+ "VMAP_MYMAP_DELETE_SHEET": "Supprime le calque de la carte",
"": ""
}
diff --git a/src/module_vmap/module/template/layers/mapmodal/mymap.html b/src/module_vmap/module/template/layers/mapmodal/mymap.html
index da0f769f..0455f8f6 100755
--- a/src/module_vmap/module/template/layers/mapmodal/mymap.html
+++ b/src/module_vmap/module/template/layers/mapmodal/mymap.html
@@ -1,34 +1,33 @@
<!-- Gestion de la carte en cours -->
-
-<h3>Carte en cours: </h3>
+<h3>{{ 'VMAP_MYMAP_TITLE' | translate }}: </h3>
<hr>
<!-- Vue -->
<br>
<div class="input-group">
- <span class="input-group-addon" id="sizing-addon2">Projection:</span>
+ <span class="input-group-addon" id="sizing-addon2">{{ 'VMAP_PROJETION' | translate }}</span>
<label type="text" class="form-control" value="{{ctrl.displayedView.projection}}" aria-describedby="sizing-addon2" style="cursor:default !important;" readonly>{{ctrl.displayedView.projection}}</label>
</div>
<br>
<div class="row">
<div class="col-md-3">
<div class="input-group">
- <span class="input-group-addon" id="sizing-addon2">Zoom:</span>
+ <span class="input-group-addon" id="sizing-addon2">{{ 'VMAP_ZOOM' | translate }}</span>
<label type="text" class="form-control" value="{{ctrl.displayedView.zoom}}" aria-describedby="sizing-addon2" style="cursor:default !important;" readonly>{{ctrl.displayedView.zoom}}</label>
</div>
</div>
<div class="col-md-9">
<div class="input-group">
- <span class="input-group-addon" id="sizing-addon2">Centre:</span>
+ <span class="input-group-addon" id="sizing-addon2">{{ 'VMAP_CENTER' | translate }}</span>
<label type="text" class="form-control" value="{{ctrl.displayedView.center}}" aria-describedby="sizing-addon2" style="cursor:default !important;" readonly>{{ctrl.displayedView.center}}</label>
</div>
</div>
</div>
<br>
<div class="input-group">
- <span class="input-group-addon" id="sizing-addon2">Etendue</span>
+ <span class="input-group-addon" id="sizing-addon2">{{ 'VMAP_EXTENT' | translate }}</span>
<label type="text" class="form-control font-12" value="{{ctrl.displayedView.extent}}" aria-describedby="sizing-addon2" style="cursor:default !important;" readonly>{{ctrl.displayedView.extent}}</label>
</div>
@@ -55,14 +54,14 @@
<div class="col-md-10" style="padding-right: 0px">
<div class="layer-name layer-name-tree">{{layer.name}}</div>
<div class="checkbox checkbox-info inline-checkbox">
- <input ng-model="layer.olLayer.getVisible()" ng-model-options="{getterSetter: true}" type="checkbox" style="cursor:default; position: absolute" title="Definit si la couche est visible">
- <label for="" style="cursor:default" title="Definit si la couche est visible"></label>
+ <input ng-model="layer.olLayer.getVisible()" ng-model-options="{getterSetter: true}" type="checkbox" style="cursor:default; position: absolute" title="{{ 'VMAP_LAYERTREE_TITLE_VISIBLE_SHEET' | translate }}">
+ <label for="" style="cursor:default" title="{{ 'VMAP_LAYERTREE_TITLE_VISIBLE_SHEET' | translate }}"></label>
</div>
</div>
<div class="col-md-2">
- <button class="btn btn-xs btn-warning glyphicon glyphicon glyphicon-trash right" aria-hidden="true" data-toggle="tooltip" title="Supprime la couche de la carte" ng-click="ctrl.removeLayer(layer.olLayer)"></button>
+ <button class="btn btn-xs btn-warning glyphicon glyphicon glyphicon-trash right" aria-hidden="true" data-toggle="tooltip" title="{{ 'VMAP_MYMAP_DELETE_SHEET' | translate }}" ng-click="ctrl.removeLayer(layer.olLayer)"></button>
</div>
- </div>
+ </div>
</div>
</li>
</ul>
@@ -75,13 +74,13 @@
<div style="display: inline-block; width: 100%">
<div ng-if="ctrl.isIE">
- <a id="exportMapButtonIe" class="btn btn-warning left" ng-click="ctrl.downloadBlob()">Télécharger ie</a>
+ <a id="exportMapButtonIe" class="btn btn-warning left" ng-click="ctrl.downloadBlob()">{{ 'VMAP_DOWNLOAD' | translate }}</a>
</div>
<div ng-if="!ctrl.isIE">
<!-- le href est défini dans nsVmap.nsMapManager.nsMapModal.MyMap.mymapController.reloadMapFile -->
- <a id="exportMapButton" class="btn btn-warning left" href="" download="map.json">Télécharger</a>
+ <a id="exportMapButton" class="btn btn-warning left" href="" download="map.json">{{ 'VMAP_DOWNLOAD' | translate }}</a>
</div>
</div>
-<button id="btn-reload-myMap" style="display: none" ng-click="ctrl.reloadTree()">Reload map</button>
\ No newline at end of file
+<button id="btn-reload-myMap" style="display: none" ng-click="ctrl.reloadTree()">Reload map</button>
--
GitLab