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

[Victor Stinner]

https://github.com/python/cpython/commit/fe8d9dc479a96ef490034107e7d4a6228b4be140
commit: fe8d9dc479a96ef490034107e7d4a6228b4be140
branch: 2.7
author: Julien Palard <julien at palard.fr>
committer: Victor Stinner <victor.stinner at gmail.com>
date: 2017-08-13T23:44:51+02:00
summary:

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

* 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 122081deef86174beee965be1207fa46ea23533d)

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

(cherry picked from commit c82b7f332aff606af6c9c163da75f1e86514125e)

(cherry picked from commit e8e7fba0b24582959feca9c31f2a72fc0251f83d)

files:
M Doc/tools/static/switchers.js

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index 470ff6d33b7..ff23202a5e0 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -21,6 +21,7 @@
   var all_languages = {
       'en': 'English',
       'fr': 'Français',
+      'ja': 'Japanese',
   };
 
   function build_version_select(current_version, current_release) {
@@ -109,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];
@@ -119,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);