[Python-checkins] bpo-31159: fix language switch regex on unknown yet built languages. (#3039)

Wed Aug 9 11:01:18 EDT 2017

https://github.com/python/cpython/commit/122081deef86174beee965be1207fa46ea23533d
commit: 122081deef86174beee965be1207fa46ea23533d
branch: master
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017年08月09日T17:01:15+02:00
summary:
bpo-31159: fix language switch regex on unknown yet built languages. (#3039)
This fix a regex issue (a missing non-matching group around an 'or'
list) and the specific possible case where a translation is built but
not yet in known by the picker, but not explicitly listing possible
languages in the regex.
files:
M Doc/tools/static/switchers.js

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index de9e7b76f9e..ff23202a5e0 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -110,7 +110,7 @@
 // Returns the path segment of the language as a string, like 'fr/'
 // or '' if not found.
 function language_segment_from_url(url) {
- var language_regexp = '\.org/(' + Object.keys(all_languages).join('|') + '/)';
+ var language_regexp = '\.org/([a-z]{2}(?:-[a-z]{2})?/)';
 var match = url.match(language_regexp);
 if (match !== null)
 return match[1];
@@ -120,7 +120,7 @@
 // Returns the path segment of the version as a string, like '3.6/'
 // or '' if not found.
 function version_segment_in_url(url) {
- var language_segment = '(?:(?:' + Object.keys(all_languages).join('|') + ')/)';
+ var language_segment = '(?:[a-z]{2}(?:-[a-z]{2})?/)';
 var version_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
 var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
 var match = url.match(version_regexp);
