Imported Upstream version 20090110

[ion3.git] / ioncore / ioncore_misc.lua

diff --git a/ioncore/ioncore_misc.lua b/ioncore/ioncore_misc.lua
index dde914ecc7cef299c21ccda3e3955b9ce5c8c921..7dc63535b1c00cd31a43dd000cff177d3ba5f9b3 100644 (file)
--- a/ioncore/ioncore_misc.lua
+++ b/ioncore/ioncore_misc.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore_misc.lua
 -- 
--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.
 --
 -- See the included file LICENSE for details.
 --
@@ -22,7 +22,7 @@ local layouts={
 -- attach/creation parameters given in \var{tab}. The layout
 -- "empty" may not be defined.
 function ioncore.deflayout(name, tab)
-    assert(layout ~= "empty")
+    assert(name ~= "empty")
     
     if name=="default" and not tab then
         layouts[name] = empty
@@ -73,7 +73,7 @@ end
 --DOC
 -- gettext+string.format
 function ioncore.TR(s, ...)
-    return string.format(ioncore.gettext(s), unpack(arg))
+    return string.format(ioncore.gettext(s), ...)
 end