code tidy and intllib update

2017-03-17 10:05:42 +00:00
parent 3b5e728b7d
commit 8dea715303
2 changed files with 64 additions and 73 deletions
@@ -23,20 +23,12 @@ local S
 if minetest.get_modpath("intllib") then
 	S = intllib.Getter()
 else
-	S = function(s, a, ...)
-		if a == nil then
-			return s
-		end
-		a = {a, ...}
-		return s:gsub("(@?)@(%(?)(%d+)(%)?)",
-			function(e, o, n, c)
-				if e == ""then
-					return a[tonumber(n)] .. (o == "" and c or "")
-				else
-					return "@" .. o .. n .. c
-				end
-			end)
-		end
+	S = function(s, a, ...) a = {a, ...}
+		return s:gsub("@(%d+)", function(n)
+			return a[tonumber(n)]
+		end)
+	end
+
 end
 protector.intllib = S