Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Updated Portugese locale formats. Refs #11637.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8006f85f2d537bc3c764d157060bdeb7a187b14e 1 parent 413ae25
Jannis Leidel authored
31  django/conf/locale/pt/formats.py
@@ -4,15 +4,32 @@
4 4
 
5 5
 DATE_FORMAT = r'j \de F \de Y'
6 6
 TIME_FORMAT = 'H:i:s'
7  
-# DATETIME_FORMAT = 
  7
+DATETIME_FORMAT = r'j \de F \de Y à\s H:i'
8 8
 YEAR_MONTH_FORMAT = r'F \de Y'
9 9
 MONTH_DAY_FORMAT = r'j \de F'
10 10
 SHORT_DATE_FORMAT = 'd/m/Y'
11  
-# SHORT_DATETIME_FORMAT = 
12  
-# FIRST_DAY_OF_WEEK = 
13  
-# DATE_INPUT_FORMATS = 
14  
-# TIME_INPUT_FORMATS = 
15  
-# DATETIME_INPUT_FORMATS = 
  11
+SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
  12
+FIRST_DAY_OF_WEEK = 0  # Sunday
  13
+DATE_INPUT_FORMATS = (
  14
+    '%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06'
  15
+    # '%d de %b de %Y', '%d de %b, %Y',   # '25 de Out de 2006', '25 Out, 2006'
  16
+    # '%d de %B de %Y', '%d de %B, %Y',   # '25 de Outubro de 2006', '25 de Outubro, 2006'
  17
+)
  18
+TIME_INPUT_FORMATS = (
  19
+    '%H:%M:%S',     # '14:30:59'
  20
+    '%H:%M',        # '14:30'
  21
+)
  22
+DATETIME_INPUT_FORMATS = (
  23
+    '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
  24
+    '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'
  25
+    '%Y-%m-%d',              # '2006-10-25'
  26
+    '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59'
  27
+    '%d/%m/%Y %H:%M',        # '25/10/2006 14:30'
  28
+    '%d/%m/%Y',              # '25/10/2006'
  29
+    '%d/%m/%y %H:%M:%S',     # '25/10/06 14:30:59'
  30
+    '%d/%m/%y %H:%M',        # '25/10/06 14:30'
  31
+    '%d/%m/%y',              # '25/10/06'
  32
+)
16 33
 DECIMAL_SEPARATOR = ','
17 34
 THOUSAND_SEPARATOR = '.'
18  
-# NUMBER_GROUPING = 
  35
+NUMBER_GROUPING = 3
8  django/conf/locale/pt_BR/formats.py
@@ -2,11 +2,11 @@
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
4 4
 
5  
-DATE_FORMAT = 'j \\de N \\de Y'
  5
+DATE_FORMAT = r'j \de N \de Y'
6 6
 TIME_FORMAT = 'H:i'
7  
-DATETIME_FORMAT = 'j \\de N \\de Y à\\s H:i'
8  
-YEAR_MONTH_FORMAT = 'F \\de Y'
9  
-MONTH_DAY_FORMAT = 'j \\de F'
  7
+DATETIME_FORMAT = r'j \de N \de Y à\s H:i'
  8
+YEAR_MONTH_FORMAT = r'F \de Y'
  9
+MONTH_DAY_FORMAT = r'j \de F'
10 10
 SHORT_DATE_FORMAT = 'd/m/Y'
11 11
 SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
12 12
 FIRST_DAY_OF_WEEK = 0  # Sunday

0 notes on commit 8006f85

Please sign in to comment.
Something went wrong with that request. Please try again.