From 3460ea49e839fd6bb924c48eaa1cd3d6dc888035 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 20 May 2020 12:29:59 +0200 Subject: [PATCH] Added Kyrgyz language. Thanks Soyuzbek orozbek uulu for contributing that support. --- django/conf/global_settings.py | 1 + django/conf/locale/__init__.py | 6 ++++ django/conf/locale/en/LC_MESSAGES/django.po | 6 +++- django/conf/locale/ky/__init__.py | 0 django/conf/locale/ky/formats.py | 32 +++++++++++++++++++++ docs/releases/3.1.txt | 2 +- docs/spelling_wordlist | 1 + 7 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 django/conf/locale/ky/__init__.py create mode 100644 django/conf/locale/ky/formats.py diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 214359c56b..3690898bed 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -103,6 +103,7 @@ LANGUAGES = [ ('km', gettext_noop('Khmer')), ('kn', gettext_noop('Kannada')), ('ko', gettext_noop('Korean')), + ('ky', gettext_noop('Kyrgyz')), ('lb', gettext_noop('Luxembourgish')), ('lt', gettext_noop('Lithuanian')), ('lv', gettext_noop('Latvian')), diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py index 256ae01671..03128f617f 100644 --- a/django/conf/locale/__init__.py +++ b/django/conf/locale/__init__.py @@ -332,6 +332,12 @@ LANG_INFO = { 'name': 'Korean', 'name_local': '한국어', }, + 'ky': { + 'bidi': False, + 'code': 'ky', + 'name': 'Kyrgyz', + 'name_local': 'Кыргызча', + }, 'lb': { 'bidi': False, 'code': 'lb', diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index e8c0061f29..ea139212fb 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 20:56+0200\n" +"POT-Creation-Date: 2020-05-19 20:23+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -230,6 +230,10 @@ msgstr "" msgid "Korean" msgstr "" +#: conf/global_settings.py:106 +msgid "Kyrgyz" +msgstr "" + #: conf/global_settings.py:106 msgid "Luxembourgish" msgstr "" diff --git a/django/conf/locale/ky/__init__.py b/django/conf/locale/ky/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/conf/locale/ky/formats.py b/django/conf/locale/ky/formats.py new file mode 100644 index 0000000000..1dc42c41e4 --- /dev/null +++ b/django/conf/locale/ky/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 1b2c1fee34..3843de07ec 100644 --- a/docs/releases/3.1.txt +++ b/docs/releases/3.1.txt @@ -292,7 +292,7 @@ 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 language. +* Added support and translations for the Algerian Arabic and Kyrgyz languages. Management Commands ~~~~~~~~~~~~~~~~~~~ diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index 61e4702275..2fa544ec38 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -324,6 +324,7 @@ Koziarski kwarg kwargs Kyngesburye +Kyrgyz latin lawrence lexer