Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
b78130e3
Commit
b78130e3
authored
Nov 25, 2018
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch '681/681-fix'
parents
47424e5c
e1b6fa25
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
web.py
cps/web.py
+2
-7
No files found.
cps/web.py
View file @
b78130e3
...
...
@@ -196,13 +196,8 @@ def get_locale():
if
user
is
not
None
and
hasattr
(
user
,
"locale"
):
if
user
.
nickname
!=
'Guest'
:
# if the account is the guest account bypass the config lang settings
return
user
.
locale
translations
=
[
item
.
language
for
item
in
babel
.
list_translations
()]
+
[
'en'
]
preferred
=
[
x
.
replace
(
'-'
,
'_'
)
for
x
in
request
.
accept_languages
.
values
()]
# In the case of Simplified Chinese, Accept-Language is "zh-CN", while our translation of Simplified Chinese is "zh_Hans_CN".
# TODO: This is Not a good solution, should be improved.
if
"zh_CN"
in
preferred
:
return
"zh_Hans_CN"
translations
=
[
str
(
item
)
for
item
in
babel
.
list_translations
()]
+
[
'en'
]
preferred
=
[
str
(
LC
.
parse
(
x
.
replace
(
'-'
,
'_'
)))
for
x
in
request
.
accept_languages
.
values
()]
return
negotiate_locale
(
preferred
,
translations
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment