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
56a9c624
Commit
56a9c624
authored
Oct 16, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'cn/chinese/master'
# Conflicts: # cps/templates/search_form.html
parents
50d703e2
1b8410e7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
76 deletions
+48
-76
search_form.html
cps/templates/search_form.html
+1
-1
user_table.html
cps/templates/user_table.html
+1
-2
messages.po
cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+44
-71
web.py
cps/web.py
+2
-2
No files found.
cps/templates/search_form.html
View file @
56a9c624
...
...
@@ -20,7 +20,7 @@
<div
class=
"form-group col-sm-6"
>
<label
for=
"publishstart"
>
{{_('Published Date From')}}
</label>
<div
class=
"input-group"
>
<input
type=
"text"
class=
"datepicker form-control"
name=
"publish
_
start"
id=
"publishstart"
value=
""
>
<input
type=
"text"
class=
"datepicker form-control"
name=
"publishstart"
id=
"publishstart"
value=
""
>
<input
type=
"text"
class=
"form-control fake-input hidden"
id=
"fake_publishstart"
value=
""
>
<span
class=
"input-group-btn"
>
<button
type=
"button"
id=
"publishstart_delete"
class=
"datepicker_delete btn btn-default"
><span
class=
"glyphicon glyphicon-remove-circle"
></span></button>
...
...
cps/templates/user_table.html
View file @
56a9c624
...
...
@@ -139,7 +139,7 @@
{{ user_table_row('allowed_tags', _("Edit Allowed Tags"), _("Allowed Tags"), false, tags) }}
{{ user_table_row('denied_tags', _("Edit Denied Tags"), _("Denied Tags"), false, tags) }}
{{ user_table_row('allowed_column_value', _("Edit Allowed Column Values"), _("Allowed Column Values"), false, custom_values) }}
{{ user_table_row('denied_column_value', _("Edit Denied Column Values"), _("Denied Column
s
Values"), false, custom_values) }}
{{ user_table_row('denied_column_value', _("Edit Denied Column Values"), _("Denied Column Values"), false, custom_values) }}
{{ user_checkbox_row("role", "admin_role", _('Admin'), visiblility, all_roles)}}
{{ user_checkbox_row("role", "passwd_role", _('Change Password'), visiblility, all_roles)}}
{{ user_checkbox_row("role", "upload_role",_('Upload'), visiblility, all_roles)}}
...
...
@@ -189,4 +189,3 @@
{% endif %}
<script
src=
"{{ url_for('static', filename='js/table.js') }}"
></script>
{% endblock %}
cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
View file @
56a9c624
This diff is collapsed.
Click to expand it.
cps/web.py
View file @
56a9c624
...
...
@@ -1229,7 +1229,7 @@ def extend_search_term(searchterm,
format_date
(
datetime
.
strptime
(
pub_end
,
"
%
Y-
%
m-
%
d"
),
format
=
'medium'
,
locale
=
get_locale
())])
except
ValueError
:
pub_
start
=
u""
pub_
end
=
u""
elements
=
{
'tag'
:
db
.
Tags
,
'serie'
:
db
.
Series
,
'shelf'
:
ub
.
Shelf
}
for
key
,
db_element
in
elements
.
items
():
tag_names
=
calibre_db
.
session
.
query
(
db_element
)
.
filter
(
db_element
.
id
.
in_
(
tags
[
'include_'
+
key
]))
.
all
()
...
...
@@ -1300,7 +1300,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
column_end
=
term
.
get
(
'custom_column_'
+
str
(
c
.
id
)
+
'_end'
)
if
column_start
:
searchterm
.
extend
([
u"{} >= {}"
.
format
(
c
.
name
,
format_date
(
datetime
.
strptime
(
column_start
,
"
%
Y-
%
m-
%
d"
),
format_date
(
datetime
.
strptime
(
column_start
,
"
%
Y-
%
m-
%
d"
)
.
date
()
,
format
=
'medium'
,
locale
=
get_locale
())
)])
...
...
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