summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-04-29 14:36:09 +0000
committerJannis Leidel <jannis@leidel.info>2010-04-29 14:36:09 +0000
commit77c13844ae9f30ecc10b54cf0b1a338039aa7cea (patch)
treecf74acede5390a0017ec9d43aa9cbce330a98555 /docs
parentdf44485c40b144baac626d351c2a462988c2e577 (diff)
Fixed #11068 - Introduced new language code "nb" for Norwegian Bokmål as a replacement of the current "no".
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt3
-rw-r--r--docs/releases/1.2.txt7
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 2bfa54fb93..5ecc5a1d3d 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -94,6 +94,9 @@ their deprecation, as per the :ref:`Django deprecation policy
* The ``postgresql`` database backend has been deprecated in favor of
the ``postgresql_psycopg2`` backend.
+ * The ``no`` language code has been deprecated in favor of the ``nb``
+ language code.
+
* 2.0
* ``django.views.defaults.shortcut()``. This function has been moved
to ``django.contrib.contenttypes.views.shortcut()`` as part of the
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index d320b88201..0d61d1893f 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -764,3 +764,10 @@ Relaxed requirements for usernames
The built-in :class:`~django.contrib.auth.models.User` model's
:attr:`~django.contrib.auth.models.User.username` field now allows a wider range
of characters, including ``@``, ``+``, ``.`` and ``-`` characters.
+
+Deprecation of old language code ``no``
+---------------------------------------
+
+The currently used language code for Norwegian Bokmål ``no`` is being
+replaced by the more common language code ``nb``, which should be updated
+by translators from now on.