Commit 9ace4d33 authored by OzzieIsaacs's avatar OzzieIsaacs

Updated german translation

Bugfix additional format upload without extension
Bugfix additional format upload to gdrive
pathes assembled by os.path.join
parent 273b1c3f
...@@ -189,8 +189,8 @@ def getEbooksFolderId(drive=None): ...@@ -189,8 +189,8 @@ def getEbooksFolderId(drive=None):
return return
def getFile(pathId, fileName, drive=None): def getFile(pathId, fileName, drive):
drive = getDrive(Gdrive.Instance().drive) # drive = getDrive(Gdrive.Instance().drive)
metaDataFile = "'%s' in parents and trashed = false and title = '%s'" % (pathId, fileName.replace("'", "\\'")) metaDataFile = "'%s' in parents and trashed = false and title = '%s'" % (pathId, fileName.replace("'", "\\'"))
fileList = drive.ListFile({'q': metaDataFile}).GetList() fileList = drive.ListFile({'q': metaDataFile}).GetList()
......
...@@ -184,7 +184,7 @@ def delete_book_file(book, calibrepath, book_format=None): ...@@ -184,7 +184,7 @@ def delete_book_file(book, calibrepath, book_format=None):
return False return False
def update_dir_stucture_file(book_id, calibrepath): def update_dir_structure_file(book_id, calibrepath):
localbook = db.session.query(db.Books).filter(db.Books.id == book_id).first() localbook = db.session.query(db.Books).filter(db.Books.id == book_id).first()
path = os.path.join(calibrepath, localbook.path) path = os.path.join(calibrepath, localbook.path)
...@@ -277,7 +277,7 @@ def update_dir_stucture(book_id, calibrepath): ...@@ -277,7 +277,7 @@ def update_dir_stucture(book_id, calibrepath):
if ub.config.config_use_google_drive: if ub.config.config_use_google_drive:
return update_dir_structure_gdrive(book_id) return update_dir_structure_gdrive(book_id)
else: else:
return update_dir_stucture_file(book_id, calibrepath) return update_dir_structure_file(book_id, calibrepath)
def delete_book(book, calibrepath, book_format): def delete_book(book, calibrepath, book_format):
if ub.config.config_use_google_drive: if ub.config.config_use_google_drive:
......
...@@ -96,3 +96,5 @@ input.pill:not(:checked) + label .glyphicon { ...@@ -96,3 +96,5 @@ input.pill:not(:checked) + label .glyphicon {
.upload-format-input-text {display: initial;} .upload-format-input-text {display: initial;}
#btn-upload-format {display: none;} #btn-upload-format {display: none;}
.panel-title > a { text-decoration: none;}
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" href="#collapseOne" style="text-decoration:none;"> <a class="accordion-toggle" data-toggle="collapse" href="#collapseOne">
<span class="glyphicon glyphicon-minus"></span> <span class="glyphicon glyphicon-minus"></span>
{{_('Library Configuration')}} {{_('Library Configuration')}}
</a> </a>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" href="#collapsetwo" style="text-decoration:none;"> <a class="accordion-toggle" data-toggle="collapse" href="#collapsetwo">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
{{_('Server Configuration')}} {{_('Server Configuration')}}
</a> </a>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" href="#collapsethree" style="text-decoration:none;"> <a class="accordion-toggle" data-toggle="collapse" href="#collapsethree">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
{{_('Logfile Configuration')}} {{_('Logfile Configuration')}}
</a> </a>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" href="#collapseeight" style="text-decoration:none;"> <a class="accordion-toggle" data-toggle="collapse" href="#collapseeight">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
{{_('E-Book converter')}} {{_('E-Book converter')}}
</a> </a>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" href="#collapsefour" style="text-decoration:none;"> <a class="accordion-toggle" data-toggle="collapse" href="#collapsefour">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
{{_('View Configuration')}} {{_('View Configuration')}}
</a> </a>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" href="#collapsesix" style="text-decoration:none;"> <a class="accordion-toggle" data-toggle="collapse" href="#collapsesix">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
{{_('Default settings for new users')}} {{_('Default settings for new users')}}
</a> </a>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<h4 class="panel-title"> <h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" href="#collapseseven" style="text-decoration:none;"> <a class="accordion-toggle" data-toggle="collapse" href="#collapseseven">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
{{_('Default visibilities for new users')}} {{_('Default visibilities for new users')}}
</a> </a>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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