summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2019-01-10 09:27:30 +0100
committerClaude Paroz <claude@2xlibre.net>2019-01-10 10:50:42 +0100
commit31ebb1d56441a6ea00fafcf63669be27f488afbb (patch)
tree48eeac978597ead461dd26dd0b1794e71fe1bd4e
parentdb1b10ef0dcab2b8bacbea4adc681a57bd70b462 (diff)
Added Armenian language
-rw-r--r--django/conf/global_settings.py1
-rw-r--r--django/conf/locale/__init__.py6
-rw-r--r--docs/releases/2.2.txt2
3 files changed, 8 insertions, 1 deletions
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
~~~~~~~~~~~~~~~~~~~