diff --git a/src/calibre/gui2/preferences/create_custom_column.py b/src/calibre/gui2/preferences/create_custom_column.py index 3311bb257e..6c7c2bde62 100644 --- a/src/calibre/gui2/preferences/create_custom_column.py +++ b/src/calibre/gui2/preferences/create_custom_column.py @@ -210,7 +210,7 @@ class CreateCustomColumn(QDialog): self.composite_box.setText( { 'isbn': '{identifiers:select(isbn)}', - 'formats': "{:'approximate_formats()'}", + 'formats': "{:'re(approximate_formats(), ',', ', ')'}", }[which]) self.composite_sort_by.setCurrentIndex(0) if which == 'text': @@ -372,19 +372,19 @@ class CreateCustomColumn(QDialog): cmc.setToolTip(_("If checked, this column will appear in the Tag browser as a category")) l.addWidget(cmc) self.composite_contains_html = cch = QCheckBox(_("Show as HTML in Book details")) - cch.setToolTip('

' + - _('If checked, this column will be displayed as HTML in ' - 'Book details and the Content server. This can be used to ' - 'construct links with the template language. For example, ' - 'the template ' - '

<big><b>{title}</b></big>'
-                  '{series:| [|}{series_index:| [|]]}
' - 'will create a field displaying the title in bold large ' - 'characters, along with the series, for example
"' - 'An Oblique Approach [Belisarius [1]]". The template ' - '
<a href="https://www.beam-ebooks.de/ebook/{identifiers'
-                  ':select(beam)}">Beam book</a>
' - 'will generate a link to the book on the Beam e-books site.') + '

') + cch.setToolTip('

' + _( + 'If checked, this column will be displayed as HTML in ' + 'Book details and the Content server. This can be used to ' + 'construct links with the template language. For example, ' + 'the template ' + '

<big><b>{title}</b></big>'
+            '{series:| [|}{series_index:| [|]]}
' + 'will create a field displaying the title in bold large ' + 'characters, along with the series, for example
"' + 'An Oblique Approach [Belisarius [1]]". The template ' + '
<a href="https://www.beam-ebooks.de/ebook/{identifiers'
+            ':select(beam)}">Beam book</a>
' + 'will generate a link to the book on the Beam e-books site.') + '

') l.addWidget(cch) add_row(None, l) @@ -414,13 +414,13 @@ class CreateCustomColumn(QDialog): '

' + _('Default: Not formatted. For format language details see' ' the Python documentation')) if col_type == 'int': - self.format_box.setToolTip('

' + - _('Examples: The format {0:0>4d} ' + self.format_box.setToolTip('

' + _( + 'Examples: The format {0:0>4d} ' 'gives a 4-digit number with leading zeros. The format ' '{0:d} days prints the number then the word "days"')+ '

') else: - self.format_box.setToolTip('

' + - _('Examples: The format {0:.1f} gives a floating ' + self.format_box.setToolTip('

' + _( + 'Examples: The format {0:.1f} gives a floating ' 'point number with 1 digit after the decimal point. The format ' 'Price: $ {0:,.2f} prints ' '"Price $ " then displays the number with 2 digits ' @@ -447,7 +447,7 @@ class CreateCustomColumn(QDialog): return self.simple_error('', _('No lookup name was provided')) if col.startswith('#'): col = col[1:] - if re.match('^\w*$', col) is None or not col[0].isalpha() or col.lower() != col: + if re.match(r'^\w*$', col) is None or not col[0].isalpha() or col.lower() != col: return self.simple_error('', _('The lookup name must contain only ' 'lower case letters, digits and underscores, and start with a letter')) if col.endswith('_index'):