diff --git a/config-label.villes-internet.net.xml b/config-label.villes-internet.net.xml
index f9d6169..99af59f 100644
--- a/config-label.villes-internet.net.xml
+++ b/config-label.villes-internet.net.xml
@@ -11,19 +11,26 @@
-
+
+
+
-
-
-
+
-
+
+
+
-
+
+
+
@@ -44,12 +65,4 @@
-
- localhost
- vhosts/label.villes-internet.net/
- vhosts/system/
- vhosts/abracadabra/ssl/server.crt
- vhosts/abracadabra/ssl/server.key
-
-
diff --git a/po/fr.po b/po/fr.po
index c3bc354..18b4b7c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -101,5 +101,8 @@ msgstr ""
msgid "New %s"
msgstr "Nouveau %s"
+msgid "Create"
+msgstr "Créer"
+
#~ msgid "Basic Functionalities"
#~ msgstr "Fonctionalités de base"
diff --git a/src/modules/xforms/descriptions.py b/src/modules/xforms/descriptions.py
index 1c9c832..ed4f1ad 100644
--- a/src/modules/xforms/descriptions.py
+++ b/src/modules/xforms/descriptions.py
@@ -232,19 +232,24 @@ class Control(elements.Element):
return None
labelNode = labelNodes[0]
refNodes = self.evaluateXpath("@ref", labelNode)
- if not refNodes:
- return labelNodes[0].content
- ref = refNodes[0].content
- #labelNodes = self.getValueNodes(subXpath = ref)
- valueNode = self.valueNode
- if valueNode is None:
- return None
- currentActionHandler = context.getVar("currentActionHandler")
- labelNodes = currentActionHandler.evaluateXpath(
- ref, contextNode = valueNode)
- if not labelNodes:
- return None
- return labelNodes[0].content
+ if refNodes:
+ ref = refNodes[0].content
+ #labelNodes = self.getValueNodes(subXpath = ref)
+ valueNode = self.valueNode
+ if valueNode is None:
+ return None
+ currentActionHandler = context.getVar("currentActionHandler")
+ labelNodes = currentActionHandler.evaluateXpath(
+ ref, contextNode = valueNode)
+ if not labelNodes:
+ return None
+ labelNode = labelNodes[0]
+ label = labelNode.content
+ translatable = labelNode.nsProp(
+ "translatable", "http://abracadabra.entrouvert.org/0.0")
+ if translatable in ("1", "true"):
+ label = _(label)
+ return label
def getModel(self):
modelId = self.modelId
diff --git a/vhosts/label.villes-internet.net/_files/rien-.htm b/vhosts/label.villes-internet.net/_files/rien-.htm
index a0d3c63..6b92a59 100644
--- a/vhosts/label.villes-internet.net/_files/rien-.htm
+++ b/vhosts/label.villes-internet.net/_files/rien-.htm
@@ -14,7 +14,7 @@ window.open(page,'popup','width=400,height=500,toolbar=yes,scrollbars=yes');