Skip to content

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

Merged
vstinner merged 2 commits intopython:3.6from
JulienPalard:doc-fix-switcher-36
Aug 10, 2017
Merged

bpo-31159: fix language switch regex on unknown yet built languages. …#3051
vstinner merged 2 commits intopython:3.6from
JulienPalard:doc-fix-switcher-36

Conversation

@JulienPalard
Copy link
Copy Markdown
Member

@JulienPalard JulienPalard commented Aug 9, 2017

…(#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 122081d)

https://bugs.python.org/issue31159

…ython#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 122081d)
@vstinner
Copy link
Copy Markdown
Member

I would prefer to append the PR #3052 commit into this PR.

@JulienPalard
Copy link
Copy Markdown
Member Author

OK I'll do.

@vstinner vstinner merged commit e8e7fba into python:3.6 Aug 10, 2017
JulienPalard added a commit to JulienPalard/cpython that referenced this pull request Aug 13, 2017
python#3051)

* bpo-31159: fix language switch regex on unknown yet built languages. (python#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 122081d)

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

(cherry picked from commit c82b7f3)

(cherry picked from commit e8e7fba)
vstinner pushed a commit that referenced this pull request Aug 13, 2017
#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 122081d)

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

(cherry picked from commit c82b7f3)

(cherry picked from commit e8e7fba)
@JulienPalard JulienPalard deleted the doc-fix-switcher-36 branch June 16, 2019 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants