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

Fix #807879 ("Series" undistinguished in singular/plural)

Browse Source
This commit is contained in:
Kovid Goyal 2011-07-10 13:29:15 -06:00
parent e17adec5e7
commit 4b78041e2a
7 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
session.vim
View File

@ -1,5 +1,5 @@
" Project wide builtins
let g:pyflakes_builtins += ["dynamic_property", "__", "P", "I", "lopen", "icu_lower", "icu_upper", "icu_title"]
let g:pyflakes_builtins += ["dynamic_property", "__", "P", "I", "lopen", "icu_lower", "icu_upper", "icu_title", "ngettext"]
python << EOFPY
import os

2
setup/check.py
View File

@ -64,7 +64,7 @@ class Check(Command):
description = 'Check for errors in the calibre source code'
BUILTINS = ['_', '__', 'dynamic_property', 'I', 'P', 'lopen', 'icu_lower',
'icu_upper', 'icu_title']
'icu_upper', 'icu_title', 'ngettext']
CACHE = '.check-cache.pickle'
def get_files(self, cache):

4
setup/translations.py
View File

@ -73,9 +73,9 @@ class POT(Command):
"Language-Team: LANGUAGE\\n"
"MIME-Version: 1.0\\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/calibre\\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n"
"Content-Type: text/plain; charset=UTF-8\\n"
"Content-Transfer-Encoding: 8bit\\n"
"Generated-By: xgettext\\n"
''')%dict(appname=__appname__, version=__version__,
year=time.strftime('%Y'),
@ -90,7 +90,7 @@ class POT(Command):
self.info('Creating translations template...')
subprocess.check_call(['xgettext', '-f', fl.name,
'--default-domain=calibre', '-o', out.name, '-L', 'Python',
'--from-code=UTF-8', '--omit-header', '--sort-by-file',
'--from-code=UTF-8', '--sort-by-file', '--omit-header',
'--no-wrap', '-k__',
])
with open(out.name, 'rb') as f:

2
src/calibre/ebooks/metadata/book/base.py
View File

@ -742,7 +742,7 @@ class Metadata(object):
ans += [('ISBN', unicode(self.isbn))]
ans += [(_('Tags'), u', '.join([unicode(t) for t in self.tags]))]
if self.series:
ans += [(_('Series'), unicode(self.series)+ ' #%s'%self.format_series_index())]
ans += [_('Series'), unicode(self.series) + ' #%s'%self.format_series_index()]
ans += [(_('Language'), unicode(self.language))]
if self.timestamp is not None:
ans += [(_('Timestamp'), unicode(self.timestamp.isoformat(' ')))]

4
src/calibre/gui2/dialogs/tag_categories.py
View File

@ -57,7 +57,7 @@ class TagCategories(QDialog, Ui_TagCategories):
lambda: [n for (id, n) in self.db.all_publishers()],
lambda: self.db.all_tags()
]
category_names = ['', _('Authors'), _('Series'), _('Publishers'), _('Tags')]
category_names = ['', _('Authors'), ngettext('Series', 'Series', 2), _('Publishers'), _('Tags')]
cvals = {}
for key,cc in self.db.custom_field_metadata().iteritems():
@ -284,4 +284,4 @@ class TagCategories(QDialog, Ui_TagCategories):
self.category_box.blockSignals(True)
self.category_box.clear()
self.category_box.addItems(sorted(self.categories.keys(), key=sort_key))
self.category_box.blockSignals(False)
self.category_box.blockSignals(False)

2
src/calibre/library/field_metadata.py
View File

@ -121,7 +121,7 @@ class FieldMetadata(dict):
'datatype':'series',
'is_multiple':{},
'kind':'field',
'name':_('Series'),
'name':ngettext('Series', 'Series', 2),
'search_terms':['series'],
'is_custom':False,
'is_category':True,

10
src/calibre/translations/calibre.pot
View File

@ -5,15 +5,15 @@
msgid ""
msgstr ""
"Project-Id-Version: calibre 0.8.9\n"
"POT-Creation-Date: 2011-07-10 13:08+MDT\n"
"PO-Revision-Date: 2011-07-10 13:08+MDT\n"
"POT-Creation-Date: 2011-07-10 13:28+MDT\n"
"PO-Revision-Date: 2011-07-10 13:28+MDT\n"
"Last-Translator: Automatically generated\n"
"Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/calibre\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: xgettext\n"
#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
@ -2587,7 +2587,9 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:163
#: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124
msgid "Series"
msgstr ""
msgid_plural "Series"
msgstr[0] ""
msgstr[1] ""
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:746
#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:164