diff --git a/NEWS b/NEWS index 45570f1b7..266f96a72 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ Enhancements - [web] avoid saving an empty calendar name + - [web] prohibit duplicate contact categories in Preferences module Bug fixes - [web] properly handle Windows-1256 charaset (#4781) diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index 2b75b93f2..56019e7dd 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -192,6 +192,7 @@ /* Contact */ "Personal Address Book" = "Personal Address Book"; "Collected Address Book" = "Collected Address Book"; +"Contact categories must have unique names." = "Contact categories must have unique names."; /* IMAP Accounts */ "Settings" = "Settings"; diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index ea4f0431c..db4e53927 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -509,8 +509,12 @@ +
+
+
-1)) { + form['contactCategory_' + i].$setValidity('duplicate', false); + sendForm = false; + } + }); + } + if (sendForm) return this.preferences.$save().then(function(data) { if (!options || !options.quick) {