From ff2e0896a3f7b566c8a0802b2191d30c6070c8f6 Mon Sep 17 00:00:00 2001
From: Emin Mastizada <emin25@ovi.com>
Date: Sun, 22 Feb 2015 03:56:51 +0200
Subject: [PATCH] [1.8.x] Added formats for the Azerbaijani locale.

Backport of dda2a3cf4cc29d01de180f66d19441f300732e52 from master
---
 django/conf/locale/az/__init__.py |  0
 django/conf/locale/az/formats.py  | 35 +++++++++++++++++++++++++++++++
 docs/releases/1.7.5.txt           |  2 ++
 docs/spelling_wordlist            |  1 +
 4 files changed, 38 insertions(+)
 create mode 100644 django/conf/locale/az/__init__.py
 create mode 100644 django/conf/locale/az/formats.py

diff --git a/django/conf/locale/az/__init__.py b/django/conf/locale/az/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/conf/locale/az/formats.py b/django/conf/locale/az/formats.py
new file mode 100644
index 0000000000..07b1181285
--- /dev/null
+++ b/django/conf/locale/az/formats.py
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+# This file is distributed under the same license as the Django package.
+#
+from __future__ import unicode_literals
+
+# The *_FORMAT strings use the Django date format syntax,
+# see http://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 http://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/1.7.5.txt b/docs/releases/1.7.5.txt
index 432031ef38..48075694ed 100644
--- a/docs/releases/1.7.5.txt
+++ b/docs/releases/1.7.5.txt
@@ -23,3 +23,5 @@ Bugfixes
 * Added the ability to set the isolation level on PostgreSQL with psycopg2 ≥
   2.4.2 (:ticket:`24318`). It was advertised as a new feature in Django 1.6
   but it didn't work in practice.
+
+* Formats for the Azerbaijani locale (``az``) have been added.
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index 6c738c5000..157d998407 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -37,6 +37,7 @@ autogenerated
 autoincrement
 autoreload
 Aymeric
+Azerbaijani
 backend
 backends
 backport