-
-
Notifications
You must be signed in to change notification settings - Fork 31.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[soc2009/i18n] Norwegian bokmal and Brazilian portuguese formats adde…
…d. See #11637. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/i18n-improvements@11403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
- Loading branch information
1 parent
b1a54ac
commit b6d352c
Showing
2 changed files
with
65 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,37 @@ | ||
| # This file is distributed under the same license as the Django package. | ||
| # | ||
|
|
||
| # DATE_FORMAT = | ||
| # TIME_FORMAT = | ||
| # DATETIME_FORMAT = | ||
| # YEAR_MONTH_FORMAT = | ||
| # MONTH_DAY_FORMAT = | ||
| # SHORT_DATE_FORMAT = | ||
| # SHORT_DATETIME_FORMAT = | ||
| # FIRST_DAY_OF_WEEK = | ||
| # DATE_INPUT_FORMATS = | ||
| # TIME_INPUT_FORMATS = | ||
| # DATETIME_INPUT_FORMATS = | ||
| # DECIMAL_SEPARATOR = | ||
| # THOUSAND_SEPARATOR = | ||
| # NUMBER_GROUPING = | ||
| DATE_FORMAT = 'j. F Y' | ||
| TIME_FORMAT = 'H:i' | ||
| DATETIME_FORMAT = 'j. F Y H: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 | ||
| DATE_INPUT_FORMATS = ( | ||
| '%Y-%m-%d', '%j.%m.%Y', '%j.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' | ||
| '%Y-%m-%j', # '2006-10-25', | ||
| '%j. %b %Y', '%j %b %Y', # '25. okt 2006', '25 okt 2006' | ||
| '%j. %b. %Y', '%j %b. %Y', # '25. okt. 2006', '25 okt. 2006' | ||
| '%j. %B %Y', '%j %B %Y', # '25. oktober 2006', '25 oktober 2006' | ||
| ) | ||
| TIME_INPUT_FORMATS = ( | ||
| '%H:%i:%S', # '14:30:59' | ||
| '%H:%i', # '14:30' | ||
| ) | ||
| DATETIME_INPUT_FORMATS = ( | ||
| '%Y-%m-%d %H:%i:%S', # '2006-10-25 14:30:59' | ||
| '%Y-%m-%d %H:%i', # '2006-10-25 14:30' | ||
| '%Y-%m-%d', # '2006-10-25' | ||
| '%Y-%m-%j', # '2006-10-25' | ||
| '%j.%m.%Y %H:%i:%S', # '25.10.2006 14:30:59' | ||
| '%j.%m.%Y %H:%i', # '25.10.2006 14:30' | ||
| '%j.%m.%Y', # '25.10.2006' | ||
| '%j.%m.%y %H:%i:%S', # '25.10.06 14:30:59' | ||
| '%j.%m.%y %H:%i', # '25.10.06 14:30' | ||
| '%j.%m.%y', # '25.10.06' | ||
| ) | ||
| DECIMAL_SEPARATOR = ',' | ||
| THOUSAND_SEPARATOR = ' ' | ||
| NUMBER_GROUPING = 3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,34 @@ | ||
| # This file is distributed under the same license as the Django package. | ||
| # | ||
|
|
||
| # DATE_FORMAT = | ||
| # TIME_FORMAT = | ||
| # DATETIME_FORMAT = | ||
| # YEAR_MONTH_FORMAT = | ||
| # MONTH_DAY_FORMAT = | ||
| # SHORT_DATE_FORMAT = | ||
| # SHORT_DATETIME_FORMAT = | ||
| # FIRST_DAY_OF_WEEK = | ||
| # DATE_INPUT_FORMATS = | ||
| # TIME_INPUT_FORMATS = | ||
| # DATETIME_INPUT_FORMATS = | ||
| # DECIMAL_SEPARATOR = | ||
| # THOUSAND_SEPARATOR = | ||
| # NUMBER_GROUPING = | ||
| DATE_FORMAT = 'j \\de N \\de Y' | ||
| TIME_FORMAT = 'H:i' | ||
| DATETIME_FORMAT = 'j \\de N \\de Y à\\s H:i' | ||
| YEAR_MONTH_FORMAT = 'F \\de Y' | ||
| MONTH_DAY_FORMAT = 'j \\de F' | ||
| SHORT_DATE_FORMAT = 'd/m/Y' | ||
| SHORT_DATETIME_FORMAT = 'd/m/Y H:i' | ||
| FIRST_DAY_OF_WEEK = 0 # Sunday | ||
| DATE_INPUT_FORMATS = ( | ||
| '%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06' | ||
| '%d de %b de %Y', '%d de %b, %Y', # '25 de Out de 2006', '25 Out, 2006' | ||
| '%d de %B de %Y', '%d de %B, %Y', # '25 de Outubro de 2006', '25 de Outubro, 2006' | ||
| ) | ||
| TIME_INPUT_FORMATS = ( | ||
| '%H:%M:%S', # '14:30:59' | ||
| '%H:%M', # '14:30' | ||
| ) | ||
| DATETIME_INPUT_FORMATS = ( | ||
| '%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' | ||
| '%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' | ||
| '%d/%m/%y %H:%M:%S', # '25/10/06 14:30:59' | ||
| '%d/%m/%y %H:%M', # '25/10/06 14:30' | ||
| '%d/%m/%y', # '25/10/06' | ||
| ) | ||
| DECIMAL_SEPARATOR = ',' | ||
| THOUSAND_SEPARATOR = '.' | ||
| NUMBER_GROUPING = 3 |