From f8d4bfd92a695175de3bb52e246bbeb7d552d8b0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 13 Nov 2009 19:25:28 -0700 Subject: [PATCH] IGN:Tag release --- setup/publish.py | 4 +-- setup/upload.py | 5 +++- src/calibre/ebooks/metadata/fetch.py | 4 +-- src/calibre/translations/calibre.pot | 38 ++++++++++++++++++---------- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/setup/publish.py b/setup/publish.py index 8eadf7c281..bc42b07346 100644 --- a/setup/publish.py +++ b/setup/publish.py @@ -44,8 +44,8 @@ class Stage3(Command): description = 'Stage 3 of the publish process' sub_commands = ['upload_rss', 'upload_user_manual', 'upload_demo', 'sdist', - 'upload_to_sourceforge', 'upload_to_google_code', 'tag_release', - 'upload_to_server', 'upload_to_mobileread', + 'upload_to_google_code', 'tag_release', 'upload_to_server', + 'upload_to_sourceforge', 'upload_to_mobileread', ] class Stage4(Command): diff --git a/setup/upload.py b/setup/upload.py index 52b8e8f49b..d584027b20 100644 --- a/setup/upload.py +++ b/setup/upload.py @@ -202,9 +202,12 @@ class UploadToSourceForge(Command): def create(self): self.info('Creating shell...') - check_call(['ssh', '-x', + try: + check_call(['ssh', '-x', '%s,%s@shell.sourceforge.net'%(self.USERNAME, self.PROJECT), 'create']) + except: + pass @property def rdir(self): diff --git a/src/calibre/ebooks/metadata/fetch.py b/src/calibre/ebooks/metadata/fetch.py index f9cd3c411d..0b6753fd1b 100644 --- a/src/calibre/ebooks/metadata/fetch.py +++ b/src/calibre/ebooks/metadata/fetch.py @@ -201,10 +201,10 @@ def get_social_metadata(mi, verbose=0): mi.tags += list(tags) mi.tags = list(sorted(list(set(mi.tags)))) if comments: - if not mi.comments or len(mi.comments) < len(comments): + if not mi.comments or len(mi.comments)+20 < len(' '.join(comments)): mi.comments = '' for x in comments: - mi.comments += '\n\n'+x + mi.comments += x+'\n\n' return [(x.name, x.exception, x.tb) for x in fetchers if x.exception is not None] diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index 8f919a9b3b..3ad2a33580 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: calibre 0.6.22\n" -"POT-Creation-Date: 2009-11-13 16:05+MST\n" -"PO-Revision-Date: 2009-11-13 16:05+MST\n" +"Project-Id-Version: calibre 0.6.23\n" +"POT-Creation-Date: 2009-11-13 18:55+MST\n" +"PO-Revision-Date: 2009-11-13 18:55+MST\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -109,8 +109,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/device.py:771 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:774 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:106 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:140 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:143 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:434 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:170 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:391 @@ -1411,10 +1411,22 @@ msgstr "" msgid "Metadata download" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:107 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:63 +msgid "Downloads metadata from Google Books" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:79 +msgid "Downloads metadata from isbndb.com" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:106 msgid "To use isbndb.com you must sign up for a %sfree account%s and enter your access key below." msgstr "" +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:118 +msgid "Downloads social metadata from amazon.com" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:94 msgid "" "\n" @@ -3784,31 +3796,31 @@ msgstr "" msgid "ISBN" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:147 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:150 msgid "Finding metadata..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:159 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:162 msgid "Could not find metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:160 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:163 msgid "The metadata download seems to have stalled. Try again later." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:169 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:172 msgid "Warning" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:173 msgid "Could not fetch metadata from:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:177 msgid "No metadata found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:178 msgid "No metadata found, try adjusting the title and author or the ISBN key." msgstr ""