Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better solution to lp:1047426 - "…beginning with" strings use quotes around letters, but not 'Symbols'

Browse Source
This commit is contained in:
GRiker 2012-09-07 14:33:34 -06:00
parent 3a584f406e
commit fccdb72b8b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -3035,7 +3035,11 @@ class CatalogBuilder(object):
self.play_order += 1 self.play_order += 1
navLabelTag = Tag(soup, 'navLabel') navLabelTag = Tag(soup, 'navLabel')
textTag = Tag(soup, 'text') 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]))) (title_letters[i] if len(title_letters[i])>1 else title_letters[i])))
navLabelTag.insert(0, textTag) navLabelTag.insert(0, textTag)
navPointByLetterTag.insert(0,navLabelTag) navPointByLetterTag.insert(0,navLabelTag)
@ -3156,7 +3160,11 @@ class CatalogBuilder(object):
self.play_order += 1 self.play_order += 1
navLabelTag = Tag(soup, 'navLabel') navLabelTag = Tag(soup, 'navLabel')
textTag = Tag(soup, 'text') 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]))) (title_letters[i] if len(title_letters[i])>1 else title_letters[i])))
navLabelTag.insert(0, textTag) navLabelTag.insert(0, textTag)
navPointByLetterTag.insert(0,navLabelTag) navPointByLetterTag.insert(0,navLabelTag)
@ -3267,7 +3275,11 @@ class CatalogBuilder(object):
self.play_order += 1 self.play_order += 1
navLabelTag = Tag(soup, 'navLabel') navLabelTag = Tag(soup, 'navLabel')
textTag = Tag(soup, 'text') 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) navLabelTag.insert(0, textTag)
navPointByLetterTag.insert(0,navLabelTag) navPointByLetterTag.insert(0,navLabelTag)
contentTag = Tag(soup, 'content') contentTag = Tag(soup, 'content')