From d901e263344e86836972019ff1b95ed931036083 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Sat, 17 Aug 2024 19:16:21 +0200
Subject: [PATCH] stringify

---
 application/views/awards/helvetia/index.php   | 4 +++-
 application/views/awards/rac/index.php        | 4 +++-
 application/views/awards/waja/index.php       | 4 +++-
 application/views/awards/was/index.php        | 4 +++-
 application/views/interface_assets/footer.php | 1 +
 assets/js/leaflet/leafembed.js                | 2 +-
 assets/js/sections/dxccmap.js                 | 6 +++---
 assets/js/sections/helvetiamap.js             | 4 ++--
 assets/js/sections/iotamap.js                 | 6 +++---
 assets/js/sections/jccmap.js                  | 8 ++++----
 assets/js/sections/racmap.js                  | 6 +++---
 assets/js/sections/wajamap.js                 | 6 +++---
 assets/js/sections/wasmap.js                  | 6 +++---
 13 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/application/views/awards/helvetia/index.php b/application/views/awards/helvetia/index.php
index 4a8531d4f..c56793077 100644
--- a/application/views/awards/helvetia/index.php
+++ b/application/views/awards/helvetia/index.php
@@ -1,5 +1,7 @@
 <script>
-	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"
+	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>";
+    var lang_switzerland_canton = "<?= _pgettext("Switzerland Canton", "Canton"); ?>";
+    var lang_hover_over_a_canton = "<?= __("Hover over a canton"); ?>";
 </script>
 
 <style>
diff --git a/application/views/awards/rac/index.php b/application/views/awards/rac/index.php
index 5046de255..92bda5a6d 100644
--- a/application/views/awards/rac/index.php
+++ b/application/views/awards/rac/index.php
@@ -1,5 +1,7 @@
 <script>
-	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"
+	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>";
+    var lang_canada_province = "<?= _pgettext("Canada Province", "Province"); ?>";
+    var lang_hover_over_a_province = "<?= __("Hover over a province"); ?>";
 </script>
 
 <style>
diff --git a/application/views/awards/waja/index.php b/application/views/awards/waja/index.php
index fd9c0b9da..9a5ffe9d7 100644
--- a/application/views/awards/waja/index.php
+++ b/application/views/awards/waja/index.php
@@ -1,5 +1,7 @@
 <script>
-	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"
+	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>";
+    var lang_japan_province = "<?= _pgettext("Japan Prefecture", "Prefecture"); ?>";
+    var lang_hover_over_a_prefecture = "<?= __("Hover over a prefecture"); ?>";
 </script>
 
 <style>
diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php
index 342ac31d6..1da096045 100644
--- a/application/views/awards/was/index.php
+++ b/application/views/awards/was/index.php
@@ -1,5 +1,7 @@
 <script>
-	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"
+	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>";
+    var lang_usa_state = "<?= _pgettext("USA State", "State"); ?>";
+    var lang_hover_over_a_state = "<?= __("Hover over a state"); ?>";
 </script>
 
 <style>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 6c264357b..efed1d934 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -39,6 +39,7 @@
     var lang_general_word_confirmed = "<?= __("Confirmed"); ?>";
     var lang_general_word_worked_not_confirmed = "<?= __("Worked not confirmed"); ?>";
     var lang_general_word_not_worked = "<?= __("Not worked"); ?>";
+    var lang_general_gridsquares = "<?= __("Gridsquares"); ?>";
     var lang_admin_close = "<?= __("Close"); ?>";
     var lang_admin_save = "<?= __("Save"); ?>";
     var lang_admin_clear = "<?= __("Clear"); ?>";
diff --git a/assets/js/leaflet/leafembed.js b/assets/js/leaflet/leafembed.js
index a05d55587..73a138008 100644
--- a/assets/js/leaflet/leafembed.js
+++ b/assets/js/leaflet/leafembed.js
@@ -69,7 +69,7 @@ function initmap(ShowGrid='No', MapTag='map', options={}) {
     map.setView(new L.LatLng(_q_lat, _q_lng), _q_zoom);
 	map.addLayer(osm);
 	//map.on('moveend', onMapMove); // all data load directecty, without interest in recharging during a movement
-	var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(map);
+	var layerControl = new L.Control.Layers(null, { [lang_general_gridsquares]: maidenhead = L.maidenhead() }).addTo(map);
 	if(ShowGrid == "Yes") { maidenhead.addTo(map); }
 
 	if ((typeof options.initmap_only=="undefined") || (options.initmap_only!=true))  { initplot(_url_qso, options); }
diff --git a/assets/js/sections/dxccmap.js b/assets/js/sections/dxccmap.js
index 2526e144a..c865b130a 100644
--- a/assets/js/sections/dxccmap.js
+++ b/assets/js/sections/dxccmap.js
@@ -124,9 +124,9 @@ function load_dxcc_map2(data, worked, confirmed, notworked) {
     legend.onAdd = function(map) {
         var div = L.DomUtil.create("div", "legend");
         div.innerHTML += "<h4>Colors</h4>";
-        div.innerHTML += '<i style="background: green"></i><span>Confirmed ('+confirmedcount+')</span><br>';
-        div.innerHTML += '<i style="background: orange"></i><span>Worked not confirmed ('+workednotconfirmedcount+')</span><br>';
-        div.innerHTML += '<i style="background: red"></i><span>Not worked ('+notworkedcount+')</span><br>';
+        div.innerHTML += '<i style="background: green"></i><span>' + lang_general_word_confirmed + ' ('+confirmedcount+')</span><br>';
+        div.innerHTML += '<i style="background: orange"></i><span>' + lang_general_word_worked_not_confirmed + ' ('+workednotconfirmedcount+')</span><br>';
+        div.innerHTML += '<i style="background: red"></i><span>' + lang_general_word_not_worked + ' ('+notworkedcount+')</span><br>';
         return div;
     };
 
diff --git a/assets/js/sections/helvetiamap.js b/assets/js/sections/helvetiamap.js
index 9f424541b..8807d17f2 100644
--- a/assets/js/sections/helvetiamap.js
+++ b/assets/js/sections/helvetiamap.js
@@ -105,7 +105,7 @@ info.onAdd = function (map) {
 
 // method that we will use to update the control based on feature properties passed
 info.update = function (props) {
-    this._div.innerHTML = '<h4>Kanton</h4>' +  (props ? '<b>' + props.kan_code + ' - ' + props.kan_name + '</b><br />' : 'Hover over a kanton');
+    this._div.innerHTML = '<h4>' + lang_switzerland_canton + '</h4>' +  (props ? '<b>' + props.kan_code + ' - ' + props.kan_name + '</b><br />' : lang_hover_over_a_canton);
 };
 
 info.addTo(map);
@@ -125,7 +125,7 @@ map.setView([46.8, 8.4], 8);
     addMarkers();
   });
 
-  var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(map);
+  var layerControl = new L.Control.Layers(null, { [lang_general_gridsquares]: maidenhead = L.maidenhead() }).addTo(map);
   maidenhead.addTo(map);
 }
 
diff --git a/assets/js/sections/iotamap.js b/assets/js/sections/iotamap.js
index 74ed5288b..91f73c1d2 100644
--- a/assets/js/sections/iotamap.js
+++ b/assets/js/sections/iotamap.js
@@ -109,9 +109,9 @@ function load_iota_map2(data, worked, confirmed, notworked) {
     legend.onAdd = function(map) {
         var div = L.DomUtil.create("div", "legend");
         div.innerHTML += "<h4>Colors</h4>";
-        div.innerHTML += '<i style="background: green"></i><span>Confirmed ('+confirmedcount+')</span><br>';
-        div.innerHTML += '<i style="background: orange"></i><span>Worked not confirmed ('+workednotconfirmedcount+')</span><br>';
-        div.innerHTML += '<i style="background: red"></i><span>Not worked ('+notworkedcount+')</span><br>';
+        div.innerHTML += '<i style="background: green"></i><span>' + lang_general_word_confirmed + ' ('+confirmedcount+')</span><br>';
+        div.innerHTML += '<i style="background: orange"></i><span>' + lang_general_word_worked_not_confirmed + ' ('+workednotconfirmedcount+')</span><br>';
+        div.innerHTML += '<i style="background: red"></i><span>' + lang_general_word_not_worked + ' ('+notworkedcount+')</span><br>';
         return div;
     };
 
diff --git a/assets/js/sections/jccmap.js b/assets/js/sections/jccmap.js
index a03133ebe..392aa06a3 100644
--- a/assets/js/sections/jccmap.js
+++ b/assets/js/sections/jccmap.js
@@ -110,10 +110,10 @@ function load_jcc_map2(data, worked, confirmed, notworked) {
 
     legend.onAdd = function(map) {
         var div = L.DomUtil.create("div", "legend");
-        div.innerHTML += "<h4>Colors</h4>";
-        div.innerHTML += '<i style="background: green"></i><span>Confirmed ('+confirmedcount+')</span><br>';
-        div.innerHTML += '<i style="background: orange"></i><span>Worked not confirmed ('+workednotconfirmedcount+')</span><br>';
-        div.innerHTML += '<i style="background: red"></i><span>Not worked ('+notworkedcount+')</span><br>';
+        div.innerHTML += "<h4>" + lang_general_word_colors + "</h4>";
+        div.innerHTML += "<i style='background: green'></i><span>" + lang_general_word_confirmed + " (" + confirmedcount + ")</span><br>";
+        div.innerHTML += "<i style='background: orange'></i><span>" + lang_general_word_worked_not_confirmed + " (" + workednotconfirmedcount + ")</span><br>";
+        div.innerHTML += "<i style='background: red'></i><span>" + lang_general_word_not_worked + " (" + notworkedcount + ")</span><br>";
         return div;
     };
 
diff --git a/assets/js/sections/racmap.js b/assets/js/sections/racmap.js
index b4841370b..f9db12515 100644
--- a/assets/js/sections/racmap.js
+++ b/assets/js/sections/racmap.js
@@ -122,8 +122,8 @@ info.onAdd = function (map) {
 
 // method that we will use to update the control based on feature properties passed
 info.update = function (props) {
-    this._div.innerHTML = '<h4>Province</h4>' +  (props ?
-        '<b>' + props.id.substring(3,5) + ' - ' + props.name + '</b><br />' : 'Hover over a province');
+    this._div.innerHTML = '<h4>' + lang_canada_province + '</h4>' +  (props ?
+        '<b>' + props.id.substring(3,5) + ' - ' + props.name + '</b><br />' : lang_hover_over_a_province);
 };
 
 info.addTo(map);
@@ -139,7 +139,7 @@ info.addTo(map);
     addMarkers();
   });
 
-  var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(map);
+  var layerControl = new L.Control.Layers(null, { [lang_general_gridsquares]: maidenhead = L.maidenhead() }).addTo(map);
   maidenhead.addTo(map);
 }
 
diff --git a/assets/js/sections/wajamap.js b/assets/js/sections/wajamap.js
index 8629b977a..b5dcf3431 100644
--- a/assets/js/sections/wajamap.js
+++ b/assets/js/sections/wajamap.js
@@ -206,8 +206,8 @@ info.onAdd = function (map) {
 
 // method that we will use to update the control based on feature properties passed
 info.update = function (props) {
-    this._div.innerHTML = '<h4>Prefecture</h4>' +  (props ?
-        '<b>' + props.id.substring(3,5) + ' - ' + props.name + '</b><br />' : 'Hover over a prefecture');
+    this._div.innerHTML = '<h4>' + lang_japan_province + '</h4>' +  (props ?
+        '<b>' + props.id.substring(3,5) + ' - ' + props.name + '</b><br />' : lang_hover_over_a_prefecture);
 };
 
 info.addTo(map);
@@ -223,7 +223,7 @@ info.addTo(map);
     addMarkers();
   });
 
-  var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(map);
+  var layerControl = new L.Control.Layers(null, { [lang_general_gridsquares]: maidenhead = L.maidenhead() }).addTo(map);
   maidenhead.addTo(map);
 
 }
diff --git a/assets/js/sections/wasmap.js b/assets/js/sections/wasmap.js
index e2be3fb35..7a684517a 100644
--- a/assets/js/sections/wasmap.js
+++ b/assets/js/sections/wasmap.js
@@ -226,8 +226,8 @@ info.onAdd = function (map) {
 
 // method that we will use to update the control based on feature properties passed
 info.update = function (props) {
-    this._div.innerHTML = '<h4>State</h4>' +  (props ?
-        '<b>' + props.id.substring(3,5) + ' - ' + props.name + '</b><br />' : 'Hover over a state');
+    this._div.innerHTML = '<h4>' + lang_usa_state + '</h4>' +  (props ?
+        '<b>' + props.id.substring(3,5) + ' - ' + props.name + '</b><br />' : lang_hover_over_a_state);
 };
 
 info.addTo(map);
@@ -243,7 +243,7 @@ info.addTo(map);
 	addMarkers();
 });
 
-var layerControl = new L.Control.Layers(null, { 'Gridsquares': maidenhead = L.maidenhead() }).addTo(map);
+var layerControl = new L.Control.Layers(null, { [lang_general_gridsquares]: maidenhead = L.maidenhead() }).addTo(map);
 maidenhead.addTo(map);