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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source 
Fixes #1593910 [Column 'Author(s)' is described as comma-separated instead of ampersand-separated](https://bugs.launchpad.net/calibre/+bug/1593910)
This commit is contained in:
Kovid Goyal 2016-06-18 16:18:21 +05:30
commit 8e49e002ad
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/preferences/columns.py
View File

@ -125,8 +125,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
else: else:
dt = fm['datatype'] dt = fm['datatype']
if fm['is_multiple']: if fm['is_multiple']:
dt = '*' + dt if col == 'authors' or fm.get('display', {}).get('is_names', False):
coltype = self.column_desc[dt] coltype = _('Ampersand separated text, shown in the tag browser')
else:
coltype = self.column_desc['*' + dt]
else:
coltype = self.column_desc[dt]
coltype_info = (coltype if oldkey is None else coltype_info = (coltype if oldkey is None else
' ' + _('(lookup name was {0}) {1}'.format(oldkey, coltype))) ' ' + _('(lookup name was {0}) {1}'.format(oldkey, coltype)))
item = QTableWidgetItem(coltype_info) item = QTableWidgetItem(coltype_info)