X-Git-Url: http://git.cyclocoop.org/?p=ptitvelo%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fecrire%2Fpublic%2Fcompiler.php;h=48ae4bae302fe43ef25934085873318b6116d60e;hp=b1586739d70ceee9a181987e1727db2c57f0b901;hb=b97874b04ea8ca43d21b7ef7309feff8ef0e4a07;hpb=92c7d7f7bccb9629bb7c81b9582b56b61c3f8ec9

diff --git a/www/ecrire/public/compiler.php b/www/ecrire/public/compiler.php
index b158673..48ae4ba 100644
--- a/www/ecrire/public/compiler.php
+++ b/www/ecrire/public/compiler.php
@@ -867,11 +867,28 @@ function compile_cas($tableau, $descr, &$boucles, $id_boucle) {
 
 		case 'idiome':
 			$l = array();
+			$code = '';
 			foreach ($p->arg as $k => $v) {
-			  if ($k) $l[]= _q($k).' => '.calculer_liste($v,$p->descr,$boucles,$id_boucle);
+			  	$_v = calculer_liste($v, $descr, $boucles, $id_boucle);
+				if ($k) {
+					$l[] = _q($k) . ' => ' . $_v;
+				} else {
+					$code = $_v;
+				}
+			}
+			// Si le module n'est pas fourni, l'expliciter sauf si calculé
+			if ($p->module) {
+				$m = $p->module .':'.$p->nom_champ;
+			} elseif ($p->nom_champ) {
+				$m = MODULES_IDIOMES .':'.$p->nom_champ;
+			} else {
+				$m = '';
 			}
-			$l = !$l ? '' : (", array(".implode(",\n",$l).")");
-			$code = "_T('" . $p->module . ":" .$p->nom_champ . "'$l)";
+			$code = (!$code ? "'$m'" :
+						($m ? "'$m' . $code" :
+							("(strpos(\$x=$code, ':') ? \$x : ('" . MODULES_IDIOMES . ":' . \$x))")))
+					. (!$l ? '' : (", array(" . implode(",\n", $l) . ")"));
+			$code = "_T($code)";
 			if ($p->param) {
 				$p->id_boucle = $id_boucle;
 				$p->boucles = &$boucles;