Changeset 88f40b in indico

Timestamp:

02/22/11 15:46:35 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

0186b2

Parents:

2f8f40

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (02/21/11 11:31:51)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/22/11 15:46:35)

Message:

[FIX] Use i18n for regform personal data labels

• fixes #664

Location:

indico/MaKaC

Files:

• registration.py (modified) (1 diff)
• webinterface/pages/registrationForm.py (modified) (1 diff)

indico/MaKaC/registration.py

@@ -2683 +2683 @@
         self._data = PersistentMapping()
         self._sortedKeys = PersistentList()
-        p = PersonalDataFormItem({'id':'title', 'name': _("Title"), 'input':'list', 'mandatory':False})
+        p = PersonalDataFormItem({'id':'title', 'name': "Title", 'input':'list', 'mandatory':False})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'firstName', 'name': _("First Name"), 'input':'text', 'mandatory':True})
+        p = PersonalDataFormItem({'id':'firstName', 'name': "First Name", 'input':'text', 'mandatory':True})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'surname', 'name': _("Surname"), 'input':'text', 'mandatory':True})
+        p = PersonalDataFormItem({'id':'surname', 'name': "Surname", 'input':'text', 'mandatory':True})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'position', 'name': _("Position"), 'input':'text', 'mandatory':False})
+        p = PersonalDataFormItem({'id':'position', 'name': "Position", 'input':'text', 'mandatory':False})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'institution', 'name': _("Institution"), 'input':'text', 'mandatory':True})
+        p = PersonalDataFormItem({'id':'institution', 'name': "Institution", 'input':'text', 'mandatory':True})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'address', 'name': _("Address"), 'input':'text', 'mandatory':False})
+        p = PersonalDataFormItem({'id':'address', 'name': "Address", 'input':'text', 'mandatory':False})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'city', 'name': _("City"), 'input':'text', 'mandatory':True})
+        p = PersonalDataFormItem({'id':'city', 'name': "City", 'input':'text', 'mandatory':True})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'country', 'name': _("Country/Region"), 'input':'list', 'mandatory':True})
+        p = PersonalDataFormItem({'id':'country', 'name': "Country/Region", 'input':'list', 'mandatory':True})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'phone', 'name': _("Phone"), 'input':'text', 'mandatory':False})
+        p = PersonalDataFormItem({'id':'phone', 'name': "Phone", 'input':'text', 'mandatory':False})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'fax', 'name': _("Fax"), 'input':'text', 'mandatory':False})
+        p = PersonalDataFormItem({'id':'fax', 'name': "Fax", 'input':'text', 'mandatory':False})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'email', 'name': _("Email"), 'input':'hidden', 'mandatory':True})
+        p = PersonalDataFormItem({'id':'email', 'name': "Email", 'input':'hidden', 'mandatory':True})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())
-        p = PersonalDataFormItem({'id':'personalHomepage', 'name': _("Personal homepage"), 'input':'text', 'mandatory':False})
+        p = PersonalDataFormItem({'id':'personalHomepage', 'name': "Personal homepage", 'input':'text', 'mandatory':False})
         self._data[p.getId()] = p
         self._sortedKeys.append(p.getId())

indico/MaKaC/webinterface/pages/registrationForm.py

@@ -1721 +1721 @@
                     <td width="100%%" align="left">%s</td>
                 </tr>
-                """%(mandatory, item.getName(), inputHTML)
+                """%(mandatory, _(item.getName()), inputHTML)
         return html