diff options
author | Julien Valroff <julien@kirya.net> | 2012-06-15 07:43:58 +0200 |
---|---|---|
committer | Julien Valroff <julien@kirya.net> | 2012-06-15 07:43:58 +0200 |
commit | 0ec2f227ec926f91f935fa342448b38fce4f017b (patch) | |
tree | 9c50f9bb232ac849eac886f1e1dd1f14d6fd550b /rapid/generatenameconfig.py | |
parent | a7ad6daafa77f93383acfeddf1d2e8ff0a6a079a (diff) | |
parent | d6033c914c071aa57ac8ea4ccb03a55bd0506a3a (diff) |
Merge tag 'upstream/0.4.4'
Upstream version 0.4.4
Diffstat (limited to 'rapid/generatenameconfig.py')
-rw-r--r-- | rapid/generatenameconfig.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/rapid/generatenameconfig.py b/rapid/generatenameconfig.py index 0fbeb38..23e58f6 100644 --- a/rapid/generatenameconfig.py +++ b/rapid/generatenameconfig.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: latin1 -*- -### Copyright (C) 2007, 2008, 2009, 2010, 2011 Damon Lynch <damonlynch@gmail.com> +### Copyright (C) 2007-2012 Damon Lynch <damonlynch@gmail.com> ### This program is free software; you can redistribute it and/or modify ### it under the terms of the GNU General Public License as published by @@ -15,7 +15,8 @@ ### You should have received a copy of the GNU General Public License ### along with this program; if not, write to the Free Software -### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +### Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 +### USA # Special key in each dictionary which specifies the order of elements. # It is very important to have a consistent and rational order when displaying @@ -132,7 +133,7 @@ SUBSECONDS = 'Subseconds' LIST_DATE_TIME_L2 = ['YYYYMMDD', 'YYYY-MM-DD','YYMMDD', 'YY-MM-DD', 'MMDDYYYY', 'MMDDYY', 'MMDD', 'DDMMYYYY', 'DDMMYY', 'YYYY', 'YY', - 'MM', 'DD', + 'MM', 'DD', 'Month (full)', 'Month (abbreviated)', 'HHMMSS', 'HHMM', 'HH-MM-SS', 'HH-MM', 'HH', 'MM (minutes)', 'SS'] @@ -143,7 +144,7 @@ DEFAULT_VIDEO_SUBFOLDER_PREFS = [DATE_TIME, VIDEO_DATE, LIST_DATE_TIME_L2[9], '/ class i18TranslateMeThanks: """ this class is never used in actual running code - It's purpose is to have these values inserted into the program's i18n template file + Its purpose is to have these values inserted into the program's i18n template file """ def __init__(self): @@ -266,6 +267,10 @@ class i18TranslateMeThanks: # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime _('DD') # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime + _('Month (full)'), + # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime + _('Month (abbreviated)'), + # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime _('HHMMSS') # Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime _('HHMM') @@ -287,7 +292,7 @@ class i18TranslateMeThanks: DATE_TIME_CONVERT = ['%Y%m%d', '%Y-%m-%d','%y%m%d', '%y-%m-%d', '%m%d%Y', '%m%d%y', '%m%d', '%d%m%Y', '%d%m%y', '%Y', '%y', - '%m', '%d', + '%m', '%d', '%B', '%b', '%H%M%S', '%H%M', '%H-%M-%S', '%H-%M', '%H', '%M', '%S'] |