Changeset 7702

Timestamp:

25 Feb 2012, 10:21:54 (13 years ago)

Author:

Henrik Bettermann

Message:

Internationalize ReSTDisplayWidget which now returns a dictionary with different tranlations.

Different languages must be separated by <<xy>> whereas
xy is the language code. Text parts without correct leading
language separator - usually the first part has no language
descriptor - are interpreted as texts in the portal's language.
The latter can be configured in waeup.srp.utils.utils.SIRPUtils.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/pages.py (modified) (4 diffs)
• browser/static/waeup-base.css (modified) (1 diff)
• frontpage.rst (modified) (1 diff)
• interfaces.py (modified) (3 diffs)
• widgets/restwidget.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -292 +292 @@
     @property
     def frontpage(self):
-        return self.context['configuration'].frontpage_html
+        portal_language = getUtility(ISIRPUtils).PORTAL_LANGUAGE
+        lang = self.request.cookies.get('sirp.language', portal_language)
+        return self.context['configuration'].frontpage_dict.get(lang,'')
 
 class AdministrationPage(SIRPPage):
@@ -623 +625 @@
         _('Add session configuration'),
         _('Remove selected')]
-
-    form_fields = grok.AutoFields(IConfigurationContainer)
-    form_fields['frontpage_html'].for_display = True
+    form_fields = grok.AutoFields(IConfigurationContainer).omit('frontpage_dict')
 
     def update(self):
@@ -638 +638 @@
         return super(ConfigurationContainerManageFormPage, self).update()
 
-    def frontpage(self):
+    def _frontpage(self):
         view = ConfigurationContainerDisplayFormPage(
             self.context,self.request)
@@ -647 +647 @@
     def save(self, **data):
         self.applyData(self.context, **data)
-        self.context.frontpage_html = self.frontpage()
+        self.context.frontpage_dict = self._frontpage()
         self.flash(_('Settings have been saved.'))
         return

main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css

@@ -104 +104 @@
 }
 
+textarea {
+  font-family: Courier, "Courier New", monospace;
+}
+
  /* IE doesn't like the footer tag*/
 .footer {

main/waeup.sirp/trunk/src/waeup/sirp/frontpage.rst

@@ -30 +30 @@
 
 Text
+
+>>de<<
+Dies ist die Standard-Startseite des Portals. Sie wurde in der Markup-Sprache
+`reStructuredText (reST) <http://docutils.sourceforge.net/docs/user/rst/quickref.html>`_
+geschrieben.
+
+Weitere reST-Beispiele zur Einführung:
+
+1. Überschrift
+==============
+
+Text
+
+1.2 Überschrift
+---------------
+
+Text
+
+2. Überschrift
+==============
+
+Text
+
+2.1 Überschrift
+---------------
+
+Text
+
+2.2 Überschrift
+---------------
+
+Text

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

@@ -18 +18 @@
 import os
 import re
+import codecs
 import zope.i18nmessageid
 from datetime import datetime
@@ -44 +45 @@
 VALIDATED = 'courses validated'
 
-default_frontpage = u'' + open(os.path.join(
-        os.path.dirname(__file__), 'frontpage.rst'), 'rb').read()
+default_frontpage = u'' + codecs.open(os.path.join(
+        os.path.dirname(__file__), 'frontpage.rst'),
+        encoding='utf-8', mode='rb').read()
 
 def SimpleSIRPVocabulary(*terms):
@@ -416 +418 @@
         )
 
-    frontpage_html = schema.Text(
-        title = u'Content in HTML format',
+    frontpage_dict = schema.Dict(
+        title = u'Content as language dictionary with values in html format',
         required = False,
+        default = {},
         )
 

main/waeup.sirp/trunk/src/waeup/sirp/widgets/restwidget.py

@@ -18 +18 @@
 """A widget that renders restructured text. 
 """
+from zope.component import getUtility
 from zope.formlib.widget import renderElement, DisplayWidget
 from waeup.sirp.utils.helpers import ReST2HTML
+from waeup.sirp.interfaces import ISIRPUtils
 
 
@@ -27 +29 @@
 
     def __call__(self):
+        """The ReSTDisplayWidget transforms a ReST text string into
+        a dictionary.
+
+        Different languages must be separated by `<<xy>>` whereas
+        xy is the language code. Text parts without correct leading
+        language separator - usually the first part has no language
+        descriptor - are interpreted as texts in the portal's language.
+        The latter can be configured in waeup.srp.utils.utils.SIRPUtils.
+        """
         if self._renderedValueSet():
             value = self._data
@@ -33 +44 @@
         if value == self.context.missing_value:
             return ""
-        return renderElement(u'div id="rest"',
-                             contents=ReST2HTML(value))
+        parts = value.split('>>')
+        elements = {}
+        lang = getUtility(ISIRPUtils).PORTAL_LANGUAGE
+        for part in parts:
+            if part[2:4] == u'<<':
+                lang = part[0:2].lower()
+                text = part[4:]
+                elements[lang] = renderElement(u'div id="rest"',
+                    contents=ReST2HTML(text))
+            else:
+                text = part
+                elements[lang] = renderElement(u'div id="rest"',
+                    contents=ReST2HTML(text))
+        return elements