user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'English_texts/master'

Browse Source 
# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html
This commit is contained in:
Ozzieisaacs
2020-02-23 13:27:44 +01:00
parent 4f81184da0 8f518993a4
commit 9fc0c3b3de
25 changed files with 185 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/web.py
+9 -9
View File
@@ -505,7 +505,7 @@ def books_list(data, sort, book_id, page):
entries, random, pagination = fill_indexpage(page, db.Books, db.Books.ratings.any(db.Ratings.rating > 9),
order)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
id=book_id, title=_(u"Best rated books"), page="rated")
id=book_id, title=_(u"Top Rated Books"), page="rated")
else:
abort(404)
elif data == "discover":
@@ -513,7 +513,7 @@ def books_list(data, sort, book_id, page):
entries, __, pagination = fill_indexpage(page, db.Books, True, [func.randomblob(2)])
pagination = Pagination(1, config.config_books_per_page, config.config_books_per_page)
return render_title_template('discover.html', entries=entries, pagination=pagination, id=book_id,
title=_(u"Random Books"), page="discover")
title=_(u"Discover (Random Books)"), page="discover")
else:
abort(404)
elif data == "unread":
@@ -566,7 +566,7 @@ def render_hot_books(page):
numBooks = entries.__len__()
pagination = Pagination(page, config.config_books_per_page, numBooks)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
title=_(u"Hot Books (most downloaded)"), page="hot")
title=_(u"Hot Books (Most Downloaded)"), page="hot")
else:
abort(404)
@@ -577,7 +577,7 @@ def render_author_books(page, author_id, order):
[order[0], db.Series.name, db.Books.series_index],
db.books_series_link, db.Series)
if entries is None or not len(entries):
flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
return redirect(url_for("web.index"))
author = db.session.query(db.Authors).get(author_id)
@@ -680,7 +680,7 @@ def author_list():
for entry in entries:
entry.Authors.name = entry.Authors.name.replace('|', ',')
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
title=u"Author list", page="authorlist", data='author')
title=u"Authors", page="authorlist", data='author')
else:
abort(404)
@@ -696,7 +696,7 @@ def publisher_list():
.join(db.books_publishers_link).join(db.Books).filter(common_filters()) \
.group_by(func.upper(func.substr(db.Publishers.name,1,1))).all()
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
title=_(u"Publisher list"), page="publisherlist", data="publisher")
title=_(u"Publishers"), page="publisherlist", data="publisher")
else:
abort(404)
@@ -712,7 +712,7 @@ def series_list():
.join(db.books_series_link).join(db.Books).filter(common_filters()) \
.group_by(func.upper(func.substr(db.Series.sort,1,1))).all()
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
title=_(u"Series list"), page="serieslist", data="series")
title=_(u"Series"), page="serieslist", data="series")
else:
abort(404)
@@ -767,7 +767,7 @@ def language_overview():
func.count('books_languages_link.book').label('bookcount')).group_by(
text('books_languages_link.lang_code')).all()
return render_title_template('languages.html', languages=languages, lang_counter=lang_counter,
charlist=charlist, title=_(u"Available languages"), page="langlist",
charlist=charlist, title=_(u"Languages"), page="langlist",
data="language")
else:
abort(404)
@@ -784,7 +784,7 @@ def category_list():
.join(db.books_tags_link).join(db.Books).filter(common_filters()) \
.group_by(func.upper(func.substr(db.Tags.name,1,1))).all()
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
title=_(u"Category list"), page="catlist", data="category")
title=_(u"Categories"), page="catlist", data="category")
else:
abort(404)