mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #23368 -- Overhauled the Welsh formats.py file.

Browse Source 
The only debatable thing here is setting FIRST_DAY_OF_WEEK to 1.
The only examples of calendars I can find in Welsh start on Monday,
for example, the calendar on S4C (the only all Welsh TV station).

http://www.s4c.co.uk/clic/c_clicschedule.shtml
This commit is contained in:
Duncan Parkes
2014-08-26 18:39:41 +01:00
committed by Tim Graham
parent aa4d10d919
commit df7187d795
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
django/conf/locale/cy/formats.py
View File

@@ -5,20 +5,34 @@ from __future__ import unicode_literals
# The *_FORMAT strings use the Django date format syntax, # The *_FORMAT strings use the Django date format syntax,
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'd F Y' DATE_FORMAT = 'j F Y' # '25 Hydref 2006'
TIME_FORMAT = 'g:i:s A' TIME_FORMAT = 'P' # '2:30 y.b.'
# DATETIME_FORMAT = DATETIME_FORMAT = 'j F Y, P' # '25 Hydref 2006, 2:30 y.b.'
# YEAR_MONTH_FORMAT = YEAR_MONTH_FORMAT = 'F Y' # 'Hydref 2006'
# MONTH_DAY_FORMAT = MONTH_DAY_FORMAT = 'j F' # '25 Hydref'
SHORT_DATE_FORMAT = 'j M Y' SHORT_DATE_FORMAT = 'd/m/Y' # '25/10/2006'
# SHORT_DATETIME_FORMAT = SHORT_DATETIME_FORMAT = 'd/m/Y P' # '25/10/2006 2:30 y.b.'
# FIRST_DAY_OF_WEEK = FIRST_DAY_OF_WEEK = 1 # 'Dydd Llun'
# The *_INPUT_FORMATS strings use the Python strftime format syntax, # The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
# DATE_INPUT_FORMATS = DATE_INPUT_FORMATS = (
# TIME_INPUT_FORMATS = '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
# DATETIME_INPUT_FORMATS = )
# DECIMAL_SEPARATOR = DATETIME_INPUT_FORMATS = (
# THOUSAND_SEPARATOR = '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
# NUMBER_GROUPING = '%Y-%m-%d %H:%M:%S.%f', # '2006-10-25 14:30:59.000200'
'%Y-%m-%d %H:%M', # '2006-10-25 14:30'
'%Y-%m-%d', # '2006-10-25'
'%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 = ','
NUMBER_GROUPING = 3

2
docs/releases/1.8.txt
View File

@@ -201,6 +201,8 @@ Internationalization
reusable apps. It also allows overriding those custom formats in your main reusable apps. It also allows overriding those custom formats in your main
Django project. Django project.
* Formats for the Welsh locale (``cy``) have been added.
Management Commands Management Commands
^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^