Commit 1a7052b2 authored by Ozzieisaacs's avatar Ozzieisaacs

Update pdf upload

Translation of uploadprogress dialog
parent 17b73339
...@@ -101,7 +101,7 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension): ...@@ -101,7 +101,7 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension):
def pdf_meta(tmp_file_path, original_file_name, original_file_extension): def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
if use_pdf_meta: if use_pdf_meta:
pdf = PdfFileReader(open(tmp_file_path, 'rb')) pdf = PdfFileReader(open(tmp_file_path, 'rb'), strict=False)
doc_info = pdf.getDocumentInfo() doc_info = pdf.getDocumentInfo()
else: else:
doc_info = None doc_info = None
......
...@@ -230,7 +230,10 @@ def get_valid_filename(value, replace_whitespace=True): ...@@ -230,7 +230,10 @@ def get_valid_filename(value, replace_whitespace=True):
value = value[:128] value = value[:128]
if not value: if not value:
raise ValueError("Filename cannot be empty") raise ValueError("Filename cannot be empty")
if sys.version_info.major == 3:
return value return value
else:
return value.decode('utf-8')
def get_sorted_author(value): def get_sorted_author(value):
......
This diff is collapsed.
...@@ -250,7 +250,13 @@ ...@@ -250,7 +250,13 @@
{% endif %} {% endif %}
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
$("#form-upload").uploadprogress({redirect_url: '{{ url_for('index')}}'}); $("#form-upload").uploadprogress({
redirect_url: "{{ url_for('index')}}",
uploadedMsg: "{{_('Upload done, processing, please wait...')}}",
modalTitle: "{{_('Uploading...')}}",
modalFooter: "{{_('Close')}}",
modalTitleFailed: "{{_('Error')}}"
});
$("#btn-upload").change(function() { $("#btn-upload").change(function() {
$("#form-upload").submit(); $("#form-upload").submit();
}); });
......
This diff is collapsed.
...@@ -2027,7 +2027,7 @@ def advanced_search(): ...@@ -2027,7 +2027,7 @@ def advanced_search():
series=series, title=_(u"search"), cc=cc, page="advsearch") series=series, title=_(u"search"), cc=cc, page="advsearch")
@app.route("/cover/<book_id>") @app.route("/cover/<int:book_id>")
@login_required_if_no_ano @login_required_if_no_ano
def get_cover(book_id): def get_cover(book_id):
book = db.session.query(db.Books).filter(db.Books.id == book_id).first() book = db.session.query(db.Books).filter(db.Books.id == book_id).first()
...@@ -3851,7 +3851,7 @@ def upload(): ...@@ -3851,7 +3851,7 @@ def upload():
gdriveutils.updateGdriveCalibreFromLocal() gdriveutils.updateGdriveCalibreFromLocal()
if error: if error:
flash(error, category="error") flash(error, category="error")
uploadText=(u"File %s" % book.title) uploadText=_(u"File %(title)s", title=book.title)
helper.global_WorkerThread.add_upload(current_user.nickname, helper.global_WorkerThread.add_upload(current_user.nickname,
"<a href=\"" + url_for('show_book', book_id=book.id) + "\">" + uploadText + "</a>") "<a href=\"" + url_for('show_book', book_id=book.id) + "\">" + uploadText + "</a>")
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment