# HG changeset patch
# User dwinter
# Date 1370012417 -7200
# Node ID 1114f55b069264c86a20579939839c20b4e01b3c
# Parent  78cd6d661a13c1b4256ec93bd95b8a111f5d7a17# Parent  e0b343cee9dd1dd89bbe42fbcb4b1b6acd93811f
Merge with e0b343cee9dd1dd89bbe42fbcb4b1b6acd93811f

diff -r 78cd6d661a13 -r 1114f55b0692 MPIWGFeature.py
--- a/MPIWGFeature.py	Fri May 31 16:59:43 2013 +0200
+++ b/MPIWGFeature.py	Fri May 31 17:00:17 2013 +0200
@@ -1,17 +1,14 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from OFS.Folder import Folder
-from AccessControl import ClassSecurityInfo
 from Globals import package_home
 
-import string
-import re
 import os
 import logging
 import datetime
 
-from SrvTxtUtils import getMonthName 
-from MPIWGHelper import *
+from SrvTxtUtils import getDateString
+import MPIWGHelper
 
 class MPIWGFeature(Folder):
     """special object for feature texts on the MPIWG website.
@@ -116,21 +113,11 @@
             # get Language from MPIWGRoot
             lang = self.getLang()
         
-        if lang == 'iso':
-            return d.isoformat()
-        elif lang == 'en':
-            return "%s %s, %s" % (getMonthName(d.month, 'en'), d.day, d.year)
-        elif lang == 'de':
-            return "%s. %s %s" % (d.day, getMonthName(d.month, 'de'), d.year)
-        
-        return None
+        return getDateString(date=d, lang=lang, withYear=True)
     
-    def getUrl(self, baseUrl=None):
-        """returns URL to this feature"""
-        if baseUrl is None:
-            return self.absolute_url()
 
-        return '%s/%s' % (baseUrl, self.getId())
+    getUrl = MPIWGHelper.getUrl
+
             
     def getPath(self, page, relative=True):
         """returns path to template page"""
@@ -247,9 +234,9 @@
             
         return crumbs
     
-    getSection = getSection
+    getSection = MPIWGHelper.getSection
 
-    getSubSection = getSubSection
+    getSubSection = MPIWGHelper.getSubSection
     
 
 def manage_addMPIWGFeatureForm(self):
diff -r 78cd6d661a13 -r 1114f55b0692 SrvTxtUtils.py
--- a/SrvTxtUtils.py	Fri May 31 16:59:43 2013 +0200
+++ b/SrvTxtUtils.py	Fri May 31 17:00:17 2013 +0200
@@ -13,7 +13,7 @@
 
 import xml.etree.ElementTree as ET
 
-srvTxtUtilsVersion = "1.9.1"
+srvTxtUtilsVersion = "1.9.2"
 
 map_months = {'en': [u"",
                u"January",
@@ -119,7 +119,7 @@
     return map_months[lang][mon]
 
 
-def getDateString(date=None, lang='en', withYear=True, abbrev=False):
+def getDateString(date=None, lang='en', withYear=True, monthNames=True, abbrev=False):
     """Return formatted date string."""
     ds = None
     if callable(date.day):
@@ -134,14 +134,17 @@
         year = date.year
         
     if lang.lower() == 'en':
-        ds = "%s, %s"%(getMonthName(month, lang), day)
+        ds = "%s %s"%(getMonthName(month, lang), day)
+        if withYear:
+            ds += ", %s"%year
+            
+    elif lang.lower() == 'de':
+        ds = "%s. %s"%(day, getMonthName(month, lang))
         if withYear:
             ds += " %s"%year
-            
-    elif lang.lower() == 'de':
-        ds = "%s.%s."%(day, month)
-        if withYear:
-            ds += " %s"%year
+
+    elif lang.lower() == 'iso':
+        ds = date.isoformat()
             
     return ds