From 31ebb1d56441a6ea00fafcf63669be27f488afbb Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Thu, 10 Jan 2019 09:27:30 +0100
Subject: [PATCH] Added Armenian language

---
 django/conf/global_settings.py | 1 +
 django/conf/locale/__init__.py | 6 ++++++
 docs/releases/2.2.txt          | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index f72b65415e..03aa87bf21 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -89,6 +89,7 @@ LANGUAGES = [
     ('hr', gettext_noop('Croatian')),
     ('hsb', gettext_noop('Upper Sorbian')),
     ('hu', gettext_noop('Hungarian')),
+    ('hy', gettext_noop('Armenian')),
     ('ia', gettext_noop('Interlingua')),
     ('id', gettext_noop('Indonesian')),
     ('io', gettext_noop('Ido')),
diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py
index 330833d4ac..720045dadc 100644
--- a/django/conf/locale/__init__.py
+++ b/django/conf/locale/__init__.py
@@ -248,6 +248,12 @@ LANG_INFO = {
         'name': 'Hungarian',
         'name_local': 'Magyar',
     },
+    'hy': {
+        'bidi': False,
+        'code': 'hy',
+        'name': 'Armenian',
+        'name_local': 'հայերեն',
+    },
     'ia': {
         'bidi': False,
         'code': 'ia',
diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
index 7cb5c84475..843aadd24f 100644
--- a/docs/releases/2.2.txt
+++ b/docs/releases/2.2.txt
@@ -175,7 +175,7 @@ Generic Views
 Internationalization
 ~~~~~~~~~~~~~~~~~~~~
 
-* ...
+* Added support and translations for the Armenian language.
 
 Management Commands
 ~~~~~~~~~~~~~~~~~~~