mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 04:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-31159: fix language switch regex on unknown yet built languages. … (#3051)

Browse source 
* 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.
(cherry picked from commit 122081deef)

* bpo-31149: Doc: Add Japanese to the language switcher. (#3028)

(cherry picked from commit c82b7f332a)
This commit is contained in:
Julien Palard 2017-08-10 16:54:26 +02:00 • committed by Victor Stinner
parent 719a15b325
commit e8e7fba0b2
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Doc/tools/static/switchers.js
View file

@ -21,6 +21,7 @@
var all_languages = { var all_languages = {
'en': 'English', 'en': 'English',
'fr': 'Français', 'fr': 'Français',
'ja': 'Japanese',
}; };
function build_version_select(current_version, current_release) { function build_version_select(current_version, current_release) {
@ -109,7 +110,7 @@
// Returns the path segment of the language as a string, like 'fr/' // Returns the path segment of the language as a string, like 'fr/'
// or '' if not found. // or '' if not found.
function language_segment_from_url(url) { 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); var match = url.match(language_regexp);
if (match !== null) if (match !== null)
return match[1]; return match[1];
@ -119,7 +120,7 @@
// Returns the path segment of the version as a string, like '3.6/' // Returns the path segment of the version as a string, like '3.6/'
// or '' if not found. // or '' if not found.
function version_segment_in_url(url) { 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_segment = '(?:(?:' + version_regexs.join('|') + ')/)';
var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')'; var version_regexp = '\\.org/' + language_segment + '?(' + version_segment + ')';
var match = url.match(version_regexp); var match = url.match(version_regexp);