deny attributes being both part of tal:attributes

and having a messageid in i18n:attributes

lib/python/TAL/TALGenerator.py

@@ -664,6 +664,11 @@ class TALGenerator:
             # Convert repldict's name-->expr mapping to a
             # name-->(compiled_expr, translate) mapping
             for key, value in repldict.items():
+                if i18nattrs.get(key, None):
+                    raise I18NError(
+                      ("attribute [%s] cannot both be part of tal:attributes" +
+                      " and have a msgid in i18n:attributes") % key,
+                    position)
                 ce = self.compileExpression(value)
                 repldict[key] = ce, key in i18nattrs, i18nattrs.get(key)
             for key in i18nattrs:

lib/python/TAL/tests/input/test19.html

+<input name="Delete"
+       tal:attributes="name string:delete_button"
+       i18n:attributes="name">
+
+<input name="Delete"
+       i18n:attributes="name message-id">
+
+<input i18n:attributes=" name message-id;
+                         attr input-attr ">

lib/python/TAL/tests/input/test20.html

+<input name="Delete" i18n:attributes="name">

lib/python/TAL/tests/output/test19.html

+<input name="DELETE_BUTTON">
+
+<input name="MESSAGE-ID">
+
+<input name="MESSAGE-ID" attr="INPUT-ATTR">

lib/python/TAL/tests/output/test20.html

+<input name="DELETE">

lib/python/TAL/tests/test_htmltalparser.py

@@ -511,6 +511,9 @@ class TALGeneratorTestCases(TestCaseBase):
               ('bar', None, 'insert', None, 1, None)])),
             ('endScope', ()),
             ])
+        self._should_error('''<input name="Delete"
+            tal:attributes="name string:delete_button"
+            i18n:attributes="name message-id">''')
 
     def test_i18n_name_bad_name(self):
         self._should_error("<span i18n:name='not a valid name' />")