From fccdb72b8b56558b0fd1cbfb701256d9b7c9dc9d Mon Sep 17 00:00:00 2001 From: GRiker Date: Fri, 7 Sep 2012 14:33:34 -0600 Subject: [PATCH] =?UTF-8?q?Better=20solution=20to=20lp:1047426=20-=20"?= =?UTF-8?q?=E2=80=A6beginning=20with"=20strings=20use=20quotes=20around=20?= =?UTF-8?q?letters,=20but=20not=20'Symbols'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../library/catalogs/epub_mobi_builder.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py index 548c8139ef..c93b318966 100644 --- a/src/calibre/library/catalogs/epub_mobi_builder.py +++ b/src/calibre/library/catalogs/epub_mobi_builder.py @@ -3035,7 +3035,11 @@ class CatalogBuilder(object): self.play_order += 1 navLabelTag = Tag(soup, 'navLabel') textTag = Tag(soup, 'text') - textTag.insert(0, NavigableString(_(u"Series beginning with '%s'") % \ + if len(title_letters[i])>1: + fmt_string = _(u"Series beginning with %s") + else: + fmt_string = _(u"Series beginning with '%s'") + textTag.insert(0, NavigableString(fmt_string % (title_letters[i] if len(title_letters[i])>1 else title_letters[i]))) navLabelTag.insert(0, textTag) navPointByLetterTag.insert(0,navLabelTag) @@ -3156,7 +3160,11 @@ class CatalogBuilder(object): self.play_order += 1 navLabelTag = Tag(soup, 'navLabel') textTag = Tag(soup, 'text') - textTag.insert(0, NavigableString(_(u"Titles beginning with '%s'") % \ + if len(title_letters[i])>1: + fmt_string = _(u"Titles beginning with %s") + else: + fmt_string = _(u"Titles beginning with '%s'") + textTag.insert(0, NavigableString(fmt_string % (title_letters[i] if len(title_letters[i])>1 else title_letters[i]))) navLabelTag.insert(0, textTag) navPointByLetterTag.insert(0,navLabelTag) @@ -3267,7 +3275,11 @@ class CatalogBuilder(object): self.play_order += 1 navLabelTag = Tag(soup, 'navLabel') textTag = Tag(soup, 'text') - textTag.insert(0, NavigableString(_("Authors beginning with '%s'") % (authors_by_letter[1]))) + if len(authors_by_letter[1])>1: + fmt_string = _(u"Authors beginning with %s") + else: + fmt_string = _(u"Authors beginning with '%s'") + textTag.insert(0, NavigableString(fmt_string % (authors_by_letter[1]))) navLabelTag.insert(0, textTag) navPointByLetterTag.insert(0,navLabelTag) contentTag = Tag(soup, 'content')