From 35c63c05136fee7966ef73f29ad2d66b62d402e2 Mon Sep 17 00:00:00 2001
From: jhisham <jafry.hisham@gmail.com>
Date: Thu, 18 Nov 2021 15:25:01 +0800
Subject: [PATCH] [4.0.x] Added Malay language.

Backport of 5e218cc0b704ebf64c460050a97b5fafe63e92b0 from main
---
 django/conf/global_settings.py              |  1 +
 django/conf/locale/__init__.py              |  6 ++++
 django/conf/locale/en/LC_MESSAGES/django.po |  4 +++
 django/conf/locale/ms/__init__.py           |  0
 django/conf/locale/ms/formats.py            | 35 +++++++++++++++++++++
 docs/releases/4.0.txt                       |  5 +++
 6 files changed, 51 insertions(+)
 create mode 100644 django/conf/locale/ms/__init__.py
 create mode 100644 django/conf/locale/ms/formats.py

diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index d2c1e97e16..769e7c99af 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -117,6 +117,7 @@ LANGUAGES = [
     ('ml', gettext_noop('Malayalam')),
     ('mn', gettext_noop('Mongolian')),
     ('mr', gettext_noop('Marathi')),
+    ('ms', gettext_noop('Malay')),
     ('my', gettext_noop('Burmese')),
     ('nb', gettext_noop('Norwegian Bokmål')),
     ('ne', gettext_noop('Nepali')),
diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py
index 6285f20aa0..c57ad00440 100644
--- a/django/conf/locale/__init__.py
+++ b/django/conf/locale/__init__.py
@@ -386,6 +386,12 @@ LANG_INFO = {
         'name': 'Marathi',
         'name_local': 'मराठी',
     },
+    'ms': {
+        'bidi': False,
+        'code': 'ms',
+        'name': 'Malay',
+        'name_local': 'Bahasa Melayu',
+    },
     'my': {
         'bidi': False,
         'code': 'my',
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 262608726d..4aef1af29a 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -266,6 +266,10 @@ msgstr ""
 msgid "Marathi"
 msgstr ""
 
+#: conf/global_settings.py:120
+msgid "Malay"
+msgstr ""
+
 #: conf/global_settings.py:120
 msgid "Burmese"
 msgstr ""
diff --git a/django/conf/locale/ms/__init__.py b/django/conf/locale/ms/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/conf/locale/ms/formats.py b/django/conf/locale/ms/formats.py
new file mode 100644
index 0000000000..0ea90e0c40
--- /dev/null
+++ b/django/conf/locale/ms/formats.py
@@ -0,0 +1,35 @@
+# 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 M Y'                   # '25 Oct 2006'
+TIME_FORMAT = 'P'                       # '2:30 p.m.'
+DATETIME_FORMAT = 'j M Y, P'            # '25 Oct 2006, 2:30 p.m.'
+YEAR_MONTH_FORMAT = 'F Y'               # 'October 2006'
+MONTH_DAY_FORMAT = 'j F'                # '25 October'
+SHORT_DATE_FORMAT = 'd/m/Y'             # '25/10/2006'
+SHORT_DATETIME_FORMAT = 'd/m/Y P'       # '25/10/2006 2:30 p.m.'
+FIRST_DAY_OF_WEEK = 0                   # Sunday
+
+# The *_INPUT_FORMATS strings use the Python strftime format syntax,
+# see https://docs.python.org/library/datetime.html#strftime-strptime-behavior
+DATE_INPUT_FORMATS = [
+    '%Y-%m-%d',                         # '2006-10-25'
+    '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
+    '%d %b %Y', '%d %b, %Y',            # '25 Oct 2006', '25 Oct, 2006'
+    '%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006'
+]
+DATETIME_INPUT_FORMATS = [
+    '%Y-%m-%d %H:%M:%S',                # '2006-10-25 14:30:59'
+    '%Y-%m-%d %H:%M:%S.%f',             # '2006-10-25 14:30:59.000200'
+    '%Y-%m-%d %H:%M',                   # '2006-10-25 14:30'
+    '%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 %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'
+]
+DECIMAL_SEPARATOR = '.'
+THOUSAND_SEPARATOR = ','
+NUMBER_GROUPING = 3
diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt
index e2d1c84a5f..c98b47c524 100644
--- a/docs/releases/4.0.txt
+++ b/docs/releases/4.0.txt
@@ -260,6 +260,11 @@ Forms
   overriding :meth:`~django.forms.formsets.BaseFormSet.get_deletion_widget`
   method.
 
+Internationalization
+~~~~~~~~~~~~~~~~~~~~
+
+* Added support and translations for the Malay language.
+
 Generic Views
 ~~~~~~~~~~~~~