mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
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:
commit
8e49e002ad
@ -125,8 +125,12 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
|
||||
else:
|
||||
dt = fm['datatype']
|
||||
if fm['is_multiple']:
|
||||
dt = '*' + dt
|
||||
coltype = self.column_desc[dt]
|
||||
if col == 'authors' or fm.get('display', {}).get('is_names', False):
|
||||
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
|
||||
' ' + _('(lookup name was {0}) {1}'.format(oldkey, coltype)))
|
||||
item = QTableWidgetItem(coltype_info)
|
||||
|
Loading…
x
Reference in New Issue
Block a user