Модуль:Entity Lookup: различия между версиями

@@ Строка 13: / Строка 13: @@
 local function buildName(entity, useSuffix)
 	local name = entity.name or ""
-	local label = mw.text.trim(entity.label or ""):lower()
+	local label = mw.ustring.lower(entity.label or "")
 	local suffix = ""
 	if useSuffix then
-		local rawSuffix = entity.suffix
+		suffix = mw.ustring.lower(entity.suffix or "")
-		if rawSuffix and mw.text.trim(rawSuffix) ~= "" then
+		if suffix ~= "" then
 			local parts = {}
-			for part in tostring(rawSuffix):gmatch("[^,;]+") do
+			for part in tostring(suffix):gmatch("[^,;]+") do
 				part = mw.text.trim(part)
 				if part ~= "" then
@@ Строка 26: / Строка 27: @@
 				end
 			end
-			if #parts > 0 then
+			suffix = table.concat(parts, ", ")
-				suffix = string.lower(table.concat(parts, ", "))
-			end
 		end
 	end
@@ Строка 57: / Строка 56: @@
 	local override = p.name_overrides[id]
 	if override then
-		return override
+		return lower(override)
 	end
@@ Строка 65: / Строка 64: @@
 	end
-	local useSuffix = frame.args and frame.args.suffix and mw.text.trim(frame.args.suffix) ~= ""
+	local useSuffix = frame.args and frame.args.suffix and frame.args.suffix ~= ""
 	return buildName(entity, useSuffix)
 end