summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-03-03 11:27:59 -0400
committerThomas Schwinge <thomas@schwinge.name>2014-03-09 18:24:39 +0100
commit4479d6d533caf33477ed267bd535730a5f4528eb (patch)
tree035754f37e37abadaf5ea8da235778beaf40e6b5
parentc3e9e7e06d2ee8968d7145b4121fe19e62022a3a (diff)
shortcut: Support Wikipedia's form of url-encoding for unicode characters
I think it's the wrong encoding, seems like mojibake to me, but it works now. Closes: #661198 (cherry picked from commit 78737cbfbf91c7b31ed5d216a23de8d360a76392) Conflicts: shortcuts.mdwn
-rw-r--r--shortcuts.mdwn8
1 files changed, 5 insertions, 3 deletions
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index b8e157d..cf7ebc1 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -15,7 +15,7 @@ This page controls what shortcut links the wiki supports.
* [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
* [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]]
* [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]]
-* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%S"]]
+* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%W"]]
* [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
* [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
@@ -69,8 +69,10 @@ This page controls what shortcut links the wiki supports.
To add a new shortcut, use the `shortcut`
[[ikiwiki/directive]]. In the url, "%s" is replaced with the
text passed to the named shortcut, after [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text. The optional
-`desc` parameter controls the description of the link.
+it, and '%S' is replaced with the raw, non-encoded text.
+Additionally, `%W` is replaced with the text encoded just right for
+Wikipedia. The optional `desc` parameter controls the description of
+the link.
Remember that the `name` you give the shortcut will become a new
[[ikiwiki/directive]]. Avoid using a `name` that conflicts