Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #15227 -- Updated Slovenian localization. Thanks to Gasper Zejn.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15434 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1291888153927072fb2c9ac735c42ce23a297668 1 parent 7536f63
Russell Keith-Magee authored February 06, 2011

Showing 1 changed file with 34 additions and 8 deletions. Show diff stats Hide diff stats

  1. 42  django/conf/locale/sl/formats.py
42  django/conf/locale/sl/formats.py
@@ -6,18 +6,44 @@
6 6
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
7 7
 DATE_FORMAT = 'd. F Y'
8 8
 TIME_FORMAT = 'H:i:s'
9  
-# DATETIME_FORMAT = 
10  
-# YEAR_MONTH_FORMAT = 
  9
+DATETIME_FORMAT = 'j. F Y. H:i'
  10
+YEAR_MONTH_FORMAT = 'F Y'
11 11
 MONTH_DAY_FORMAT = 'j. F'
12 12
 SHORT_DATE_FORMAT = 'j. M. Y'
13  
-# SHORT_DATETIME_FORMAT = 
14  
-# FIRST_DAY_OF_WEEK = 
  13
+SHORT_DATETIME_FORMAT = 'j.n.Y. H:i'
  14
+FIRST_DAY_OF_WEEK = 0
15 15
 
16 16
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
17 17
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
18  
-# DATE_INPUT_FORMATS = 
19  
-# TIME_INPUT_FORMATS = 
20  
-# DATETIME_INPUT_FORMATS = 
  18
+DATE_INPUT_FORMATS = (
  19
+    '%d.%m.%Y', '%d.%m.%y',         # '25.10.2006', '25.10.06'
  20
+    '%d-%m-%Y',                     # '25-10-2006'
  21
+    '%d. %m. %Y', '%d. %m. %y',     # '25. 10. 2006', '25. 10. 06'
  22
+)
  23
+
  24
+TIME_INPUT_FORMATS = (
  25
+    '%H:%M:%S',     # '14:30:59'
  26
+    '%H:%M',        # '14:30'
  27
+)
  28
+
  29
+DATETIME_INPUT_FORMATS = (
  30
+    '%d.%m.%Y %H:%M:%S',            # '25.10.2006 14:30:59'
  31
+    '%d.%m.%Y %H:%M',               # '25.10.2006 14:30'
  32
+    '%d.%m.%Y',                     # '25.10.2006'
  33
+    '%d.%m.%y %H:%M:%S',            # '25.10.06 14:30:59'
  34
+    '%d.%m.%y %H:%M',                # '25.10.06 14:30'
  35
+    '%d.%m.%y',                     # '25.10.06'
  36
+    '%d-%m-%Y %H:%M:%S',            # '25-10-2006 14:30:59'
  37
+    '%d-%m-%Y %H:%M',               # '25-10-2006 14:30'
  38
+    '%d-%m-%Y',                     # '25-10-2006'
  39
+    '%d. %m. %Y %H:%M:%S',          # '25. 10. 2006 14:30:59'
  40
+    '%d. %m. %Y %H:%M',             # '25. 10. 2006 14:30'
  41
+    '%d. %m. %Y',                   # '25. 10. 2006'
  42
+    '%d. %m. %y %H:%M:%S',          # '25. 10. 06 14:30:59'
  43
+    '%d. %m. %y %H:%M',             # '25. 10. 06 14:30'
  44
+    '%d. %m. %y',                   # '25. 10. 06'
  45
+)
  46
+
21 47
 DECIMAL_SEPARATOR = ','
22 48
 THOUSAND_SEPARATOR = '.'
23  
-# NUMBER_GROUPING = 
  49
+NUMBER_GROUPING = 3

0 notes on commit 1291888

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