From: Tom Hughes <tom@compton.nu>
Date: Thu, 1 Feb 2018 22:43:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1727'
X-Git-Tag: live~3209
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6648d3a2a6202566099423472665d3072eb02ae9?hp=085cb8fe046046d93b4675bb3ea8f3b73a1325a5

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7d56436ac..000e4c435 100644
--- 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 e722c3a2f..44e338bbe 100644
--- 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);