Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.7.x] Fixed #22302 -- Updated Finnish locale formats

Backport of aaa2110 from master.
  • Loading branch information...
commit 0c19383a1ffaaefe92b7b3bfaac6885525afd9a9 1 parent 60d2213
@anttihirvonen anttihirvonen authored erikr committed
Showing with 25 additions and 7 deletions.
  1. +25 −7 django/conf/locale/fi/formats.py
View
32 django/conf/locale/fi/formats.py
@@ -11,14 +11,32 @@
YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'j.n.Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+SHORT_DATETIME_FORMAT = 'j.n.Y G.i'
+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 =
-# TIME_INPUT_FORMATS =
-# DATETIME_INPUT_FORMATS =
+DATE_INPUT_FORMATS = (
+ '%d.%m.%Y', # '20.3.2014'
+ '%d.%m.%y', # '20.3.14'
+)
+DATETIME_INPUT_FORMATS = (
+ '%d.%m.%Y %H.%M.%S', # '20.3.2014 14.30.59'
+ '%d.%m.%Y %H.%M.%S.%f', # '20.3.2014 14.30.59.000200'
+ '%d.%m.%Y %H.%M', # '20.3.2014 14.30'
+ '%d.%m.%Y', # '20.3.2014'
+
+ '%d.%m.%y %H.%M.%S', # '20.3.14 14.30.59'
+ '%d.%m.%y %H.%M.%S.%f', # '20.3.14 14.30.59.000200'
+ '%d.%m.%y %H.%M', # '20.3.14 14.30'
+ '%d.%m.%y', # '20.3.14'
+)
+TIME_INPUT_FORMATS = (
+ '%H.%M.%S', # '14.30.59'
+ '%H.%M.%S.%f', # '14.30.59.000200'
+ '%H.%M', # '14.30'
+)
+
DECIMAL_SEPARATOR = ','
-THOUSAND_SEPARATOR = ' ' # Non-breaking space
-# NUMBER_GROUPING =
+THOUSAND_SEPARATOR = '\xa0' # Non-breaking space
+NUMBER_GROUPING = 3

0 comments on commit 0c19383

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