diff --git a/cps/helper.py b/cps/helper.py
index 4d4fdeb48c..b286966dcb 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -149,45 +149,48 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
return
-def check_send_to_ereader_with_converter(formats):
+def check_send_to_ereader_with_converter(formats, ereader_emails):
book_formats = list()
- if 'MOBI' in formats and 'EPUB' not in formats:
- book_formats.append({'format': 'Epub',
- 'convert': 1,
- 'text': _('Convert %(orig)s to %(format)s and send to eReader',
- orig='Mobi',
- format='Epub')})
- if 'AZW3' in formats and 'EPUB' not in formats:
- book_formats.append({'format': 'Epub',
- 'convert': 2,
- 'text': _('Convert %(orig)s to %(format)s and send to eReader',
- orig='Azw3',
- format='Epub')})
+ if 'EPUB' not in formats:
+ for convert_format in [('MOBI', 1), ('AZW3', 2)]:
+ for email in ereader_emails:
+ if len(ereader_emails) > 1:
+ msg_text = _('Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)',
+ orig=convert_format[0], format='Epub', eReadermail=email)
+ else:
+ msg_text = _('Convert %(orig)s to %(format)s and send to eReader',
+ orig=convert_format[0], format='Epub')
+ if convert_format[0] in formats:
+ book_formats.append({'format': 'Epub',
+ 'convert': convert_format[1],
+ 'ereader_email': email,
+ 'text': msg_text})
return book_formats
-def check_send_to_ereader(entry):
+def check_send_to_ereader(entry, ereader_email_str):
"""
returns all available book formats for sending to eReader
"""
formats = list()
book_formats = list()
+ ereader_emails = [strip_whitespaces(x) for x in ereader_email_str.split(',')]
if len(entry.data):
for ele in iter(entry.data):
if ele.uncompressed_size < config.mail_size:
formats.append(ele.format)
- if 'EPUB' in formats:
- book_formats.append({'format': 'Epub',
- 'convert': 0,
- 'text': _('Send %(format)s to eReader', format='Epub')})
- if 'PDF' in formats:
- book_formats.append({'format': 'Pdf',
- 'convert': 0,
- 'text': _('Send %(format)s to eReader', format='Pdf')})
- if 'AZW' in formats:
- book_formats.append({'format': 'Azw',
- 'convert': 0,
- 'text': _('Send %(format)s to eReader', format='Azw')})
+ for book_format in ['EPUB', 'PDF', 'AZW']:
+ for ereader_email in ereader_emails:
+ if book_format in formats:
+ if len(ereader_emails) > 1:
+ msg_text = _('Send %(format)s to eReader (%(eReadermail)s)',
+ format=book_format, eReadermail=ereader_email)
+ else:
+ msg_text = _('Send %(format)s to eReader', format=book_format)
+ book_formats.append({'format': book_format,
+ 'convert': 0,
+ 'ereader_email': ereader_email,
+ 'text': msg_text})
if config.config_converterpath:
book_formats.extend(check_send_to_ereader_with_converter(formats))
return book_formats
diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js
index 48bb26e6cd..b687fe4ef5 100644
--- a/cps/static/js/caliBlur.js
+++ b/cps/static/js/caliBlur.js
@@ -112,7 +112,7 @@ if ($("body.book").length > 0) {
// If only one download type exists still put the items into a drop-drown list.
downloads = $("a[id^=btnGroupDrop]").get();
if ($(downloads).length === 1) {
- $(' Download :
').insertBefore(downloads[downloads.length - 1]);
+ $(' Download ').insertBefore(downloads[downloads.length - 1]);
$(downloads).detach();
$.each(downloads, function (i, val) {
$("" + downloads[i].outerHTML + " ").appendTo(".leramslist");
@@ -154,7 +154,7 @@ if ($("body.book").length > 0) {
// Move dropdown lists higher in dom, replace bootstrap toggle with own toggle.
$('ul[aria-labelledby="read-in-browser"]').insertBefore(".blur-wrapper").addClass("readinbrowser-drop");
$('ul[aria-labelledby="listen-in-browser"]').insertBefore(".blur-wrapper").addClass("readinbrowser-drop");
- $('ul[aria-labelledby="send-to-kereader"]').insertBefore(".blur-wrapper").addClass("sendtoereader-drop");
+ $('ul[aria-labelledby="send-to-ereader"]').insertBefore(".blur-wrapper").addClass("sendtoereader-drop");
$(".leramslist").insertBefore(".blur-wrapper");
$('ul[aria-labelledby="btnGroupDrop1"]').insertBefore(".blur-wrapper").addClass("leramslist");
$("#add-to-shelves").insertBefore(".blur-wrapper");
@@ -592,7 +592,7 @@ $('.btn-group[aria-label="Edit/Delete book"] a').attr({
$("#sendbtn").attr({
"data-toggle": "tooltip",
- "title": $("#sendbtn").attr("data-text"),
+ "title": $("#sendbtn").text(), // "Send to eReader"
"data-placement": "bottom",
"data-viewport": ".btn-toolbar"
})
@@ -712,4 +712,3 @@ $(window).on("resize", function () {
// id = setTimeout(mobileSupport, 500);
mobileSupport();
});
-
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index b273ef9eec..27af2c8125 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -55,8 +55,9 @@
{% if entry.email_share_list.__len__() == 1 %}
-
- {{entry.email_share_list[0]['text']}}
+
+ {{entry.email_share_list[0]['text']}}
+
{% else %}
@@ -69,7 +70,7 @@
diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index afa5c06f16..812f6cb8e9 100644
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@@ -720,12 +720,22 @@ msgstr "Začínáme s Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Registrační e-mail pro uživatele: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Převést %(orig)s do %(format)s a poslat do Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Převést %(orig)s do %(format)s a poslat do Kindle"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Poslat %(format)s do Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Poslat %(format)s do Kindle"
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index f727aea0bb..b1468e09d0 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -701,12 +701,22 @@ msgstr "Loslegen mit Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Registrierungs-E-Mail für Benutzer: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Konvertiere %(orig)s nach %(format)s und sende an E-Reader (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Konvertiere %(orig)s nach %(format)s und sende an E-Reader"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Sende %(format)s an E-Reader (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, python-format
msgid "Send %(format)s to eReader"
msgstr "Sende %(format)s an E-Reader"
diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 376c872f61..616412ec32 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -720,12 +720,22 @@ msgstr "Ξεκινήστε με το Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "e-mail εγγραφής για χρήστη: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Μετατροπή %(orig)s σε %(format)s και αποστολή στο Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Μετατροπή %(orig)s σε %(format)s και αποστολή στο Kindle"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Αποστολή %(format)s στο Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Αποστολή %(format)s στο Kindle"
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 8d1f9552fd..2ef44e6064 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -704,12 +704,22 @@ msgstr "Primeros pasos con Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Correo electrónico de registro para el usuario: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Convertir %(orig)s a %(format)s y enviar al eReader"
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Convertir %(orig)s a %(format)s y enviar al eReader"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Enviar %(format)s al eReader (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, python-format
msgid "Send %(format)s to eReader"
msgstr "Enviar %(format)s al eReader"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index c07de6ab9c..02403589fd 100644
--- a/cps/translations/fi/LC_MESSAGES/messages.po
+++ b/cps/translations/fi/LC_MESSAGES/messages.po
@@ -718,12 +718,22 @@ msgstr "Aloita Calibre-Web:in käyttö"
msgid "Registration Email for user: %(name)s"
msgstr "Rekiströintisähköposti käyttäjälle: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Muunna %(orig)s muotoon %(format)s ja lähetä Kindleen (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Muunna %(orig)s muotoon %(format)s ja lähetä Kindleen"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Lähetä %(format)s Kindleen (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Lähetä %(format)s Kindleen"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index ce77293c8f..58cf4110a7 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -736,12 +736,22 @@ msgstr "Bien démarrer avec Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Courriel d’inscription pour l’utilisateur : %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Convertir de %(orig)s vers %(format)s et envoyer au Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Convertir de %(orig)s vers %(format)s et envoyer au Kindle"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Envoyer %(format)s vers le Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Envoyer %(format)s vers le Kindle"
diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po
index cba54ea100..9349ceddcf 100644
--- a/cps/translations/gl/LC_MESSAGES/messages.po
+++ b/cps/translations/gl/LC_MESSAGES/messages.po
@@ -699,12 +699,22 @@ msgstr "Comeza con Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Correo electrónico de rexistro para o usuario: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Converte %(orig)s en %(format)s e envía a eReader (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Converte %(orig)s en %(format)s e envía a eReader"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Enviar %(format)s a eReader (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, python-format
msgid "Send %(format)s to eReader"
msgstr "Enviar %(format)s a eReader"
diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index de107247df..44dc680205 100644
--- a/cps/translations/hu/LC_MESSAGES/messages.po
+++ b/cps/translations/hu/LC_MESSAGES/messages.po
@@ -717,12 +717,22 @@ msgstr "Kezdő lépések a Calibre-Web-bel"
msgid "Registration Email for user: %(name)s"
msgstr "Regisztrációs e-mail a következő felhasználóhoz: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "%(orig)s konvertálása %(format)s-ra és küldés Kindle-re (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "%(orig)s konvertálása %(format)s-ra és küldés Kindle-re"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "%(format)s küldése Kindle-re (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "%(format)s küldése Kindle-re"
diff --git a/cps/translations/id/LC_MESSAGES/messages.po b/cps/translations/id/LC_MESSAGES/messages.po
index 2edcd90e6d..68caaffad8 100644
--- a/cps/translations/id/LC_MESSAGES/messages.po
+++ b/cps/translations/id/LC_MESSAGES/messages.po
@@ -709,12 +709,22 @@ msgstr "Memulai dengan Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Email pendaftaran untuk pengguna: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Ubah %(orig)s menjadi %(format)s dan kirim ke E-Reader (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Ubah %(orig)s menjadi %(format)s dan kirim ke E-Reader"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Kirim %(format)s ke E-Reader (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Kirim %(format)s ke E-Reader"
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 764fee4c10..1082e10188 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -701,12 +701,22 @@ msgstr "Inizia con Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "E-mail di registrazione per l'utente: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Converti %(orig)s in %(format)s e invia all'eReader (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Converti %(orig)s in %(format)s e invia all'eReader"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Invia %(format)s all'eReader (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, python-format
msgid "Send %(format)s to eReader"
msgstr "Invia %(format)s all'eReader"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index fec969a203..f8d3b3cac8 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -709,12 +709,22 @@ msgstr "Calibre-Webを始める"
msgid "Registration Email for user: %(name)s"
msgstr "ユーザー: %(name)s 用の登録メール"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "%(orig)s を %(format)s に変換してからE-Readerに送信 (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "%(orig)s を %(format)s に変換してからE-Readerに送信"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "E-Readerに %(format)s を送信 (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "E-Readerに %(format)s を送信"
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index feab937133..35aa85a242 100644
--- a/cps/translations/km/LC_MESSAGES/messages.po
+++ b/cps/translations/km/LC_MESSAGES/messages.po
@@ -715,12 +715,22 @@ msgstr ""
msgid "Registration Email for user: %(name)s"
msgstr ""
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr ""
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr ""
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "ផ្ញើទៅ Kindle"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "ផ្ញើទៅ Kindle"
diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 1efc47f1e0..968ea32b91 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -701,12 +701,22 @@ msgstr "Calibre-Web 시작하기"
msgid "Registration Email for user: %(name)s"
msgstr "사용자 %(name)s의 등록 이메일"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "%(orig)s을(를) %(format)s로 변환하여 전자책 리더로 보내기 (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "%(orig)s을(를) %(format)s로 변환하여 전자책 리더로 보내기"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "%(format)s을 전자책 리더로 보내기 (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, python-format
msgid "Send %(format)s to eReader"
msgstr "%(format)s을 전자책 리더로 보내기"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 1ba50b5ff9..0050da0ea2 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -721,12 +721,22 @@ msgstr "Aan de slag met Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Registratie-e-mailadres van gebruiker: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "%(orig)s converteren naar %(format)s en versturen naar Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "%(orig)s converteren naar %(format)s en versturen naar Kindle"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "%(format)s versturen naar Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "%(format)s versturen naar Kindle"
diff --git a/cps/translations/no/LC_MESSAGES/messages.po b/cps/translations/no/LC_MESSAGES/messages.po
index 37ac4e7343..de9c16e5fb 100644
--- a/cps/translations/no/LC_MESSAGES/messages.po
+++ b/cps/translations/no/LC_MESSAGES/messages.po
@@ -717,12 +717,22 @@ msgstr "Kom i gang med Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Registrerings-e-post for bruker: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Konverter %(orig)s til %(format)s og send til E-Reader (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Konverter %(orig)s til %(format)s og send til E-Reader"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Send %(format)s til E-Reader (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Send %(format)s til E-Reader"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index f18920e825..42b819a09c 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -723,12 +723,22 @@ msgstr "Zacznij korzystać z Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Rejestracja e-mail dla użytkownika: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Konwertuj %(orig)s do %(format)s i wyślij do Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Konwertuj %(orig)s do %(format)s i wyślij do Kindle"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Wyślij %(format)s do Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Wyślij %(format)s do Kindle"
diff --git a/cps/translations/pt/LC_MESSAGES/messages.po b/cps/translations/pt/LC_MESSAGES/messages.po
index a14c37b0bc..ba4486af4c 100644
--- a/cps/translations/pt/LC_MESSAGES/messages.po
+++ b/cps/translations/pt/LC_MESSAGES/messages.po
@@ -706,12 +706,22 @@ msgstr "Comece a usar o Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Email de registo do utilizador: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Converter %(orig)s em %(format)s e enviar para dispositivo de leitura (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Converter %(orig)s em %(format)s e enviar para dispositivo de leitura"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Enviar %(format)s para o dispositivo de leitura (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Enviar %(format)s para o dispositivo de leitura"
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index d868747ec5..87a84bea99 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -706,12 +706,22 @@ msgstr "Comece a usar o calibre-web"
msgid "Registration Email for user: %(name)s"
msgstr "E-mail de registro do usuário: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Converter %(orig)s em %(format)s e enviar para E-Reader (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Converter %(orig)s em %(format)s e enviar para E-Reader"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Enviar %(format)s para o E-Reader (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Enviar %(format)s para o E-Reader"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index aee3d4a2c5..774954be90 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -722,12 +722,22 @@ msgstr "Начать работу с Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Регистрационный e-mail для пользователя: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Преобразовать %(orig)s в %(format)s и отправить в Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Преобразовать %(orig)s в %(format)s и отправить в Kindle"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Отправить %(format)s в Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Отправить %(format)s в Kindle"
diff --git a/cps/translations/sk/LC_MESSAGES/messages.po b/cps/translations/sk/LC_MESSAGES/messages.po
index 2573301b17..b29df5ed9b 100644
--- a/cps/translations/sk/LC_MESSAGES/messages.po
+++ b/cps/translations/sk/LC_MESSAGES/messages.po
@@ -702,12 +702,22 @@ msgstr "Začnite s aplikáciu Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Registračný e-mail pre používateľa: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Previesť %(orig)s na %(format)s a odoslať do čítačky (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Previesť %(orig)s na %(format)s a odoslať do čítačky"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Odoslať %(format)s do čítačky (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, python-format
msgid "Send %(format)s to eReader"
msgstr "Odoslať %(format)s do čítačky"
diff --git a/cps/translations/sl/LC_MESSAGES/messages.po b/cps/translations/sl/LC_MESSAGES/messages.po
index 3520afff2a..c41ee631b1 100644
--- a/cps/translations/sl/LC_MESSAGES/messages.po
+++ b/cps/translations/sl/LC_MESSAGES/messages.po
@@ -701,12 +701,22 @@ msgstr "Začnite s programom Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Registracijski e-poštni naslov za uporabnika: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Pretvarjanje %(orig)s v %(format)s in pošiljanje v e-bralnik (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Pretvarjanje %(orig)s v %(format)s in pošiljanje v e-bralnik"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Pošlji %(format)s v e-bralnik (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, python-format
msgid "Send %(format)s to eReader"
msgstr "Pošlji %(format)s v e-bralnik"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 3f14e01e9b..0c41a77053 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -718,12 +718,22 @@ msgstr "Kom igång med Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Registrera e-post för användare: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Konvertera %(orig)s till %(format)s och skicka till Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Konvertera %(orig)s till %(format)s och skicka till Kindle"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Skicka %(format)s till Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Skicka %(format)s till Kindle"
diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 16887c91e2..ccc69ee1de 100644
--- a/cps/translations/tr/LC_MESSAGES/messages.po
+++ b/cps/translations/tr/LC_MESSAGES/messages.po
@@ -715,12 +715,22 @@ msgstr "Calibre-Web'i Kullanmaya Başlayın"
msgid "Registration Email for user: %(name)s"
msgstr "Kullanıcı Kayıt e-Postası: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "%(orig)s'dan %(format)s biçimine çevir ve Kindle'a gönder (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "%(orig)s'dan %(format)s biçimine çevir ve Kindle'a gönder"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "%(format)s biçimlerini Kindle'a gönder (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "%(format)s biçimlerini Kindle'a gönder"
diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 0a42e0921c..fa3d5c493b 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -711,12 +711,22 @@ msgstr ""
msgid "Registration Email for user: %(name)s"
msgstr ""
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr ""
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr ""
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Надіслати %(format)s до E-Reader"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Надіслати %(format)s до E-Reader"
diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po
index eb47f0da6d..13f06cab24 100644
--- a/cps/translations/vi/LC_MESSAGES/messages.po
+++ b/cps/translations/vi/LC_MESSAGES/messages.po
@@ -705,12 +705,22 @@ msgstr "Bắt đầu với Calibre-Web"
msgid "Registration Email for user: %(name)s"
msgstr "Email đăng ký cho người dùng: %(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "Chuyển đổi %(orig)s thành %(format)s và chuyển tới Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "Chuyển đổi %(orig)s thành %(format)s và chuyển tới Kindle"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "Gửi %(format)s tới Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "Gửi %(format)s tới Kindle"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 66ddaca439..9d0198b5c3 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -701,12 +701,22 @@ msgstr "开启 Calibre-Web 之旅"
msgid "Registration Email for user: %(name)s"
msgstr "用户注册电子邮件:%(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "转换 %(orig)s 到 %(format)s 并发送到电子阅读器 (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "转换 %(orig)s 到 %(format)s 并发送到电子阅读器"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "发送 %(format)s 到电子阅读器 (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, python-format
msgid "Send %(format)s to eReader"
msgstr "发送 %(format)s 到电子阅读器"
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 31a023bd3f..92c8de90b0 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
@@ -712,12 +712,22 @@ msgstr "開啟Calibre-Web之旅"
msgid "Registration Email for user: %(name)s"
msgstr "用戶註冊電子郵件:%(name)s"
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, fuzzy, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr "轉換 %(orig)s 到 %(format)s 並發送到Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:161
#, fuzzy, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr "轉換 %(orig)s 到 %(format)s 並發送到Kindle"
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, fuzzy, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr "發送 %(format)s 到Kindle (%(eReadermail)s)"
+
+#: cps/helper.py:189
#, fuzzy, python-format
msgid "Send %(format)s to eReader"
msgstr "發送 %(format)s 到Kindle"
diff --git a/cps/web.py b/cps/web.py
index 3fa620a89d..1171b3a756 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1251,19 +1251,19 @@ def download_link(book_id, book_format, anyname):
return get_download_link(book_id, book_format, client)
-@web.route('/send///', methods=["POST"])
+@web.route('/send////', methods=["POST"])
@login_required_if_no_ano
@download_required
-def send_to_ereader(book_id, book_format, convert):
+def send_to_ereader(book_id, book_format, convert, ereader_email):
if not config.get_mail_server_configured():
return make_response(jsonify(type="danger", message=_("Please configure the SMTP mail settings first...")))
- elif current_user.kindle_mail:
- result = send_mail(book_id, book_format, convert, current_user.kindle_mail, config.get_book_path(),
+ elif ereader_email:
+ result = send_mail(book_id, book_format, convert, ereader_email, config.get_book_path(),
current_user.name)
if result is None:
ub.update_download(book_id, int(current_user.id))
response = [{'type': "success", 'message': _("Success! Book queued for sending to %(eReadermail)s",
- eReadermail=current_user.kindle_mail)}]
+ eReadermail=ereader_email)}]
else:
response = [{'type': "danger", 'message': _("Oops! There was an error sending book: %(res)s", res=result)}]
else:
@@ -1647,7 +1647,7 @@ def show_book(book_id):
entry.ordered_authors = calibre_db.order_authors([entry])
- entry.email_share_list = check_send_to_ereader(entry)
+ entry.email_share_list = check_send_to_ereader(entry, current_user.kindle_mail or '')
entry.reader_list = check_read_formats(entry)
entry.reader_list_sizes = dict()
diff --git a/messages.pot b/messages.pot
index 144f4ffb51..8e511e8ece 100644
--- a/messages.pot
+++ b/messages.pot
@@ -700,12 +700,22 @@ msgstr ""
msgid "Registration Email for user: %(name)s"
msgstr ""
-#: cps/helper.py:157 cps/helper.py:163
+#: cps/helper.py:158
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to eReader (%(eReadermail)s)"
+msgstr ""
+
+#: cps/helper.py:161
#, python-format
msgid "Convert %(orig)s to %(format)s and send to eReader"
msgstr ""
-#: cps/helper.py:182 cps/helper.py:186 cps/helper.py:190
+#: cps/helper.py:186
+#, python-format
+msgid "Send %(format)s to eReader (%(eReadermail)s)"
+msgstr ""
+
+#: cps/helper.py:189
#, python-format
msgid "Send %(format)s to eReader"
msgstr ""
@@ -3609,4 +3619,3 @@ msgstr ""
#: cps/templates/user_table.html:156
msgid "Show Read/Unread Section"
msgstr ""
-