Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Turkmen language. #13161

Merged
merged 1 commit into from
Jul 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions django/conf/global_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ def gettext_noop(s):
('te', gettext_noop('Telugu')),
('tg', gettext_noop('Tajik')),
('th', gettext_noop('Thai')),
('tk', gettext_noop('Turkmen')),
resuls marked this conversation as resolved.
Show resolved Hide resolved
('tr', gettext_noop('Turkish')),
('tt', gettext_noop('Tatar')),
('udm', gettext_noop('Udmurt')),
Expand Down
6 changes: 6 additions & 0 deletions django/conf/locale/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,12 @@
'name': 'Thai',
'name_local': 'ภาษาไทย',
},
'tk': {
'bidi': False,
'code': 'tk',
'name': 'Turkmen',
'name_local': 'Türkmençe',
},
resuls marked this conversation as resolved.
Show resolved Hide resolved
'tr': {
'bidi': False,
'code': 'tr',
Expand Down
4 changes: 4 additions & 0 deletions django/conf/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,10 @@ msgstr ""
msgid "Thai"
msgstr ""

#: conf/global_settings.py:135
msgid "Turkmen"
msgstr ""

#: conf/global_settings.py:135
msgid "Turkish"
msgstr ""
Expand Down
Empty file.
32 changes: 32 additions & 0 deletions django/conf/locale/tk/formats.py
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions docs/releases/3.1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@ 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, Kyrgyz, and Tajik
languages.
* Added support and translations for the Algerian Arabic, Kyrgyz, Tajik, and
Turkmen languages.

Management Commands
~~~~~~~~~~~~~~~~~~~
Expand Down
1 change: 1 addition & 0 deletions docs/spelling_wordlist
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,7 @@ trigram
trigrams
tuple
tuples
Turkmen
tv
txt
tz
Expand Down