darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 19:03:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix non-gsm error message

Browse Source 
Use `it`/`they` depending on how many different characters you've used
Also don't wrap the message with quotes, as it looks confusing and
potentialy implies that you can't use apostrophes
This commit is contained in:
Leo Hemsted
2017-02-15 16:21:14 +00:00
parent 9046ec3bbc
commit f550699daf
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/validators.py
View File

@@ -58,7 +58,8 @@ class OnlyGSMCharacters:
non_gsm_characters = sorted(list(get_non_gsm_compatible_characters(field.data)))
if non_gsm_characters:
raise ValidationError(
'You can’t use {} in text messages. They won’t show up properly on everyone’s phones.'.format(
formatted_list(non_gsm_characters, conjunction='or')
'You can’t use {} in text messages. {} won’t show up properly on everyone’s phones.'.format(
formatted_list(non_gsm_characters, conjunction='or', before_each='', after_each=''),
('It' if len(non_gsm_characters) == 1 else 'They')
)
)