Merge remote-tracking branch 'upstream/pull/1727'

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7d56436ac083ab94c4564d928c37e45c8a0584b1..000e4c43510e68ceaeba8fed1b191fa615f11cf5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1287,7 +1287,7 @@ en:
       Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a> 
       if you have licensing, copyright or other legal questions.
       <br>
-      OpenStreetMap, the magnifiying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
+      OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
     partners_title: Partners
   notifier:
     diary_comment_notification:

diff --git a/vendor/assets/openlayers/OpenStreetMap.js b/vendor/assets/openlayers/OpenStreetMap.js
index e722c3a2fb668f0203e05e4ef2d6120819e5c902..44e338bbe74bce23b0ebdc785066b55c8ce2745d 100644 (file)
--- a/vendor/assets/openlayers/OpenStreetMap.js
+++ b/vendor/assets/openlayers/OpenStreetMap.js
@@ -14,13 +14,13 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
      */
     initialize: function(name, options) {
         var url = [
-            "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png",
-            "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png",
-            "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
+            "https://a.tile.openstreetmap.org/${z}/${x}/${y}.png",
+            "https://b.tile.openstreetmap.org/${z}/${x}/${y}.png",
+            "https://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
         ];
         options = OpenLayers.Util.extend({
             numZoomLevels: 20,
-            attribution: "&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",
+            attribution: "&copy; <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",
             buffer: 0,
             transitionEffect: "resize"
         }, options);