diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index d558739c5e..7ee43a5cc6 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -1459,7 +1459,7 @@ class OPFCreator(Metadata): fa['file-as'] = self.author_sort a(DC_ELEM('creator', author, opf_attrs=fa)) a(DC_ELEM('contributor', '%s (%s) [%s]'%(__appname__, __version__, - 'http://calibre-ebook.com'), opf_attrs={'role':'bkp', + 'https://calibre-ebook.com'), opf_attrs={'role':'bkp', 'file-as':__appname__})) a(DC_ELEM('identifier', str(self.application_id), opf_attrs={'scheme':__appname__}, @@ -1561,7 +1561,7 @@ def metadata_to_opf(mi, as_string=True, default_lang=None): if not mi.book_producer: mi.book_producer = __appname__ + ' (%s) '%__version__ + \ - '[http://calibre-ebook.com]' + '[https://calibre-ebook.com]' if not mi.languages: lang = (get_lang().replace('_', '-').partition('-')[0] if default_lang diff --git a/src/calibre/ebooks/pdf/render/serialize.py b/src/calibre/ebooks/pdf/render/serialize.py index 74a7d00d42..f6467ea2f4 100644 --- a/src/calibre/ebooks/pdf/render/serialize.py +++ b/src/calibre/ebooks/pdf/render/serialize.py @@ -270,7 +270,7 @@ class PDFStream(object): self.compress = compress self.write_line(PDFVER) self.write_line(b'%íì¦"') - creator = ('%s %s [http://calibre-ebook.com]'%(__appname__, + creator = ('%s %s [https://calibre-ebook.com]'%(__appname__, __version__)) self.write_line('%% Created by %s'%creator) self.objects = IndirectObjects() diff --git a/src/calibre/ebooks/pdf/writer.py b/src/calibre/ebooks/pdf/writer.py index 664f9350b3..ff9d2a2c57 100644 --- a/src/calibre/ebooks/pdf/writer.py +++ b/src/calibre/ebooks/pdf/writer.py @@ -324,7 +324,7 @@ class PDFWriter(QObject): # {{{ self.append_doc(self.combine_queue[-1]) try: - self.doc.creator = u'%s %s [http://calibre-ebook.com]'%( + self.doc.creator = u'%s %s [https://calibre-ebook.com]'%( __appname__, __version__) self.doc.title = self.metadata.title self.doc.author = self.metadata.author @@ -356,7 +356,7 @@ class ImagePDFWriter(object): # {{{ raw = x.read() doc = get_podofo().PDFDoc() doc.load(raw) - doc.creator = u'%s %s [http://calibre-ebook.com]'%( + doc.creator = u'%s %s [https://calibre-ebook.com]'%( __appname__, __version__) doc.title = self.metadata.title doc.author = self.metadata.author diff --git a/src/calibre/gui2/covers.py b/src/calibre/gui2/covers.py index fcf05aa892..f4229ed7c5 100644 --- a/src/calibre/gui2/covers.py +++ b/src/calibre/gui2/covers.py @@ -476,7 +476,7 @@ class CoverSettingsWidget(QWidget): mi.tags = [_('Tag One'), _('Tag Two')] mi.publisher = _('Some publisher') mi.rating = 4 - mi.identifiers = {'isbn':'123456789', 'url': 'http://calibre-ebook.com'} + mi.identifiers = {'isbn':'123456789', 'url': 'https://calibre-ebook.com'} mi.languages = ['eng', 'fra'] mi.pubdate = mi.timestamp = now() return mi diff --git a/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui b/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui index 6e34cc4f96..37066353b3 100644 --- a/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui +++ b/src/calibre/gui2/store/stores/mobileread/adv_search_builder.ui @@ -149,7 +149,7 @@ - See the <a href="http://calibre-ebook.com/user_manual/gui.html#the-search-interface">User Manual</a> for more help + See the <a href="https://calibre-ebook.com/user_manual/gui.html#the-search-interface">User Manual</a> for more help true diff --git a/src/calibre/gui2/tweak_book/ui.py b/src/calibre/gui2/tweak_book/ui.py index 91a69ba467..4402b9a49a 100644 --- a/src/calibre/gui2/tweak_book/ui.py +++ b/src/calibre/gui2/tweak_book/ui.py @@ -49,7 +49,7 @@ from calibre.utils.icu import character_name, sort_key from calibre.utils.localization import localize_user_manual_link def open_donate(): - open_url(QUrl('http://calibre-ebook.com/donate')) + open_url(QUrl('https://calibre-ebook.com/donate')) class Central(QStackedWidget): # {{{ diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index f5176b6eed..c762436a00 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -853,7 +853,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ QApplication.instance().quit() def donate(self, *args): - open_url(QUrl('http://calibre-ebook.com/donate')) + open_url(QUrl('https://calibre-ebook.com/donate')) def confirm_quit(self): if self.job_manager.has_jobs(): diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py index 8183b2c29a..81ea15776b 100644 --- a/src/calibre/gui2/update.py +++ b/src/calibre/gui2/update.py @@ -112,7 +112,7 @@ class UpdateNotification(QDialog): ver = ver[:-2] self.label = QLabel(('

'+ _('New version %(ver)s of %(app)s is available for download. ' - 'See the new features.'))%dict( app=__appname__, ver=ver)) self.label.setOpenExternalLinks(True) diff --git a/src/calibre/gui2/wizard/finish.ui b/src/calibre/gui2/wizard/finish.ui index 635eacd9d5..401e1cdb39 100644 --- a/src/calibre/gui2/wizard/finish.ui +++ b/src/calibre/gui2/wizard/finish.ui @@ -46,7 +46,7 @@ - <h2>Demo videos</h2>Videos demonstrating the various features of calibre are available <a href="http://calibre-ebook.com/demo">online</a>. + <h2>Demo videos</h2>Videos demonstrating the various features of calibre are available <a href="https://calibre-ebook.com/demo">online</a>. true diff --git a/src/calibre/linux.py b/src/calibre/linux.py index 54d0e3b5ad..ea2463c9c4 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py @@ -1075,7 +1075,7 @@ def write_appdata(key, entry, base, translators): E.id(key + '.desktop', type='desktop'), E.licence('CC0'), E.description(), - E.url('http://calibre-ebook.com', type='homepage'), + E.url('https://calibre-ebook.com', type='homepage'), E.screenshots(), ) for w, h, url in entry['screenshots']: diff --git a/src/calibre/srv/opds.py b/src/calibre/srv/opds.py index 259701e3ab..e5e8e95c1e 100644 --- a/src/calibre/srv/opds.py +++ b/src/calibre/srv/opds.py @@ -229,7 +229,7 @@ class Feed(object): # {{{ self.root = \ FEED( TITLE(title or default_feed_title), - AUTHOR(__appname__, uri='http://calibre-ebook.com'), + AUTHOR(__appname__, uri='https://calibre-ebook.com'), ID(id_), ICON(request_context.ctx.url_for('/favicon.png')), UPDATED(updated),