django/contrib/localdates/local_dates.py django/contrib/localdates/locale/fi/LC_MESSAGES/django.mo django/contrib/localflavor/sample/dateformat.py django/contrib/localflavor/sample/local_dates.py django/contrib/localflavor/sample/readme.txt plan.txt @@ -105,11 +105,18 @@ class LocalFormatter(object): # use the standard behavior for the rest return self._format(self, formatstr) - +from local_dates import MONTHS_POS, MONTHS_DIR class DefaultLocalDateFormat(LocalFormatter, DateFormat): def __init__(self, *args, **kwargs): self._format = DateFormat.format super(DefaultLocalDateFormat, self).__init__(*args, **kwargs) + + + def Fp(self): + return MONTHS_POS[self.data.month] + + def Fd(self): + return MONTHS_DIR[self.data.month] class DefaultLocalTimeFormat(LocalFormatter, TimeFormat): def __init__(self, *args, **kwargs): django/contrib/localdates/local_dateformat.py django/contrib/localdates/locale/el/LC_MESSAGES/django.mo @@ -1,77 +1,173 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-17 22:11+0300\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: .\local_dateformat.py:11 -msgid "FULL_DATE" -msgstr "l, j {Fp}, Y" - -#: .\local_dateformat.py:12 -msgid "ABBR_DATE" -msgstr "j {Fp}, Y" - -#: .\local_dateformat.py:13 -msgid "ABBR2_DATE" -msgstr "j M, Y" - -#: .\local_dateformat.py:14 -msgid "NUM_DATE" -msgstr "j/n/Y" - -#: .\local_dateformat.py:16 -msgid "FULL_DATETIME" -msgstr "l, j {Fp}, Y, P" - -#: .\local_dateformat.py:17 -msgid "ABBR_DATETIME" -msgstr "j {Fp}, Y, P" - -#: .\local_dateformat.py:18 -msgid "ABBR2_DATETIME" -msgstr "j M, Y, P" - -#: .\local_dateformat.py:19 -msgid "NUM_DATETIME" -msgstr "j/n/Y, P" - -#: .\local_dateformat.py:21 -msgid "FULL_TIME" -msgstr "P" - -#: .\local_dateformat.py:23 -msgid "FULL_YEARMONTH" -msgstr "F Y" - -#: .\local_dateformat.py:24 -msgid "ABBR_YEARMONTH" -msgstr "M Y" - -#: .\local_dateformat.py:25 -msgid "NUM_YEARMONTH" -msgstr "n/Y" - -#: .\local_dateformat.py:27 -msgid "FULL_MONTHDAY" -msgstr "j {Fp}" - -#: .\local_dateformat.py:28 -msgid "ABBR_MONTHDAY" -msgstr "j M" - -#: .\local_dateformat.py:29 -msgid "NUM_MONTHDAY" -msgstr "j/n" +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-10-02 00:22+0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Orestis Markou <orestis@orestis.gr>\n" +"Language-Team: Greek \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: local_dateformat.py:11 +msgid "FULL_DATE" +msgstr "l, j {Fp}, Y" + +#: local_dateformat.py:12 +msgid "ABBR_DATE" +msgstr "j {Fp}, Y" + +#: local_dateformat.py:13 +msgid "ABBR2_DATE" +msgstr "j M, Y" + +#: local_dateformat.py:14 +msgid "NUM_DATE" +msgstr "j/n/Y" + +#: local_dateformat.py:16 +msgid "FULL_DATETIME" +msgstr "l, j {Fp}, Y, P" + +#: local_dateformat.py:17 +msgid "ABBR_DATETIME" +msgstr "j {Fp}, Y, P" + +#: local_dateformat.py:18 +msgid "ABBR2_DATETIME" +msgstr "j M, Y, P" + +#: local_dateformat.py:19 +msgid "NUM_DATETIME" +msgstr "j/n/Y, P" + +#: local_dateformat.py:21 +msgid "FULL_TIME" +msgstr "P" + +#: local_dateformat.py:23 +msgid "FULL_YEARMONTH" +msgstr "F Y" + +#: local_dateformat.py:24 +msgid "ABBR_YEARMONTH" +msgstr "M Y" + +#: local_dateformat.py:25 +msgid "NUM_YEARMONTH" +msgstr "n/Y" + +#: local_dateformat.py:27 +msgid "FULL_MONTHDAY" +msgstr "j {Fp}" + +#: local_dateformat.py:28 +msgid "ABBR_MONTHDAY" +msgstr "j M" + +#: local_dateformat.py:29 +msgid "NUM_MONTHDAY" +msgstr "j/n" + +#: local_dates.py:21 +msgid "January_POS" +msgstr "Ιανουαρία" + +#: local_dates.py:21 +msgid "February_POS" +msgstr "Φεβρουαρίου" + +#: local_dates.py:21 +msgid "March_POS" +msgstr "Μαρτίου" + +#: local_dates.py:21 +msgid "April_POS" +msgstr "Απριλίου" + +#: local_dates.py:22 +msgid "May_POS" +msgstr "Μαΐου" + +#: local_dates.py:22 +msgid "June_POS" +msgstr "Ιουνίου" + +#: local_dates.py:22 +msgid "July_POS" +msgstr "Ιουλίου" + +#: local_dates.py:22 +msgid "August_POS" +msgstr "Αυγούστου" + +#: local_dates.py:23 +msgid "September_POS" +msgstr "Σεπτεμβρίου" + +#: local_dates.py:23 +msgid "October_POS" +msgstr "Οκτωβρίου" + +#: local_dates.py:23 +msgid "November_POS" +msgstr "Νοεμβρίου" + +#: local_dates.py:24 +msgid "December_POS" +msgstr "Δεκεμβρίου" + +#: local_dates.py:33 +msgid "January_DIR" +msgstr "Ιανουάριο" + +#: local_dates.py:33 +msgid "February_DIR" +msgstr "Φεβρουάριο" + +#: local_dates.py:33 +msgid "March_DIR" +msgstr "Μάρτιο" + +#: local_dates.py:33 +msgid "April_DIR" +msgstr "Απρίλιο" + +#: local_dates.py:34 +msgid "May_DIR" +msgstr "Μάιο" + +#: local_dates.py:34 +msgid "June_DIR" +msgstr "Ιούνιο" + +#: local_dates.py:34 +msgid "July_DIR" +msgstr "Ιούλιο" + +#: local_dates.py:34 +msgid "August_DIR" +msgstr "Άυγουστο" + +#: local_dates.py:35 +msgid "September_DIR" +msgstr "Σεπτέμβριο" + +#: local_dates.py:35 +msgid "October_DIR" +msgstr "Οκτώβριο" + +#: local_dates.py:35 +msgid "November_DIR" +msgstr "Νοέμβριο" + +#: local_dates.py:36 +msgid "December_DIR" +msgstr "Δεκέμβριο" django/contrib/localdates/locale/el/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-17 22:11+0300\n" +"POT-Creation-Date: 2007-10-02 00:22+0300\n" "PO-Revision-Date: 2007-09-30 17:57+0300\n" "Last-Translator: Antti Kaihola <akaihol+django@ambitone.com>\n" "Language-Team: Finnish <Django-I18N@googlegroups.com>\n" @@ -15,62 +15,158 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: .\local_dateformat.py:11 +#: local_dateformat.py:11 msgid "FULL_DATE" msgstr "l, j. {Fp} Y" -#: .\local_dateformat.py:12 +#: local_dateformat.py:12 msgid "ABBR_DATE" msgstr "j. {Fp} Y" -#: .\local_dateformat.py:13 +#: local_dateformat.py:13 msgid "ABBR2_DATE" msgstr "j. M Y" -#: .\local_dateformat.py:14 +#: local_dateformat.py:14 msgid "NUM_DATE" msgstr "j.n.Y" -#: .\local_dateformat.py:16 +#: local_dateformat.py:16 msgid "FULL_DATETIME" msgstr "l, j. {Fp} Y, P" -#: .\local_dateformat.py:17 +#: local_dateformat.py:17 msgid "ABBR_DATETIME" msgstr "j. {Fp} Y, P" -#: .\local_dateformat.py:18 +#: local_dateformat.py:18 msgid "ABBR2_DATETIME" msgstr "j. M Y, P" -#: .\local_dateformat.py:19 +#: local_dateformat.py:19 msgid "NUM_DATETIME" msgstr "j.n.Y, P" -#: .\local_dateformat.py:21 +#: local_dateformat.py:21 msgid "FULL_TIME" msgstr "P" -#: .\local_dateformat.py:23 +#: local_dateformat.py:23 msgid "FULL_YEARMONTH" msgstr "F Y" -#: .\local_dateformat.py:24 +#: local_dateformat.py:24 msgid "ABBR_YEARMONTH" msgstr "M Y" -#: .\local_dateformat.py:25 +#: local_dateformat.py:25 msgid "NUM_YEARMONTH" msgstr "n/Y" -#: .\local_dateformat.py:27 +#: local_dateformat.py:27 msgid "FULL_MONTHDAY" msgstr "j. {Fp}" -#: .\local_dateformat.py:28 +#: local_dateformat.py:28 msgid "ABBR_MONTHDAY" msgstr "j. M" -#: .\local_dateformat.py:29 +#: local_dateformat.py:29 msgid "NUM_MONTHDAY" msgstr "j.n." + +#: local_dates.py:21 +msgid "January_POS" +msgstr "tammikuuta" + +#: local_dates.py:21 +msgid "February_POS" +msgstr "helmikuuta" + +#: local_dates.py:21 +msgid "March_POS" +msgstr "maaliskuuta" + +#: local_dates.py:21 +msgid "April_POS" +msgstr "huhtikuuta" + +#: local_dates.py:22 +msgid "May_POS" +msgstr "toukokuuta" + +#: local_dates.py:22 +msgid "June_POS" +msgstr "kesäkuuta" + +#: local_dates.py:22 +msgid "July_POS" +msgstr "heinäkuuta" + +#: local_dates.py:22 +msgid "August_POS" +msgstr "elokuuta" + +#: local_dates.py:23 +msgid "September_POS" +msgstr "syyskuuta" + +#: local_dates.py:23 +msgid "October_POS" +msgstr "lokakuuta" + +#: local_dates.py:23 +msgid "November_POS" +msgstr "marraskuuta" + +#: local_dates.py:24 +msgid "December_POS" +msgstr "joulukuuta" + +#: local_dates.py:33 +msgid "January_DIR" +msgstr "tammikuussa" + +#: local_dates.py:33 +msgid "February_DIR" +msgstr "helmikuussa" + +#: local_dates.py:33 +msgid "March_DIR" +msgstr "maaliskuussa" + +#: local_dates.py:33 +msgid "April_DIR" +msgstr "huhtikuussa" + +#: local_dates.py:34 +msgid "May_DIR" +msgstr "toukokuussa" + +#: local_dates.py:34 +msgid "June_DIR" +msgstr "kesäkuussa" + +#: local_dates.py:34 +msgid "July_DIR" +msgstr "heinäkuussa" + +#: local_dates.py:34 +msgid "August_DIR" +msgstr "elokuussa" + +#: local_dates.py:35 +msgid "September_DIR" +msgstr "syyskuussa" + +#: local_dates.py:35 +msgid "October_DIR" +msgstr "lokakuussa" + +#: local_dates.py:35 +msgid "November_DIR" +msgstr "marraskuussa" + +#: local_dates.py:36 +msgid "December_DIR" +msgstr "joulukuussa" django/contrib/localdates/locale/fi/LC_MESSAGES/django.po @@ -18,7 +18,7 @@ def ldate(value, arg=None): arg = settings.DATE_FORMAT return format(value, arg, get_language()) -# below here nothing works + def ltime(value, arg=None): "Formats a time according to the given format" if value in (None, ''): @@ -27,6 +27,7 @@ def ltime(value, arg=None): arg = settings.TIME_FORMAT return time_format(value, arg, get_language()) +# below here nothing works def ltimesince(value, arg=None): 'Formats a date as the time since that date (i.e. "4 days, 6 hours")' from django.utils.timesince import timesince django/contrib/localdates/templatetags/local_datefilter.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- r""" @@ -68,31 +68,31 @@ True '1979 189 CET' >>> format(my_birthday, r'jS o\f F') -'8th of July' +'8th of July' -# >>> translation.activate('el-gr') +# >>> translation.activate('el-gr') >>> format(my_birthday, r'd {Fp} Y', 'el_gr') -u'08 \u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5 1979' - +u'08 \u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5 1979' + >>> format(my_birthday, r'{FULL_DATE}', 'el_gr') u'Sunday, 8 \u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5, 1979' - + >>> format(my_birthday, r'{ABBR_DATE}', 'el_gr') '8 Jul, 1979' - + >>> format(my_birthday, r'{NUM_DATE}', 'el_gr') -'8/7/1979' - +'8/7/1979' + >>> format(my_birthday, r'{FULL_DATETIME}', 'el_gr') u'Sunday, 8 \u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5, 1979, 10 p.m.' - + >>> format(my_birthday, r'{ABBR_DATETIME}', 'el_gr') '8 Jul, 1979, 10 p.m.' - + >>> format(my_birthday, r'{NUM_DATETIME}', 'el_gr') -'8/7/1979, 10 p.m.' - +'8/7/1979, 10 p.m.' + """ from django.utils import translation @@ -109,7 +109,7 @@ try: except AttributeError: no_tz = True -my_birthday = datetime.datetime(1979, 7, 8, 22, 00) +my_birthday = datetime.datetime(1979, 7, 8, 22, 00) my_birthday2 = datetime.datetime(1979, 7, 8, 22, 30) summertime = datetime.datetime(2005, 10, 30, 1, 00) wintertime = datetime.datetime(2005, 10, 30, 4, 00) django/contrib/localdates/tests.py django/contrib/localdates/plan.txt django/contrib/localflavor/el/__init__.py django/contrib/localflavor/el/dateformat.py django/contrib/localflavor/el/local_dates.py django/contrib/localflavor/fi/dateformat.py django/contrib/localflavor/fi/local_dates.py 4235616fb9c34b747b311bbcc61acf9acfea2fcc orestis orestis@2d4215e5-4f35-0410-b94f-7947a7918f2f http://github.com/orestis/django-localdates/commit/3db1d472cbe7bc479df7160a93052b36a3b7b50c 3db1d472cbe7bc479df7160a93052b36a3b7b50c 2007-10-01T15:00:51-07:00 2007-10-01T15:00:51-07:00 git-svn-id: https://django-localdates.googlecode.com/svn/trunk@12 2d4215e5-4f35-0410-b94f-7947a7918f2f 0e57e86b8eaa57fa08d7a70c8be6eebf072033f6 orestis orestis@2d4215e5-4f35-0410-b94f-7947a7918f2f