Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 10, 2017
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
470cfc2
bpo-31159: fix language switch regex on unknown yet built languages. …
JulienPalard Aug 9, 2017
caa566b
bpo-31149: Doc: Add Japanese to the language switcher. (#3028)
JulienPalard Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Doc/tools/static/switchers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
var all_languages = {
'en': 'English',
'fr': 'Français',
'ja': 'Japanese',
};

function build_version_select(current_version, current_release) {
Expand Down Expand Up @@ -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];
Expand All @@ -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);
Expand Down