[Checkins] SVN: zc.datetimewidget/trunk/ merging nilo_z2_compatbility branch

[Daniel Havlik]

Log message for revision 100169:
  merging nilo_z2_compatbility branch
  

Changed:
  U   zc.datetimewidget/trunk/CHANGES.txt
  U   zc.datetimewidget/trunk/setup.py
  U   zc.datetimewidget/trunk/src/zc/datetimewidget/configure.zcml
  U   zc.datetimewidget/trunk/src/zc/datetimewidget/datetimewidget.py
  D   zc.datetimewidget/trunk/src/zc/datetimewidget/resources/lang/
  A   zc.datetimewidget/trunk/src/zc/datetimewidget/resources/languages/

-=-
Modified: zc.datetimewidget/trunk/CHANGES.txt
===================================================================
--- zc.datetimewidget/trunk/CHANGES.txt	2009-05-20 08:41:45 UTC (rev 100168)
+++ zc.datetimewidget/trunk/CHANGES.txt	2009-05-20 09:14:48 UTC (rev 100169)
@@ -2,11 +2,22 @@
 CHANGES
 =======
 
+0.6.2 (unreleased)
+------------------
+
+- Using ++resource++ instead of @@/ to load resources.
+
+- Renaming "lang" directory (ZPublisher gets confused 
+  because of a view with the same same in zope.traversing.namespace).
+
+(See gocept.datetimewidget for more details on how to use
+zc.datetimewidget with zope2.)
+
 0.6.1 (2008-05-29)
 ------------------
 
-Unchanged from 0.5.2, but released with a new version number thanks to a
-package with an 0.6.1dev-rBFN revision found in the wild.
+- Unchanged from 0.5.2, but released with a new version number thanks to a
+  package with an 0.6.1dev-rBFN revision found in the wild.
 
 0.5.2 (2007-11-03)
 ------------------

Modified: zc.datetimewidget/trunk/setup.py
===================================================================
--- zc.datetimewidget/trunk/setup.py	2009-05-20 08:41:45 UTC (rev 100168)
+++ zc.datetimewidget/trunk/setup.py	2009-05-20 09:14:48 UTC (rev 100169)
@@ -59,6 +59,7 @@
                 'zope.app.securitypolicy',
                 'zope.app.authentication',
                 'zope.app.server',
+                'zope.app.testing',
                 'zope.securitypolicy',
                 'zope.testbrowser',
                 'zope.testing',

Modified: zc.datetimewidget/trunk/src/zc/datetimewidget/configure.zcml
===================================================================
--- zc.datetimewidget/trunk/src/zc/datetimewidget/configure.zcml	2009-05-20 08:41:45 UTC (rev 100168)
+++ zc.datetimewidget/trunk/src/zc/datetimewidget/configure.zcml	2009-05-20 09:14:48 UTC (rev 100169)
@@ -9,7 +9,7 @@
     <directory
         source="resources"
         include="calendar-system.css calendar.js datetimewidget.js
-                 lang/calendar-en.js
+                 languages/calendar-en.js
                  calendar-setup.js"/>
   </resourceLibrary>
 

Modified: zc.datetimewidget/trunk/src/zc/datetimewidget/datetimewidget.py
===================================================================
--- zc.datetimewidget/trunk/src/zc/datetimewidget/datetimewidget.py	2009-05-20 08:41:45 UTC (rev 100168)
+++ zc.datetimewidget/trunk/src/zc/datetimewidget/datetimewidget.py	2009-05-20 09:14:48 UTC (rev 100169)
@@ -35,7 +35,7 @@
 # initialize the language files
 LANGS = []
 for langFile in glob.glob(
-    os.path.join(os.path.dirname(__file__),'resources','lang') + '/calendar-??.js'):
+    os.path.join(os.path.dirname(__file__),'resources','languages') + '/calendar-??.js'):
     LANGS.append(os.path.basename(langFile)[9:11])
 
 def normalizeDateTime(dt, request):
@@ -269,7 +269,8 @@
             # en is always loaded via the resourcelibrary, so that all
             # variables are defined in js
             # TODO: do not hardcode this
-            langFile = '/@@/zc.datetimewidget/lang/calendar-%s.js' % lang
+            langFile = '/++resource++zc.datetimewidget/'\
+                    'languages/calendar-%s.js' % lang
             langDef = "dateTimeWidgetLoadLanguageFile('%s');" % langFile
         else:
             langDef = ''


Property changes on: zc.datetimewidget/trunk/src/zc/datetimewidget/resources/languages
___________________________________________________________________
Added: svn:mergeinfo
   +