Module:Flags - Revision history

QuimGil: Taking changes from Moroboshi at Module:Flags/Sandbox

2013-08-22T03:50:39Z

Taking changes from Moroboshi at Module:Flags/Sandbox

QuimGil: Introducing customizable link

2013-07-06T06:21:38Z

Introducing customizable link

← Previous revision		Revision as of 06:21, 6 July 2013
Line 7:		Line 7:
	local translations = mw.loadData("Module:Flags/LocaleData")		local translations = mw.loadData("Module:Flags/LocaleData")
	local master = mw.loadData("Module:Flags/MasterData")		local master = mw.loadData("Module:Flags/MasterData")


	-- Assigning the parameter to a flag and a link		-- Assigning the parameter to a flag and a link
	function p.flag(territory)		function p.flag(territory)
Line 125:		Line 125:
	end		end

			-- Customizing the link
			openBrackets = "[["
			closeBrackets = "]]"
		⚫	if territory.args[5] == "" then
			flagLink = ""
			textLink = ""
			openBrackets = ""
			closeBrackets = ""
		⚫	elseif territory.args[5] ~= "{{{link}}}" then
		⚫	flagLink = territory.args[5]
			textLink = territory.args[5] .. "\|"
			else flagLink = link
			textLink = link .. "\|"
		⚫	end

	-- Text in addition to flag		-- Text in addition to flag
	~~text~~ = ""		if territory.args[6] == "" then
			text = " " .. openBrackets .. link .. closeBrackets
⚫	if territory.args[5] ~= "~~{{{text}}}~~" then
			elseif territory.args[6] ~= "{{{text}}}" then
⚫	~~text =~~ territory.args[5]
	if text == "" ~~then~~ ~~text~~ = ~~" [["~~ .. ~~link~~ .. ~~"]]"~~		text = " " .. openBrackets .. textLink .. territory.args[6] .. closeBrackets
	else ~~link~~ = ~~text~~		else text = ""
⚫	~~text~~ = ~~" [[" ..~~ territory.args[5] ~~.. "]]"~~
⚫	end
	end		end

	return '[[File:' .. flagOf .. commonsName .. '.svg\|' .. border .. 'link=' .. ~~link~~ .. '\|'.. size .. ']]' .. text		return '[[File:' .. flagOf .. commonsName .. '.svg\|' .. border .. 'link=' .. flagLink .. '\|'.. size .. ']]' .. text
	end		end
	return p		return p

QuimGil: Supporting text= aka possibility to add a text and define the link

2013-07-04T00:33:40Z

Supporting text= aka possibility to add a text and define the link

← Previous revision		Revision as of 00:33, 4 July 2013
Line 123:		Line 123:
	else		else
	size = defaultSize(commonsName)		size = defaultSize(commonsName)
			end

			-- Text in addition to flag
			text = ""
			if territory.args[5] ~= "{{{text}}}" then
			text = territory.args[5]
			if text == "" then text = " [[" .. link .. "]]"
			else link = text
			text = " [[" .. territory.args[5] .. "]]"
			end
	end		end

	return '[[File:' .. flagOf .. commonsName .. '.svg\|' .. border .. 'link=' .. link .. '\|'.. size .. ']]'		return '[[File:' .. flagOf .. commonsName .. '.svg\|' .. border .. 'link=' .. link .. '\|'.. size .. ']]' .. text
	end		end
	return p		return p

QuimGil: Now 2 and 3 letter codes link to proper article, looking first to Locale, otherwise defaulting to English from Master.

2013-06-29T01:56:00Z

Now 2 and 3 letter codes link to proper article, looking first to Locale, otherwise defaulting to English from Master.

← Previous revision		Revision as of 01:56, 29 June 2013
Line 17:		Line 17:
	if flagParameter == territory.args[1] then		if flagParameter == territory.args[1] then
	commonsName = commonsFile		commonsName = commonsFile
			tempLink = commonsFile
			end
			end
			for flagParameter,commonsFile in pairs(translations.fullName) do
			if commonsFile == tempLink then
	link = flagParameter		link = flagParameter
			end
	end -- FIXME this link is problematic, especially in non-English
	end		end
			if link == nil then link = commonsName
			end
	end		end

Line 27:		Line 34:
	if flagParameter == territory.args[1] then		if flagParameter == territory.args[1] then
	commonsName = commonsFile		commonsName = commonsFile
			tempLink = commonsFile
			end
			end
			for flagParameter,commonsFile in pairs(translations.fullName) do
			if commonsFile == tempLink then
	link = flagParameter		link = flagParameter
			end
	end -- FIXME this link is problematic, especially in non-English
	end		end
			if link == nil then link = commonsName
			end
	end		end

QuimGil: Linking to modules out of sandbox.

2013-06-25T21:56:51Z

Linking to modules out of sandbox.

← Previous revision		Revision as of 21:56, 25 June 2013
Line 5:		Line 5:

	-- Loading the flag translations module --		-- Loading the flag translations module --
	local translations = mw.loadData("Module:~~Sandbox~~/~~QuimGil/FlagTranslations~~")		local translations = mw.loadData("Module:Flags/LocaleData")
	local master = mw.loadData("Module:~~Sandbox~~/~~QuimGil/FlagMaster~~")		local master = mw.loadData("Module:Flags/MasterData")

	-- Assigning the parameter to a flag and a link		-- Assigning the parameter to a flag and a link

QuimGil: QuimGil moved page Module:Sandbox/QuimGil/Flags to Module:Flags without leaving a redirect: Out of sandbox.

2013-06-25T21:44:22Z

QuimGil moved page Module:Sandbox/QuimGil/Flags to Module:Flags without leaving a redirect: Out of sandbox.

← Previous revision	Revision as of 21:44, 25 June 2013
(No difference)

QuimGil: Localized variants broke with the last change. Fixing.

2013-06-25T06:04:12Z

Localized variants broke with the last change. Fixing.

← Previous revision		Revision as of 06:04, 25 June 2013
Line 58:		Line 58:
	if territory.args[3] ~= "" then		if territory.args[3] ~= "" then
	variant = territory.args[3]		variant = territory.args[3]
	commonsName = master.variant[~~territory.args[1]~~ .. "\|" .. variant]		commonsName = master.variant[commonsName .. "\|" .. variant]
	flagOf=""		flagOf=""
	end		end
Line 65:		Line 65:
	if territory.args[2] ~= "{{{2}}}" then		if territory.args[2] ~= "{{{2}}}" then
	variant = territory.args[2]		variant = territory.args[2]
	commonsName = master.variant[~~territory.args[1]~~ .. "\|" .. variant]		commonsName = master.variant[commonsName .. "\|" .. variant]
	flagOf = ""		flagOf = ""
	end		end

QuimGil: Now any type of file names are accepted in tables - as long as they are .svg (minimum acceptable?)

2013-06-25T05:52:47Z

Now any type of file names are accepted in tables - as long as they are .svg (minimum acceptable?)

← Previous revision		Revision as of 05:52, 25 June 2013
Line 31:		Line 31:
	end		end
	end		end


	-- Searching in FlagTranslations, then in FlagMaster		-- Searching in FlagTranslations, then in FlagMaster
	-- Full name search		-- Full name search
Line 48:		Line 48:
	end		end
	end		end


	-- Fallback to Commons when the parameter doesn't have an entry in the table.		-- Fallback to Commons when the parameter doesn't have an entry in the table.
	if commonsName == nil then		if commonsName == nil then
Line 58:		Line 58:
	if territory.args[3] ~= "" then		if territory.args[3] ~= "" then
	variant = territory.args[3]		variant = territory.args[3]
	commonsName = master.variant[~~commonsName~~ .. "\|" .. variant]		commonsName = master.variant[territory.args[1] .. "\|" .. variant]
	flagOf=""		flagOf=""
	end		end
Line 65:		Line 65:
	if territory.args[2] ~= "{{{2}}}" then		if territory.args[2] ~= "{{{2}}}" then
	variant = territory.args[2]		variant = territory.args[2]
	commonsName = master.variant[~~commonsName~~ .. "\|" .. variant]		commonsName = master.variant[territory.args[1] .. "\|" .. variant]
	flagOf = ""		flagOf = ""
	end		end

			-- Digesting Commons flag files not following the format "Flag of "
			-- These filenamess must be preceded by "File:" in the table values.

			if commonsName ~= nil and string.find( commonsName, "File:", 1 ) == 1 then
			commonsName = string.sub( commonsName, 6)
			flagOf = ""
			end

	-- Fallback for non-identified variant/label flags --		-- Fallback for non-identified variant/label flags --

QuimGil: Removing obsolete code and sorting border exception conditional

2013-06-25T04:56:12Z

Removing obsolete code and sorting border exception conditional

@@ Line 48: / Line 48: @@
         end
     end
 -- Fallback to Commons when the parameter doesn't have an entry in the table.
@@ Line 58: / Line 53: @@
         commonsName = territory.args[1]
         link = territory.args[1]
     end
@@ Line 85: / Line 73: @@
         commonsName = "Flag of None"
     end
 -- Size of flag --

QuimGil: Doh, no need for 2 & 3 letter code flags to enter the loop for fullName search.

2013-06-25T04:50:48Z

Doh, no need for 2 & 3 letter code flags to enter the loop for fullName search.

← Previous revision		Revision as of 04:50, 25 June 2013
Line 34:		Line 34:
	-- Searching in FlagTranslations, then in FlagMaster		-- Searching in FlagTranslations, then in FlagMaster
	-- Full name search		-- Full name search
	flagTables = { translations.fullName, master.fullName, }		if commonsName == nil then
			flagTables = { translations.fullName, master.fullName, }
	for k,v in ipairs(flagTables) do		for k,v in ipairs(flagTables) do
	for flagParameter,commonsFile in pairs(v) do		for flagParameter,commonsFile in pairs(v) do
	if flagParameter == territory.args[1] then		if flagParameter == territory.args[1] then
	commonsName = commonsFile		commonsName = commonsFile
	link = flagParameter		link = flagParameter
	elseif commonsFile == territory.args[1] then		elseif commonsFile == territory.args[1] then
	commonsName = commonsFile		commonsName = commonsFile
	link = flagParameter		link = flagParameter
			end
	end		end
	end		end
	end		end

	-- In the absence of translation for an existing entry, links to the english/original name --		-- In the absence of translation for an existing entry, links to the english/original name --