appy.shared: added support for country codes (iso-3166-1) - appy.gen: non-string variables are now allowed in i18n variable replacements; bugfix while browsing translation pages with the 'next' arrows in 'edit' mode.

gen/plone25/mixins/__init__.py

@@ -1245,6 +1245,7 @@ class BaseMixin:
                 res = self.formatText(res, format)
                 # Perform variable replacements
                 for name, repl in mapping.iteritems():
+                    if not isinstance(repl, basestring): repl = str(repl)
                     res = res.replace('${%s}' % name, repl)
         return res
 

gen/plone25/skin/page.pt

@@ -563,8 +563,6 @@
         <td width="80%">
           <b class="appyTitle" tal:content="contextObj/title_or_id"></b>
         </td>
-        <td><metal:actions use-macro="here/document_actions/macros/document_actions"/>
-        </td>
       </tr>
       <tr tal:define="descrLabel python: contextObj.translate('%s_edit_descr' % contextObj.portal_type)"
           tal:condition="descrLabel/strip" align="left">

gen/plone25/wrappers/TranslationWrapper.py

@@ -22,9 +22,10 @@ class TranslationWrapper(AbstractWrapper):
         else:
             sourceMsg = getattr(sourceTranslation,fieldName)
             # When editing the value, we don't want HTML code to be interpreted.
-            # This way, the translator sees the HTML tags and can reproduce them in
-            # the translation.
-            if self.request['URL'].endswith('/skyn/edit'):
+            # This way, the translator sees the HTML tags and can reproduce them
+            # in the translation.
+            url = self.request['URL']
+            if url.endswith('/skyn/edit') or url.endswith('/skyn/do'):
                 sourceMsg = sourceMsg.replace('<','&lt;').replace('>','&gt;')
             sourceMsg = sourceMsg.replace('\n', '<br/>')
         return '<div class="translationLabel"><acronym title="%s">' \