summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-08-03 09:35:39 +0200
committerClaude Paroz <claude@2xlibre.net>2012-08-03 09:35:39 +0200
commita55cde8ab1dc33723b4bac472b6fac6bb45d725a (patch)
treec02951ba77d3306f32a441a25f2db315a06daa6e
parent8fbfd217196e6bc49677d348338ded64d3373e9a (diff)
Fixed #18363 -- Improved Galician date and time format strings
Thanks Guttorm Flatabø for the report and the initial patch, and Fran Dieguez for the review.
-rw-r--r--django/conf/locale/gl/formats.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/django/conf/locale/gl/formats.py b/django/conf/locale/gl/formats.py
index 1ff9f34521..ba7f6c52a0 100644
--- a/django/conf/locale/gl/formats.py
+++ b/django/conf/locale/gl/formats.py
@@ -1,17 +1,18 @@
# -*- encoding: utf-8 -*-
# This file is distributed under the same license as the Django package.
#
+from __future__ import unicode_literals
# The *_FORMAT strings use the Django date format syntax,
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
-DATE_FORMAT = 'd F Y'
+DATE_FORMAT = r'j \d\e F \d\e Y'
TIME_FORMAT = 'H:i:s'
-# DATETIME_FORMAT =
-YEAR_MONTH_FORMAT = 'F Y'
-MONTH_DAY_FORMAT = 'j F'
-SHORT_DATE_FORMAT = 'j M, Y'
-# SHORT_DATETIME_FORMAT =
-# FIRST_DAY_OF_WEEK =
+DATETIME_FORMAT = r'j \d\e F \d\e Y \á\s H:i'
+YEAR_MONTH_FORMAT = r'F \d\e Y'
+MONTH_DAY_FORMAT = r'j \d\e F'
+SHORT_DATE_FORMAT = 'd-m-Y'
+SHORT_DATETIME_FORMAT = 'd-m-Y, H: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