diff --git a/codeweekeu/settings.py b/codeweekeu/settings.py index faefb17b..c74a5909 100644 --- a/codeweekeu/settings.py +++ b/codeweekeu/settings.py @@ -303,7 +303,6 @@ u'BT': None, u'BV': None, u'BW': None, - u'BY': None, u'BZ': None, u'CA': None, u'CC': None, @@ -466,7 +465,6 @@ u'TV': None, u'TW': None, u'TZ': None, - u'UA': None, u'UG': None, u'UM': None, u'US': None, diff --git a/static/flags/by.png b/static/flags/by.png new file mode 100644 index 00000000..bd0141c3 Binary files /dev/null and b/static/flags/by.png differ diff --git a/static/flags/tr.png b/static/flags/tr.png index 8a909718..9cf8f56a 100644 Binary files a/static/flags/tr.png and b/static/flags/tr.png differ diff --git a/static/flags/ua.png b/static/flags/ua.png new file mode 100644 index 00000000..f1d8dd71 Binary files /dev/null and b/static/flags/ua.png differ diff --git a/static/flags/xk.png b/static/flags/xk.png new file mode 100644 index 00000000..cd07fd73 Binary files /dev/null and b/static/flags/xk.png differ diff --git a/web/forms/event_form.py b/web/forms/event_form.py index e6a7da3b..6328c3c7 100644 --- a/web/forms/event_form.py +++ b/web/forms/event_form.py @@ -6,6 +6,7 @@ class AddEventForm(forms.ModelForm): + email_errors = { 'required': u'Please enter a valid email, so we can contact you in case of questions.', 'invalid': u'Can you please check if this is a valid email address?', @@ -158,6 +159,11 @@ class SearchEventForm(forms.Form): countries._countries.append(Event.CUSTOM_COUNTRY_ENTRIES[0]) countries._countries.append(Event.CUSTOM_COUNTRY_ENTRIES[1]) + # XK is temp code for Kosovo; remove from COUNTRIES_OVERRIDE when + # Kosovo gets its own ISO code and is added to django-countries + #if not 'Kosovo' in list(dict(countries._countries).values()): + # countries._countries.append((u'XK', u'Kosovo')) + search = forms.CharField( required=False, widget=forms.TextInput(attrs={'placeholder': 'Search for event name or tag', 'class': 'form-control'})