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
a2a48515
Commit
a2a48515
authored
Jan 22, 2017
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed language and locale preset for new users
parent
93b020b7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
user_edit.html
cps/templates/user_edit.html
+2
-2
web.py
cps/web.py
+2
-2
No files found.
cps/templates/user_edit.html
View file @
a2a48515
...
@@ -27,14 +27,14 @@
...
@@ -27,14 +27,14 @@
<label
for=
"locale"
>
{{_('Language')}}
</label>
<label
for=
"locale"
>
{{_('Language')}}
</label>
<select
name=
"locale"
id=
"locale"
class=
"form-control"
>
<select
name=
"locale"
id=
"locale"
class=
"form-control"
>
{% for translation in translations %}
{% for translation in translations %}
<option
value=
"{{translation
}}"
{%
if
translation
|
string =
=
content
.
locale
%}
selected
{%
endif
%}
>
{{ translation.display_name }}
</option>
<option
value=
"{{translation
.language}}"
{%
if
translation
.
language =
=
content
.
locale
%}
selected
{%
endif
%}
{%
if
new_user =
=
1
and
loop
.
first
%}
selected
{%
endif
%}
>
{{ translation.display_name }}
</option>
{% endfor %}
{% endfor %}
</select>
</select>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
for=
"default_language"
>
{{_('Show books with language')}}
</label>
<label
for=
"default_language"
>
{{_('Show books with language')}}
</label>
<select
name=
"default_language"
id=
"default_language"
class=
"form-control"
>
<select
name=
"default_language"
id=
"default_language"
class=
"form-control"
>
<option
value=
"all"
>
{{ _('Show all') }}
</option>
<option
value=
"all"
{%
if
new_user =
=
1
%}
selected
{%
endif
%}
>
{{ _('Show all') }}
</option>
{% for language in languages %}
{% for language in languages %}
<option
value=
"{{ language.lang_code }}"
{%
if
content
.
default_language =
=
language
.
lang_code
%}
selected
{%
endif
%}
>
{{ language.name }}
</option>
<option
value=
"{{ language.lang_code }}"
{%
if
content
.
default_language =
=
language
.
lang_code
%}
selected
{%
endif
%}
>
{{ language.name }}
</option>
{% endfor %}
{% endfor %}
...
...
cps/web.py
View file @
a2a48515
...
@@ -1513,7 +1513,7 @@ def new_user():
...
@@ -1513,7 +1513,7 @@ def new_user():
content
.
nickname
=
to_save
[
"nickname"
]
content
.
nickname
=
to_save
[
"nickname"
]
content
.
email
=
to_save
[
"email"
]
content
.
email
=
to_save
[
"email"
]
content
.
default_language
=
to_save
[
"default_language"
]
content
.
default_language
=
to_save
[
"default_language"
]
content
.
locale
=
to_save
[
"locale"
]
content
.
locale
=
to_save
[
"locale"
]
content
.
random_books
=
0
content
.
random_books
=
0
content
.
language_books
=
0
content
.
language_books
=
0
content
.
series_books
=
0
content
.
series_books
=
0
...
@@ -1547,7 +1547,7 @@ def new_user():
...
@@ -1547,7 +1547,7 @@ def new_user():
ub
.
session
.
rollback
()
ub
.
session
.
rollback
()
flash
(
_
(
u"Found an existing account for this email address or nickname."
),
category
=
"error"
)
flash
(
_
(
u"Found an existing account for this email address or nickname."
),
category
=
"error"
)
return
render_template
(
"user_edit.html"
,
new_user
=
1
,
content
=
content
,
translations
=
translations
,
return
render_template
(
"user_edit.html"
,
new_user
=
1
,
content
=
content
,
translations
=
translations
,
languages
=
languages
,
title
=
"Add new user"
)
languages
=
languages
,
title
=
_
(
"Add new user"
)
)
@
app
.
route
(
"/admin/mailsettings"
,
methods
=
[
"GET"
,
"POST"
])
@
app
.
route
(
"/admin/mailsettings"
,
methods
=
[
"GET"
,
"POST"
])
...
...
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