Changeset 7695

Timestamp:

23 Feb 2012, 17:48:43 (13 years ago)

Author:

Henrik Bettermann

Message:

Upgrade custom package and add internationalization.

I also added dolmen.beaker but I'm not sure if I did it right.

Location:

main/waeup.custom/trunk

Files:

• buildout.cfg (modified) (5 diffs)
• setup.py (modified) (2 diffs)
• src/waeup/custom/browser/theming.py (modified) (2 diffs)
• src/waeup/custom/configure.zcml (modified) (1 diff)
• src/waeup/custom/interfaces.py (modified) (3 diffs)
• src/waeup/custom/utils/utils.py (modified) (1 diff)

main/waeup.custom/trunk/buildout.cfg

@@ -54 +54 @@
 zope.xmlpickle = 3.4.0
 # Require latest version...
-Sphinx =
+Sphinx = 1.0.7
 ZODB3 = 3.10.3
 docutils = 0.7
@@ -62 +62 @@
 # This creates all scripts in bin/. The sirpctl created here is 'faulty'.
 recipe = zc.recipe.egg
-eggs = waeup.custom
+eggs = waeup.custom [beaker]
        z3c.evalexception>=2.0
        Paste
@@ -74 +74 @@
 # fixed path to zdaemon.conf as argument.
 recipe = zc.recipe.egg
-eggs = waeup.custom
+eggs = waeup.custom [beaker]
 arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
 scripts = sirpctl=sirpctl
@@ -89 +89 @@
 [test]
 recipe = zc.recipe.testrunner
-eggs = waeup.custom [test]
+eggs = waeup.custom [beaker, test]
 defaults = ['--tests-pattern', '^f?tests$', '-v']
 
-# this section named so that the i18n scripts are called bin/i18n...
+# This section named so that the i18n scripts are called bin/i18n...
 [i18n]
 recipe = z3c.recipe.i18n:i18n
@@ -164 +164 @@
 [coverage-detect]
 recipe = zc.recipe.testrunner
-eggs = waeup.custom
+eggs = waeup.custom[beaker]
 defaults = ['--tests-pattern', '^f?tests$', '-v', '--coverage', 'coverage']
 

main/waeup.custom/trunk/setup.py

@@ -11 +11 @@
     'waeup.sirp',
     ],
+
+# Having beaker installed additionally is a feature very recommended
+# for production use. The default buildout includes beaker for tests,
+# start scripts, and other parts that can benefit from it. The windows
+# buildout does not include it due to compiling problems with the
+# beaker package.
+beaker_require = [
+    'dolmen.beaker',
+    ]
 
 tests_require = [
@@ -75 +84 @@
         test = tests_require,
         docs = docs_require,
+        beaker = beaker_require,
         ),
       entry_points="""

main/waeup.custom/trunk/src/waeup/custom/browser/theming.py

@@ -20 +20 @@
 from waeup.custom.browser.resources import custom_theme_1
 
+from waeup.custom.interfaces import MessageFactory as _
+
 class CustomTheme1(grok.GlobalUtility):
     """A custom theme based on the SIRP base theme.
@@ -26 +28 @@
     grok.name('custom theme 1')
 
-    description = u'Custom Theme 1'
+    description = _(u'Custom Theme 1')
 
     def getResources(self):

main/waeup.custom/trunk/src/waeup/custom/configure.zcml

@@ -1 +1 @@
 <configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:grok="http://namespaces.zope.org/grok">
+           xmlns:grok="http://namespaces.zope.org/grok"
+           xmlns:i18n="http://namespaces.zope.org/i18n">
   <include package="grok" />
+  <i18n:registerTranslations directory="locales" />
   <includeOverrides package="waeup.custom" file="overrides.zcml" />
 </configure>

main/waeup.custom/trunk/src/waeup/custom/interfaces.py

@@ -16 +16 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
+
+import zope.i18nmessageid
 from zope import schema
 from waeup.sirp.interfaces import (
     ISessionConfiguration, academic_sessions_vocab)
+
+_ = MessageFactory = zope.i18nmessageid.MessageFactory('waeup.custom')
 
 # It's recommended to replicate all fields from the base package here.
@@ -26 +30 @@
 
     school_fee_base = schema.Int(
-        title = u'School Fee (ignored)',
+        title = _(u'School Fee (ignored)'),
         default = 0,
         )
 
     surcharge_1 = schema.Int(
-        title = u'Surcharge BT',
+        title = _(u'Surcharge BT'),
         default = 0,
         )
 
     surcharge_2 = schema.Int(
-        title = u'Surcharge Interswitch',
+        title = _(u'Surcharge Interswitch'),
         default = 0,
         )
 
     surcharge_3 = schema.Int(
-        title = u'Surcharge 3',
+        title = _(u'Surcharge 3'),
         default = 0,
         )
 
     clearance = schema.Int(
-        title = u'Clearance Fee',
+        title = _(u'Clearance Fee'),
         default = 0,
         )
 
     booking_fee = schema.Int(
-        title = u'Booking Fee',
+        title = _(u'Booking Fee'),
         default = 0,
         )
 
     maint_fee = schema.Int(
-        title = u'Maintenance Fee',
+        title = _(u'Maintenance Fee'),
         default = 0,
         )
 
     gown = schema.Int(
-        title = u'Gown Fee',
+        title = _(u'Gown Fee'),
         default = 0,
         )
 
     transfer = schema.Int(
-        title = u'Transfer Fee',
+        title = _(u'Transfer Fee'),
         default = 0,
         )
@@ -80 +84 @@
 
     academic_session = schema.Choice(
-        title = u'Academic Session',
+        title = _(u'Academic Session'),
         source = academic_sessions_vocab,
         default = None,

main/waeup.custom/trunk/src/waeup/custom/utils/utils.py

@@ -25 +25 @@
     """A collection of methods subject to customization.
     """
+    PORTAL_LANGUAGE = 'en'