Skip to content

Commit

Permalink
Fixed #14663 -- Corrected Norwegian locale format strings. Thanks to …
Browse files Browse the repository at this point in the history 
…nfg for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
@freakboy3742
freakboy3742 committed Dec 4, 2010
1 parent 19afc46 commit b5754e6
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 36 deletions.
24 changes: 12 additions & 12 deletions django/conf/locale/nb/formats.py
View file
Expand Up @@ -7,11 +7,11 @@
SHORT_DATETIME_FORMAT = 'd.m.Y H:i' SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
FIRST_DAY_OF_WEEK = 1 # Monday FIRST_DAY_OF_WEEK = 1 # Monday
DATE_INPUT_FORMATS = ( DATE_INPUT_FORMATS = (
'%Y-%m-%d', '%j.%m.%Y', '%j.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
'%Y-%m-%j', # '2006-10-25', '%Y-%m-%d', # '2006-10-25',
# '%j. %b %Y', '%j %b %Y', # '25. okt 2006', '25 okt 2006' # '%d. %b %Y', '%d %b %Y', # '25. okt 2006', '25 okt 2006'
# '%j. %b. %Y', '%j %b. %Y', # '25. okt. 2006', '25 okt. 2006' # '%d. %b. %Y', '%d %b. %Y', # '25. okt. 2006', '25 okt. 2006'
# '%j. %B %Y', '%j %B %Y', # '25. oktober 2006', '25 oktober 2006' # '%d. %B %Y', '%d %B %Y', # '25. oktober 2006', '25 oktober 2006'
) )
TIME_INPUT_FORMATS = ( TIME_INPUT_FORMATS = (
'%H:%M:%S', # '14:30:59' '%H:%M:%S', # '14:30:59'
Expand All @@ -21,13 +21,13 @@
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59' '%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 %H:%M', # '2006-10-25 14:30'
'%Y-%m-%d', # '2006-10-25' '%Y-%m-%d', # '2006-10-25'
'%Y-%m-%j', # '2006-10-25' '%Y-%m-%d', # '2006-10-25'
'%j.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
'%j.%m.%Y %H:%M', # '25.10.2006 14:30' '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
'%j.%m.%Y', # '25.10.2006' '%d.%m.%Y', # '25.10.2006'
'%j.%m.%y %H:%M:%S', # '25.10.06 14:30:59' '%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59'
'%j.%m.%y %H:%M', # '25.10.06 14:30' '%d.%m.%y %H:%M', # '25.10.06 14:30'
'%j.%m.%y', # '25.10.06' '%d.%m.%y', # '25.10.06'
) )
DECIMAL_SEPARATOR = ',' DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = ' ' THOUSAND_SEPARATOR = ' '
Expand Down
24 changes: 12 additions & 12 deletions django/conf/locale/nn/formats.py
View file
Expand Up @@ -7,11 +7,11 @@
SHORT_DATETIME_FORMAT = 'd.m.Y H:i' SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
FIRST_DAY_OF_WEEK = 1 # Monday FIRST_DAY_OF_WEEK = 1 # Monday
DATE_INPUT_FORMATS = ( DATE_INPUT_FORMATS = (
'%Y-%m-%d', '%j.%m.%Y', '%j.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
'%Y-%m-%j', # '2006-10-25', '%Y-%m-%d', # '2006-10-25',
# '%j. %b %Y', '%j %b %Y', # '25. okt 2006', '25 okt 2006' # '%d. %b %Y', '%d %b %Y', # '25. okt 2006', '25 okt 2006'
# '%j. %b. %Y', '%j %b. %Y', # '25. okt. 2006', '25 okt. 2006' # '%d. %b. %Y', '%d %b. %Y', # '25. okt. 2006', '25 okt. 2006'
# '%j. %B %Y', '%j %B %Y', # '25. oktober 2006', '25 oktober 2006' # '%d. %B %Y', '%d %B %Y', # '25. oktober 2006', '25 oktober 2006'
) )
TIME_INPUT_FORMATS = ( TIME_INPUT_FORMATS = (
'%H:%M:%S', # '14:30:59' '%H:%M:%S', # '14:30:59'
Expand All @@ -21,13 +21,13 @@
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59' '%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 %H:%M', # '2006-10-25 14:30'
'%Y-%m-%d', # '2006-10-25' '%Y-%m-%d', # '2006-10-25'
'%Y-%m-%j', # '2006-10-25' '%Y-%m-%d', # '2006-10-25'
'%j.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
'%j.%m.%Y %H:%M', # '25.10.2006 14:30' '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
'%j.%m.%Y', # '25.10.2006' '%d.%m.%Y', # '25.10.2006'
'%j.%m.%y %H:%M:%S', # '25.10.06 14:30:59' '%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59'
'%j.%m.%y %H:%M', # '25.10.06 14:30' '%d.%m.%y %H:%M', # '25.10.06 14:30'
'%j.%m.%y', # '25.10.06' '%d.%m.%y', # '25.10.06'
) )
DECIMAL_SEPARATOR = ',' DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = ' ' THOUSAND_SEPARATOR = ' '
Expand Down
24 changes: 12 additions & 12 deletions django/conf/locale/no/formats.py
View file
Expand Up @@ -7,11 +7,11 @@
SHORT_DATETIME_FORMAT = 'd.m.Y H:i' SHORT_DATETIME_FORMAT = 'd.m.Y H:i'
FIRST_DAY_OF_WEEK = 1 # Monday FIRST_DAY_OF_WEEK = 1 # Monday
DATE_INPUT_FORMATS = ( DATE_INPUT_FORMATS = (
'%Y-%m-%d', '%j.%m.%Y', '%j.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06'
'%Y-%m-%j', # '2006-10-25', '%Y-%m-%d', # '2006-10-25',
# '%j. %b %Y', '%j %b %Y', # '25. okt 2006', '25 okt 2006' # '%d. %b %Y', '%d %b %Y', # '25. okt 2006', '25 okt 2006'
# '%j. %b. %Y', '%j %b. %Y', # '25. okt. 2006', '25 okt. 2006' # '%d. %b. %Y', '%d %b. %Y', # '25. okt. 2006', '25 okt. 2006'
# '%j. %B %Y', '%j %B %Y', # '25. oktober 2006', '25 oktober 2006' # '%d. %B %Y', '%d %B %Y', # '25. oktober 2006', '25 oktober 2006'
) )
TIME_INPUT_FORMATS = ( TIME_INPUT_FORMATS = (
'%H:%M:%S', # '14:30:59' '%H:%M:%S', # '14:30:59'
Expand All @@ -21,13 +21,13 @@
'%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59' '%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 %H:%M', # '2006-10-25 14:30'
'%Y-%m-%d', # '2006-10-25' '%Y-%m-%d', # '2006-10-25'
'%Y-%m-%j', # '2006-10-25' '%Y-%m-%d', # '2006-10-25'
'%j.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59'
'%j.%m.%Y %H:%M', # '25.10.2006 14:30' '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
'%j.%m.%Y', # '25.10.2006' '%d.%m.%Y', # '25.10.2006'
'%j.%m.%y %H:%M:%S', # '25.10.06 14:30:59' '%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59'
'%j.%m.%y %H:%M', # '25.10.06 14:30' '%d.%m.%y %H:%M', # '25.10.06 14:30'
'%j.%m.%y', # '25.10.06' '%d.%m.%y', # '25.10.06'
) )
DECIMAL_SEPARATOR = ',' DECIMAL_SEPARATOR = ','
THOUSAND_SEPARATOR = ' ' THOUSAND_SEPARATOR = ' '
Expand Down

0 comments on commit b5754e6

Please sign in to comment.