Added Turkmen language.

7 files changed, 46 insertions, 2 deletions

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 0ab3fb9fb9..65a85f62d2 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -134,6 +134,7 @@ LANGUAGES = [
     ('te', gettext_noop('Telugu')),
     ('tg', gettext_noop('Tajik')),
     ('th', gettext_noop('Thai')),
+    ('tk', gettext_noop('Turkmen')),
     ('tr', gettext_noop('Turkish')),
     ('tt', gettext_noop('Tatar')),
     ('udm', gettext_noop('Udmurt')),
diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py
index a67f48f2d3..e044adceb4 100644
--- a/django/conf/locale/__init__.py
+++ b/django/conf/locale/__init__.py
@@ -524,6 +524,12 @@ LANG_INFO = {
         'name': 'Thai',
         'name_local': 'ภาษาไทย',
     },
+    'tk': {
+        'bidi': False,
+        'code': 'tk',
+        'name': 'Turkmen',
+        'name_local': 'Türkmençe',
+    },
     'tr': {
         'bidi': False,
         'code': 'tr',
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index cebe11b41b..ab6de57ea5 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -355,6 +355,10 @@ msgid "Thai"
 msgstr ""
 
 #: conf/global_settings.py:135
+msgid "Turkmen"
+msgstr ""
+
+#: conf/global_settings.py:135
 msgid "Turkish"
 msgstr ""
 
diff --git a/django/conf/locale/tk/__init__.py b/django/conf/locale/tk/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/django/conf/locale/tk/__init__.py
diff --git a/django/conf/locale/tk/formats.py b/django/conf/locale/tk/formats.py
new file mode 100644
index 0000000000..3e7651d755
--- /dev/null
+++ b/django/conf/locale/tk/formats.py
@@ -0,0 +1,32 @@
+# This file is distributed under the same license as the Django package.
+#
+# The *_FORMAT strings use the Django date format syntax,
+# see https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
+DATE_FORMAT = 'j E Y г.'
+TIME_FORMAT = 'G:i'
+DATETIME_FORMAT = 'j E Y г. G:i'
+YEAR_MONTH_FORMAT = 'F Y г.'
+MONTH_DAY_FORMAT = 'j F'
+SHORT_DATE_FORMAT = 'd.m.Y'
+SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
+FIRST_DAY_OF_WEEK = 1  # Monday
+
+# The *_INPUT_FORMATS strings use the Python strftime format syntax,
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
+DATE_INPUT_FORMATS = [
+    '%d.%m.%Y',  # '25.10.2006'
+    '%d.%m.%y',  # '25.10.06'
+]
+DATETIME_INPUT_FORMATS = [
+    '%d.%m.%Y %H:%M:%S',     # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S.%f',  # '25.10.2006 14:30:59.000200'
+    '%d.%m.%Y %H:%M',        # '25.10.2006 14:30'
+    '%d.%m.%Y',              # '25.10.2006'
+    '%d.%m.%y %H:%M:%S',     # '25.10.06 14:30:59'
+    '%d.%m.%y %H:%M:%S.%f',  # '25.10.06 14:30:59.000200'
+    '%d.%m.%y %H:%M',        # '25.10.06 14:30'
+    '%d.%m.%y',              # '25.10.06'
+]
+DECIMAL_SEPARATOR = ','
+THOUSAND_SEPARATOR = '\xa0'  # non-breaking space
+NUMBER_GROUPING = 3
diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt
index 50eba75170..3988d3a283 100644
--- a/docs/releases/3.1.txt
+++ b/docs/releases/3.1.txt
@@ -313,8 +313,8 @@ Internationalization
   (string) value to explicitly state that the cookie is sent with all same-site
   and cross-site requests.
 
-* Added support and translations for the Algerian Arabic, Kyrgyz, and Tajik
-  languages.
+* Added support and translations for the Algerian Arabic, Kyrgyz, Tajik, and
+  Turkmen languages.
 
 Management Commands
 ~~~~~~~~~~~~~~~~~~~
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index ead96de4cf..fb51a8aa2f 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -702,6 +702,7 @@ trigram
 trigrams
 tuple
 tuples
+Turkmen
 tv
 txt
 tz