[Checkins] SVN: zc.datetimewidget/branches/nilo_z2_compatibility/ branch adding z2 compatibility:

[Daniel Havlik]

Log message for revision 100160:
  branch adding z2 compatibility:
   - 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
  
  

Changed:
  A   zc.datetimewidget/branches/nilo_z2_compatibility/
  U   zc.datetimewidget/branches/nilo_z2_compatibility/setup.py
  U   zc.datetimewidget/branches/nilo_z2_compatibility/src/zc/datetimewidget/configure.zcml
  U   zc.datetimewidget/branches/nilo_z2_compatibility/src/zc/datetimewidget/datetimewidget.py
  D   zc.datetimewidget/branches/nilo_z2_compatibility/src/zc/datetimewidget/resources/lang/
  A   zc.datetimewidget/branches/nilo_z2_compatibility/src/zc/datetimewidget/resources/languages/

-=-
Modified: zc.datetimewidget/branches/nilo_z2_compatibility/setup.py
===================================================================
--- zc.datetimewidget/trunk/setup.py	2009-05-19 06:57:43 UTC (rev 100122)
+++ zc.datetimewidget/branches/nilo_z2_compatibility/setup.py	2009-05-20 08:24:08 UTC (rev 100160)
@@ -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/branches/nilo_z2_compatibility/src/zc/datetimewidget/configure.zcml
===================================================================
--- zc.datetimewidget/trunk/src/zc/datetimewidget/configure.zcml	2009-05-19 06:57:43 UTC (rev 100122)
+++ zc.datetimewidget/branches/nilo_z2_compatibility/src/zc/datetimewidget/configure.zcml	2009-05-20 08:24:08 UTC (rev 100160)
@@ -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/branches/nilo_z2_compatibility/src/zc/datetimewidget/datetimewidget.py
===================================================================
--- zc.datetimewidget/trunk/src/zc/datetimewidget/datetimewidget.py	2009-05-19 06:57:43 UTC (rev 100122)
+++ zc.datetimewidget/branches/nilo_z2_compatibility/src/zc/datetimewidget/datetimewidget.py	2009-05-20 08:24:08 UTC (rev 100160)
@@ -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/branches/nilo_z2_compatibility/src/zc/datetimewidget/resources/languages
___________________________________________________________________
Added: svn:mergeinfo
   +