summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-05-03 11:52:20 +0000
committerJannis Leidel <jannis@leidel.info>2011-05-03 11:52:20 +0000
commitf4860448ddad760172b4dde0323140e99d78a55f (patch)
treeb3a5d6c02c646bb96e43e16223e35a7f04bd6366 /docs/ref
parent41a1a89e4ede058f35f2ff6da18a828ac059d785 (diff)
Fixed #13729 -- Renamed UK localflavor to GB to correctly follow ISO 3166. Thanks, Claude Paroz.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/contrib/localflavor.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/ref/contrib/localflavor.txt b/docs/ref/contrib/localflavor.txt
index 4935382093..f6dab64217 100644
--- a/docs/ref/contrib/localflavor.txt
+++ b/docs/ref/contrib/localflavor.txt
@@ -123,7 +123,7 @@ Here's an example of how to use them::
.. _Sweden: `Sweden (se)`_
.. _Switzerland: `Switzerland (ch)`_
.. _Turkey: `Turkey (tr)`_
-.. _United Kingdom: `United Kingdom (uk)`_
+.. _United Kingdom: `United Kingdom (gb)`_
.. _United States of America: `United States of America (us)`_
.. _Uruguay: `Uruguay (uy)`_
@@ -1054,20 +1054,20 @@ Turkey (``tr``)
A ``select`` widget that uses a list of Turkish provinces as its choices.
-United Kingdom (``uk``)
+United Kingdom (``gb``)
=======================
-.. class:: uk.forms.UKPostcodeField
+.. class:: gb.forms.GBPostcodeField
A form field that validates input as a UK postcode. The regular
expression used is sourced from the schema for British Standard BS7666
address types at http://www.cabinetoffice.gov.uk/media/291293/bs7666-v2-0.xml.
-.. class:: uk.forms.UKCountySelect
+.. class:: gb.forms.GBCountySelect
A ``Select`` widget that uses a list of UK counties/regions as its choices.
-.. class:: uk.forms.UKNationSelect
+.. class:: gb.forms.GBNationSelect
A ``Select`` widget that uses a list of UK nations as its choices.