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
3f6a466c
Commit
3f6a466c
authored
Sep 29, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Further language support fixes (displaying "non locale" languages translated)
parent
86127746
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
44 additions
and
33 deletions
+44
-33
editbooks.py
cps/editbooks.py
+5
-4
opds.py
cps/opds.py
+9
-8
web.py
cps/web.py
+30
-21
No files found.
cps/editbooks.py
View file @
3f6a466c
...
@@ -1131,10 +1131,11 @@ def edit_list_book(param):
...
@@ -1131,10 +1131,11 @@ def edit_list_book(param):
else
:
else
:
lang_names
=
list
()
lang_names
=
list
()
for
lang
in
book
.
languages
:
for
lang
in
book
.
languages
:
try
:
lang_names
.
append
(
isoLanguages
.
get_language_name
(
get_locale
(),
lang
.
lang_code
))
lang_names
.
append
(
LC
.
parse
(
lang
.
lang_code
)
.
get_language_name
(
get_locale
()))
#try:
except
UnknownLocaleError
:
# lang_names.append(LC.parse(lang.lang_code).get_language_name(get_locale()))
lang_names
.
append
(
_
(
isoLanguages
.
get
(
part3
=
lang
.
lang_code
)
.
name
))
#except UnknownLocaleError:
# lang_names.append(_(isoLanguages.get(part3=lang.lang_code).name))
ret
=
Response
(
json
.
dumps
({
'success'
:
True
,
'newValue'
:
', '
.
join
(
lang_names
)}),
ret
=
Response
(
json
.
dumps
({
'success'
:
True
,
'newValue'
:
', '
.
join
(
lang_names
)}),
mimetype
=
'application/json'
)
mimetype
=
'application/json'
)
elif
param
==
'author_sort'
:
elif
param
==
'author_sort'
:
...
...
cps/opds.py
View file @
3f6a466c
...
@@ -433,16 +433,17 @@ def feed_languagesindex():
...
@@ -433,16 +433,17 @@ def feed_languagesindex():
if
current_user
.
filter_language
()
==
u"all"
:
if
current_user
.
filter_language
()
==
u"all"
:
languages
=
calibre_db
.
speaking_language
()
languages
=
calibre_db
.
speaking_language
()
else
:
else
:
try
:
#
try:
cur_l
=
LC
.
parse
(
current_user
.
filter_language
())
#
cur_l = LC.parse(current_user.filter_language())
except
UnknownLocaleError
:
#
except UnknownLocaleError:
cur_l
=
None
#
cur_l = None
languages
=
calibre_db
.
session
.
query
(
db
.
Languages
)
.
filter
(
languages
=
calibre_db
.
session
.
query
(
db
.
Languages
)
.
filter
(
db
.
Languages
.
lang_code
==
current_user
.
filter_language
())
.
all
()
db
.
Languages
.
lang_code
==
current_user
.
filter_language
())
.
all
()
if
cur_l
:
languages
[
0
]
.
name
=
isoLanguages
.
get_language_name
(
get_locale
(),
languages
[
0
]
.
lang_code
)
languages
[
0
]
.
name
=
cur_l
.
get_language_name
(
get_locale
())
#if cur_l:
else
:
# languages[0].name = cur_l.get_language_name(get_locale())
languages
[
0
]
.
name
=
_
(
isoLanguages
.
get
(
part3
=
languages
[
0
]
.
lang_code
)
.
name
)
#else:
# languages[0].name = _(isoLanguages.get(part3=languages[0].lang_code).name)
pagination
=
Pagination
((
int
(
off
)
/
(
int
(
config
.
config_books_per_page
))
+
1
),
config
.
config_books_per_page
,
pagination
=
Pagination
((
int
(
off
)
/
(
int
(
config
.
config_books_per_page
))
+
1
),
config
.
config_books_per_page
,
len
(
languages
))
len
(
languages
))
return
render_xml_template
(
'feed.xml'
,
listelements
=
languages
,
folder
=
'opds.feed_languages'
,
pagination
=
pagination
)
return
render_xml_template
(
'feed.xml'
,
listelements
=
languages
,
folder
=
'opds.feed_languages'
,
pagination
=
pagination
)
...
...
cps/web.py
View file @
3f6a466c
...
@@ -606,13 +606,18 @@ def render_category_books(page, book_id, order):
...
@@ -606,13 +606,18 @@ def render_category_books(page, book_id, order):
def
render_language_books
(
page
,
name
,
order
):
def
render_language_books
(
page
,
name
,
order
):
try
:
try
:
cur_l
=
LC
.
parse
(
name
)
lang_name
=
isoLanguages
.
get_language_name
(
get_locale
(),
name
)
lang_name
=
cur_l
.
get_language_name
(
get_locale
())
except
UnknownLocaleError
:
try
:
lang_name
=
_
(
isoLanguages
.
get
(
part3
=
name
)
.
name
)
except
KeyError
:
except
KeyError
:
abort
(
404
)
abort
(
404
)
#try:
# cur_l = LC.parse(name)
# lang_name = cur_l.get_language_name(get_locale())
#except UnknownLocaleError:
# try:
# lang_name = _(isoLanguages.get(part3=name).name)
# except KeyError:
# abort(404)
entries
,
random
,
pagination
=
calibre_db
.
fill_indexpage
(
page
,
0
,
entries
,
random
,
pagination
=
calibre_db
.
fill_indexpage
(
page
,
0
,
db
.
Books
,
db
.
Books
,
db
.
Books
.
languages
.
any
(
db
.
Languages
.
lang_code
==
name
),
db
.
Books
.
languages
.
any
(
db
.
Languages
.
lang_code
==
name
),
...
@@ -819,12 +824,14 @@ def list_books():
...
@@ -819,12 +824,14 @@ def list_books():
for
entry
in
entries
:
for
entry
in
entries
:
for
index
in
range
(
0
,
len
(
entry
.
languages
)):
for
index
in
range
(
0
,
len
(
entry
.
languages
)):
try
:
entry
.
languages
[
index
]
.
language_name
=
isoLanguages
.
get_language_name
(
get_locale
(),
entry
.
languages
[
entry
.
languages
[
index
]
.
language_name
=
LC
.
parse
(
entry
.
languages
[
index
]
.
lang_code
)
\
index
]
.
lang_code
)
.
get_language_name
(
get_locale
())
#try:
except
UnknownLocaleError
:
# entry.languages[index].language_name = LC.parse(entry.languages[index].lang_code)\
entry
.
languages
[
index
]
.
language_name
=
_
(
# .get_language_name(get_locale())
isoLanguages
.
get
(
part3
=
entry
.
languages
[
index
]
.
lang_code
)
.
name
)
#except UnknownLocaleError:
# entry.languages[index].language_name = _(
# isoLanguages.get(part3=entry.languages[index].lang_code).name)
table_entries
=
{
'totalNotFiltered'
:
total_count
,
'total'
:
filtered_count
,
"rows"
:
entries
}
table_entries
=
{
'totalNotFiltered'
:
total_count
,
'total'
:
filtered_count
,
"rows"
:
entries
}
js_list
=
json
.
dumps
(
table_entries
,
cls
=
db
.
AlchemyEncoder
)
js_list
=
json
.
dumps
(
table_entries
,
cls
=
db
.
AlchemyEncoder
)
...
@@ -1003,16 +1010,18 @@ def language_overview():
...
@@ -1003,16 +1010,18 @@ def language_overview():
languages
=
calibre_db
.
speaking_language
()
languages
=
calibre_db
.
speaking_language
()
# ToDo: generate first character list for languages
# ToDo: generate first character list for languages
else
:
else
:
try
:
#try:
cur_l
=
LC
.
parse
(
current_user
.
filter_language
())
# cur_l = LC.parse(current_user.filter_language())
except
UnknownLocaleError
:
#except UnknownLocaleError:
cur_l
=
None
# cur_l = None
languages
=
calibre_db
.
session
.
query
(
db
.
Languages
)
.
filter
(
languages
=
calibre_db
.
session
.
query
(
db
.
Languages
)
.
filter
(
db
.
Languages
.
lang_code
==
current_user
.
filter_language
())
.
all
()
db
.
Languages
.
lang_code
==
current_user
.
filter_language
())
.
all
()
if
cur_l
:
languages
[
0
]
.
name
=
isoLanguages
.
get_language_name
(
get_locale
(),
languages
[
0
]
.
name
.
lang_code
)
languages
[
0
]
.
name
=
cur_l
.
get_language_name
(
get_locale
())
#if cur_l:
else
:
# languages[0].name = cur_l.get_language_name(get_locale())
languages
[
0
]
.
name
=
_
(
isoLanguages
.
get
(
part3
=
languages
[
0
]
.
lang_code
)
.
name
)
#else:
# languages[0].name = _(isoLanguages.get(part3=languages[0].lang_code).name)
lang_counter
=
calibre_db
.
session
.
query
(
db
.
books_languages_link
,
lang_counter
=
calibre_db
.
session
.
query
(
db
.
books_languages_link
,
func
.
count
(
'books_languages_link.book'
)
.
label
(
'bookcount'
))
.
group_by
(
func
.
count
(
'books_languages_link.book'
)
.
label
(
'bookcount'
))
.
group_by
(
text
(
'books_languages_link.lang_code'
))
.
all
()
text
(
'books_languages_link.lang_code'
))
.
all
()
...
...
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