Merge pull request #187 from uktrade/1254-change-blank-country-choice

[CMS-1254] Change blank country choice to "Choose a country"
uktrade · May 15, 2019 · 30ae1ee · 30ae1ee
2 parents 423c554 + 1abea6e
commit 30ae1ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 12.1.0
+[Full changelog](https://github.com/uktrade/directory-components/pull/187)
+
+### Bug fixes:
+
+- CMS-1245 Changed default country selector text to "Select a country"
+
 ## 12.0.0
 [Full Changelog](https://github.com/uktrade/directory-components/pull/193/files)
 
@@ -67,6 +74,7 @@
 
 - [[CMS-1395]](https://uktrade.atlassian.net/browse/CMS-1395) PersistLocaleMiddleware deletes deprecated cookie names
 
+
 ## 10.8.3
 
 [Full Changelog](https://github.com/uktrade/directory-components/pull/186/files)

diff --git a/directory_components/forms.py b/directory_components/forms.py
@@ -1,15 +1,15 @@
 from django import forms
 from django.forms import Select
 from django.utils import translation
-from django.db.models.fields import BLANK_CHOICE_DASH
 from django.conf import settings
 
 from directory_components import fields as components_fields
 from directory_constants.choices import COUNTRY_CHOICES
 
 from directory_components import helpers
 
-COUNTRIES = BLANK_CHOICE_DASH + COUNTRY_CHOICES
+BLANK_COUNTRY_CHOICE = [("", "Select a country")]
+COUNTRIES = BLANK_COUNTRY_CHOICE + COUNTRY_CHOICES
 
 
 class DirectoryComponentsFormMixin:

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='directory_components',
-    version='12.0.0',
+    version='12.1.0',
     url='https://github.com/uktrade/directory-components',
     license='MIT',
     author='Department for International Trade',