From 24c7d828b00c5cfb203addca06c82fc30d2e989a Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 12 Oct 2012 23:16:55 +0200 Subject: Moved de_CH/formats.py in its correct location Refs #16188. --- django/conf/locale/de_CH/__init__.py | 0 django/conf/locale/de_CH/formats.py | 45 +++++++++++++++++++++++++++++ django/contrib/localflavor/de_CH/formats.py | 45 ----------------------------- 3 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 django/conf/locale/de_CH/__init__.py create mode 100644 django/conf/locale/de_CH/formats.py delete mode 100644 django/contrib/localflavor/de_CH/formats.py diff --git a/django/conf/locale/de_CH/__init__.py b/django/conf/locale/de_CH/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/django/conf/locale/de_CH/formats.py b/django/conf/locale/de_CH/formats.py new file mode 100644 index 0000000000..7cbf76e7db --- /dev/null +++ b/django/conf/locale/de_CH/formats.py @@ -0,0 +1,45 @@ +# -*- encoding: utf-8 -*- +# This file is distributed under the same license as the Django package. +# + +# The *_FORMAT strings use the Django date format syntax, +# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date +from __future__ import unicode_literals + +DATE_FORMAT = 'j. F Y' +TIME_FORMAT = 'H:i:s' +DATETIME_FORMAT = 'j. F Y H:i:s' +YEAR_MONTH_FORMAT = 'F Y' +MONTH_DAY_FORMAT = 'j. F' +SHORT_DATE_FORMAT = 'd.m.Y' +SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s' +FIRST_DAY_OF_WEEK = 1 # Monday + +# The *_INPUT_FORMATS strings use the Python strftime format syntax, +# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior +DATE_INPUT_FORMATS = ( + '%d.%m.%Y', '%d.%m.%y', # '25.10.2006', '25.10.06' + '%Y-%m-%d', '%y-%m-%d', # '2006-10-25', '06-10-25' + # '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006' +) +TIME_INPUT_FORMATS = ( + '%H:%M:%S', # '14:30:59' + '%H:%M', # '14:30' +) +DATETIME_INPUT_FORMATS = ( + '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' + '%d.%m.%Y %H:%M', # '25.10.2006 14:30' + '%d.%m.%Y', # '25.10.2006' + '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59' + '%Y-%m-%d %H:%M', # '2006-10-25 14:30' + '%Y-%m-%d', # '2006-10-25' +) + +# these are the separators for non-monetary numbers. For monetary numbers, +# the DECIMAL_SEPARATOR is a . (decimal point) and the THOUSAND_SEPARATOR is a +# ' (single quote). +# For details, please refer to http://www.bk.admin.ch/dokumentation/sprachen/04915/05016/index.html?lang=de +# (in German) and the documentation +DECIMAL_SEPARATOR = ',' +THOUSAND_SEPARATOR = '\xa0' # non-breaking space +NUMBER_GROUPING = 3 diff --git a/django/contrib/localflavor/de_CH/formats.py b/django/contrib/localflavor/de_CH/formats.py deleted file mode 100644 index 9d56f9f298..0000000000 --- a/django/contrib/localflavor/de_CH/formats.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- encoding: utf-8 -*- -# This file is distributed under the same license as the Django package. -# - -# The *_FORMAT strings use the Django date format syntax, -# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date -from __future__ import unicode_literals - -DATE_FORMAT = 'j. F Y' -TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'j. F Y H:i:s' -YEAR_MONTH_FORMAT = 'F Y' -MONTH_DAY_FORMAT = 'j. F' -SHORT_DATE_FORMAT = 'd.m.Y' -SHORT_DATETIME_FORMAT = 'd.m.Y H:i:s' -FIRST_DAY_OF_WEEK = 1 # Monday - -# The *_INPUT_FORMATS strings use the Python strftime format syntax, -# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -DATE_INPUT_FORMATS = ( - '%d.%m.%Y', '%d.%m.%y', # '25.10.2006', '25.10.06' - '%Y-%m-%d', '%y-%m-%d', # '2006-10-25', '06-10-25' - # '%d. %B %Y', '%d. %b. %Y', # '25. October 2006', '25. Oct. 2006' -) -TIME_INPUT_FORMATS = ( - '%H:%M:%S', # '14:30:59' - '%H:%M', # '14:30' -) -DATETIME_INPUT_FORMATS = ( - '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' - '%d.%m.%Y %H:%M', # '25.10.2006 14:30' - '%d.%m.%Y', # '25.10.2006' - '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59' - '%Y-%m-%d %H:%M', # '2006-10-25 14:30' - '%Y-%m-%d', # '2006-10-25' -) - -# these are the separators for non-monetary numbers. For monetary numbers, -# the DECIMAL_SEPARATOR is a . (decimal point) and the THOUSAND_SEPARATOR is a -# ' (single quote). -# For details, please refer to http://www.bk.admin.ch/dokumentation/sprachen/04915/05016/index.html?lang=de -# (in German) and the documentation -DECIMAL_SEPARATOR = ',' -THOUSAND_SEPARATOR = '\xa0' # non-breaking space -NUMBER_GROUPING = 3 -- cgit v1.3