Merge pull request #322 from ialja/master

Add Belarus and Ukraine, preparing to add Kosovo

Author: goranche

codeweekeu/settings.py

@@ -304,7 +304,6 @@
 	u'BT': None,
 	u'BV': None,
 	u'BW': None,
-	u'BY': None,
 	u'BZ': None,
 	u'CA': None,
 	u'CC': None,
@@ -467,7 +466,6 @@
 	u'TV': None,
 	u'TW': None,
 	u'TZ': None,
-	u'UA': None,
 	u'UG': None,
 	u'UM': None,
 	u'US': None,

static/flags/by.png

@@ -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'})