cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to html5-compatible fragment encoding for wikipedia URLs

Browse source 
Fixes #3269

In the HTML4 days, fragments weren't allowed to have `%` signs, so
mediawiki generated fragments with `%` replaced with a `.`

In HTML5, fragments can have % encoded characters, and so in 2017
wikipedia switched over to this for their automatically generated
fragments, while keeping the "dot" versions available as a fallback.

However, we have been automatically converting all fragments,
including manually specified anchors that do not have "dot"-encoded
versions available. So we can now simplify everything by just using
the HTML5 percent-encoded fragments.
This commit is contained in:
Andy Allan 2021-07-28 15:54:21 +01:00
parent 61e963ecdb
commit dd9eca9346
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/browse_tags_helper.rb
View file

@ -85,7 +85,7 @@ module BrowseTagsHelper
# Must break it up to correctly build the url # Must break it up to correctly build the url
value = Regexp.last_match(1) value = Regexp.last_match(1)
section = "##{Regexp.last_match(2)}" section = "##{Regexp.last_match(2)}"
encoded_section = "##{CGI.escape(Regexp.last_match(2).gsub(/ +/, '_')).tr('%', '.')}" encoded_section = "##{CGI.escape(Regexp.last_match(2).gsub(/ +/, '_'))}"
else else
section = "" section = ""
encoded_section = "" encoded_section = ""

4
test/helpers/browse_tags_helper_test.rb
View file

@ -169,11 +169,11 @@ class BrowseTagsHelperTest < ActionView::TestCase
assert_equal "de:Englischer Garten (München)#Japanisches Teehaus", link[:title] assert_equal "de:Englischer Garten (München)#Japanisches Teehaus", link[:title]
link = wikipedia_link("wikipedia", "de:Alte Brücke (Heidelberg)#Brückenaffe") link = wikipedia_link("wikipedia", "de:Alte Brücke (Heidelberg)#Brückenaffe")
assert_equal "https://de.wikipedia.org/wiki/de:Alte Brücke (Heidelberg)?uselang=en#Br.C3.BCckenaffe", link[:url] assert_equal "https://de.wikipedia.org/wiki/de:Alte Brücke (Heidelberg)?uselang=en#Br%C3%BCckenaffe", link[:url]
assert_equal "de:Alte Brücke (Heidelberg)#Brückenaffe", link[:title] assert_equal "de:Alte Brücke (Heidelberg)#Brückenaffe", link[:title]
link = wikipedia_link("wikipedia", "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus") link = wikipedia_link("wikipedia", "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus")
assert_equal "https://de.wikipedia.org/wiki/de:Liste der Baudenkmäler in Eichstätt?uselang=en#Br.C3.BCckenstra.C3.9Fe_1.2C_Ehemaliges_Bauernhaus", link[:url] assert_equal "https://de.wikipedia.org/wiki/de:Liste der Baudenkmäler in Eichstätt?uselang=en#Br%C3%BCckenstra%C3%9Fe_1%2C_Ehemaliges_Bauernhaus", link[:url]
assert_equal "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus", link[:title] assert_equal "de:Liste der Baudenkmäler in Eichstätt#Brückenstraße 1, Ehemaliges Bauernhaus", link[:title]
I18n.with_locale "pt-BR" do I18n.with_locale "pt-BR" do