Changeset 42572c in indico for indico/MaKaC/webinterface/pages/conferences.py

Timestamp:

03/26/10 09:04:56 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

afe4553

Parents:

550acf

git-author:

Jose Benito <jose.benito.gonzalez@…> (03/26/10 09:03:16)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (03/26/10 09:04:56)

Message:

[FIX] i18n problems with poster creation

All the items (elements inside a poster) were storing
their name (translated or not) in the DB. Now, we use
a key and a dictionary JS in order to translate the
names.

File:

• indico/MaKaC/webinterface/pages/conferences.py (modified) (7 diffs)

indico/MaKaC/webinterface/pages/conferences.py

@@ -12128 +12128 @@
         vars["loadingIconURL"]=quoteattr(str(Config.getInstance().getSystemIconURL("loading")))
         vars["templateId"]=self.__templateId
+
+        badgeDesignConfiguration = BadgeDesignConfiguration()
         from MaKaC.services.interface.rpc.json import encode as jsonEncode
-        vars["translateName"]= jsonEncode(dict([(key, value[0]) for key, value in BadgeDesignConfiguration().items_actions.iteritems()]))
+        vars["translateName"]= jsonEncode(dict([(key, value[0]) for key, value in badgeDesignConfiguration.items_actions.iteritems()]))
 
         cases = []
-        badgeDesignConfiguration = BadgeDesignConfiguration()
         for itemKey in badgeDesignConfiguration.items_actions.keys():
             case = []
@@ -12191 +12192 @@
             vars["editingTemplate"]="true"
 
-            from MaKaC.services.interface.rpc.json import encode as jsonEncode
             templateDataString = jsonEncode(self.__conf.getBadgeTemplateManager().getTemplateData(self.__templateId))
             vars["templateData"]= templateDataString
@@ -12428 +12428 @@
         vars["templateId"]=self.__templateId
 
+        posterDesignConfiguration = PosterDesignConfiguration()
+        from MaKaC.services.interface.rpc.json import encode as jsonEncode
+        vars["translateName"]= jsonEncode(dict([(key, value[0]) for key, value in posterDesignConfiguration.items_actions.iteritems()]))
+
+
         cases = []
-        for itemName in PosterDesignConfiguration().items_actions.keys():
+        for itemKey in posterDesignConfiguration.items_actions.keys():
             case = []
             case.append('case "')
-            case.append(itemName)
+            case.append(itemKey)
             case.append('":')
             case.append('\n')
             case.append('items[itemId] = new Item(itemId, "')
-            case.append(itemName)
+            case.append(itemKey)
             case.append('");')
             case.append('\n')
@@ -12447 +12452 @@
 
         optgroups = []
-        for optgroupName, options in PosterDesignConfiguration().groups:
+        for optgroupName, options in posterDesignConfiguration.groups:
             optgroup = []
             optgroup.append('<optgroup label="')
@@ -12454 +12459 @@
             optgroup.append('\n')
             for optionName in options:
-                optgroup.append('<option>')
-                optgroup.append(optionName)
+                optgroup.append('<option value="%s">'%optionName)
+                optgroup.append(posterDesignConfiguration.items_actions[optionName][0])
                 optgroup.append('</option>')
                 optgroup.append('\n')
@@ -12481 +12486 @@
             vars["backgroundId"]=-1
             vars["backgroundPos"]="Stretch"
-            vars["templateData"] == "''"
+            vars["templateData"] = "''"
             vars["editingTemplate"]="false"
 
@@ -12489 +12494 @@
             vars["titleMessage"]= _("Editing poster template")
             vars["editingTemplate"]="true"
-            from MaKaC.services.interface.rpc.json import encode as jsonEncode
             templateDataString = jsonEncode(self.__conf.getPosterTemplateManager().getTemplateData(self.__templateId))
             vars["templateData"]=quoteattr(templateDataString)