Module:ISO 3166: Difference between revisions

Jump to navigation Jump to search
Content added Content deleted
(Output nil instead of "" if error=empty in Lua functions)
(Display name options)
Line 74: Line 74:
--3166-1 alpha-2 code
--3166-1 alpha-2 code
if data[code1] then
if data[code1] then
return args.isoname and data[code1]["isoname"] or data[code1]["name"]
return args.isoname and (data[code1]["isodisplayname"] or data[code1]["isoname"])
or (data[code1]["displayname"] or data[code1]["name"])
else
else
return cerror(eot,"Unknown ISO 3166-1 code "..code1,code1)
return cerror(eot,"Unknown ISO 3166-1 code "..code1,code1)
Line 87: Line 88:
end
end
if sdata[code2] then
if sdata[code2] then
return args.isoname and sdata[code2]["isoname"] or sdata[code2]["name"]
return args.isoname and (sdata[code2]["isodisplayname"] or sdata[code2]["isoname"])
or (sdata[code2]["displayname"] or sdata[code2]["name"])
else
else
for _,_ in pairs(sdata) do
for _,_ in pairs(sdata) do
Line 100: Line 102:
for alpha2,cdata in pairs(data) do
for alpha2,cdata in pairs(data) do
if cdata[codetype]==code1 then
if cdata[codetype]==code1 then
return args.isoname and cdata["isoname"] or cdata["name"]
return args.isoname and (cdata["isodisplayname"] or cdata["isoname"])
or (cdata["displayname"] or cdata["name"])
end
end
end
end