Update to iD v2.6.0

[rails.git] / app / helpers / browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 0470d41a25ea49f0e34ba8d2c10175af7f9fb02d..c2e974e9365f406c9ce136679af744ea6f936e1f 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -114,18 +114,10 @@ module BrowseHelper
     # the correct page.
     lookup_us = lookup.tr(" ", "_")
 
-    if page = begin
-                WIKI_PAGES[locale][type][lookup_us]
-              rescue
-                nil
-              end
-      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    elsif page = begin
-                   WIKI_PAGES["en"][type][lookup_us]
-                 rescue
-                   nil
-                 end
-      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
+    if page = WIKI_PAGES.dig(locale, type, lookup_us)
+      url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
+    elsif page = WIKI_PAGES.dig("en", type, lookup_us)
+      url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end
 
     url
@@ -166,7 +158,7 @@ module BrowseHelper
     end
 
     {
-      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}",
+      :url => "https://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}",
       :title => value + section
     }
   end