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

Bug #2020002: improve error message

Browse Source
This commit is contained in:
Charles Haley 2023-05-21 08:17:05 +01:00
parent bdc01df463
commit 625fcca0ae
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,11 +284,19 @@ class TagCategories(QDialog, Ui_TagCategories):
'or after periods.')).exec() 'or after periods.')).exec()
return False return False
for c in sorted(self.user_categories.keys(), key=primary_sort_key): for c in sorted(self.user_categories.keys(), key=primary_sort_key):
if strcmp(c, cat_name) == 0 or \ if strcmp(c, cat_name) == 0:
(icu_lower(cat_name).startswith(icu_lower(c) + '.') and
not cat_name.startswith(c + '.')):
error_dialog(self, _('Name already used'), error_dialog(self, _('Name already used'),
_('That name is already used, perhaps with different case.')).exec() _('The user category name is already used, perhaps with different case.'),
det_msg=_('Existing category: {existing}\nNew category: {new}').format(existing=c, new=cat_name),
show=True)
return False
if icu_lower(cat_name).startswith(icu_lower(c) + '.') and not cat_name.startswith(c + '.'):
error_dialog(self, _('Name already used'),
_('The hierarchical prefix of the new category is already used, '
'perhaps with different case.'),
det_msg=_('Existing prefix: {prefix}\n'
'New category: {new}').format(prefix=c, new=cat_name),
show=True)
return False return False
if cat_name not in self.user_categories: if cat_name not in self.user_categories:
self.user_categories[cat_name] = set() self.user_categories[cat_name] = set()
@ -316,7 +324,10 @@ class TagCategories(QDialog, Ui_TagCategories):
for c in self.user_categories: for c in self.user_categories:
if strcmp(c, cat_name) == 0: if strcmp(c, cat_name) == 0:
error_dialog(self, _('Name already used'), error_dialog(self, _('Name already used'),
_('That name is already used, perhaps with different case.')).exec() _('The user category name is already used, perhaps with different case.'),
det_msg=_('Existing category: {existing}\n'
'New category: {new}').format(existing=c, new=cat_name),
show=True)
return return
# The order below is important because of signals # The order below is important because of signals
self.user_categories[cat_name] = self.user_categories[self.current_cat_name] self.user_categories[cat_name] = self.user_categories[self.current_cat_name]