Module:BuildingLink - Revision history

76561197969631737: Updated to new data model!

2024-10-30T01:43:46Z

Updated to new data model!

← Older revision		Revision as of 01:43, 30 October 2024
Line 6:		Line 6:
	--region Dependencies		--region Dependencies

	~~-- This module lazily loads dependencies, since they're expensive but only one is needed, we just don't know which in advance.~~		local BuildingDataProxy = require("Module:BuildingDataProxy")
	local ~~WorkshopsData~~
	~~local InstitutionsData~~
	~~local FarmsData~~
	~~local CampsData~~
	~~local CollectorsData~~

	local VIEW_TEMPLATE = "Building_link/view"		local VIEW_TEMPLATE = "Building_link/view"
Line 60:		Line 55:
	local function validateBuildingName(name)		local function validateBuildingName(name)

	~~-- Lazy-load of external data, since it's expensive. Start with the most likely so that most pages load as fast as possible~~.		local id = BuildingDataProxy.getID(name)
	~~WorkshopsData = require~~("~~Module~~:~~WorkshopsData~~")		if not id then
	local validatedIcon = ~~tryData~~(~~name, WorkshopsData~~)		error("No building found with name: " .. name .. ". Please see the template documentation for how to use the parameters")
			end

			local validatedIcon = BuildingDataProxy.getIcon(id)
	if not validatedIcon then		if not validatedIcon then
	~~InstitutionsData = require~~("~~Module:InstitutionsData")~~		error("Could not validate building with name: " .. name .. ". Please see the template documentation for how to use the parameters")
	~~validatedIcon = tryData(name, InstitutionsData)~~
	if not ~~validatedIcon then~~
	~~FarmsData = require("Module:FarmsData")~~
	~~validatedIcon = tryData(name, FarmsData)~~
	~~if not validatedIcon then~~
	~~CollectorsData = require("Module:CollectorsData")~~
	~~validatedIcon = tryData(name, CollectorsData)~~
	~~if not validatedIcon then~~
	~~CampsData = require("Module:CampsData")~~
	~~validatedIcon = tryData(name, CampsData)~~
	~~if not validatedIcon then~~
	~~error("No~~ building ~~found~~ with name: " .. name .. ". Please see the template documentation for how to use the parameters")
	~~end~~
	~~end~~
	~~end~~
	~~end~~
	end		end

	return validatedIcon		return validatedIcon
	end		end

76561197969631737: adding some luadoc comments and a little error checking for blank name

2024-10-19T02:14:46Z

adding some luadoc comments and a little error checking for blank name

← Older revision		Revision as of 02:14, 19 October 2024
Line 40:		Line 40:
	--region Private methods		--region Private methods

			---tryData retrieves the icon from the provided building interface. Based on the interface, if name is nil or there is no icon, this method will return nil
			---
			---@param name string the display name of a building
			---@param buildingInterface table a data module require'd and passed in
			---@return string the filename of the icon, if any is found
	local function tryData(name, buildingInterface)		local function tryData(name, buildingInterface)

Line 49:		Line 54:


			---validateBuildingName attempts to find in each of the data modules the name specified. If the name is not found, an error is thrown. If the name is found in one of the data modules, it will return the icon filename. So we return that as proof the building was found (and to use it, of course).
			---
			---@param name string the display name of a building
			---@return string the filename of the icon for that building
	local function validateBuildingName(name)		local function validateBuildingName(name)

Line 94:		Line 103:
	local display = frame.args.display		local display = frame.args.display
	local needsPlural		local needsPlural

			if not name or name == "" then
			error("You must specify a building. Please see the template documentation for how to use the parameters")
			end

	-- Initialize the array of unnamed parameters, up to 3, so several may be nil.		-- Initialize the array of unnamed parameters, up to 3, so several may be nil.
Line 140:		Line 153:
	end		end

			-- The args to pass to the view.
	viewParameters = {		viewParameters = {
	["name"] = name,		["name"] = name,
Line 152:		Line 166:
	args = viewParameters,		args = viewParameters,
	}		}

	end		end

76561197969631737: I tested this a ton over in my test modules and testing templates. ultimately had to change I hope this works!

2024-10-18T02:11:55Z

I tested this a ton over in my test modules and testing templates. ultimately had to change I hope this works!

← Older revision		Revision as of 02:11, 18 October 2024
Line 95:		Line 95:
	local needsPlural		local needsPlural

	-- Initialize the ~~stack~~ of unnamed parameters ~~in reverse order~~, up to 3.		-- Initialize the array of unnamed parameters, up to 3, so several may be nil.
	local parent = frame:getParent()		local parent = frame:getParent()
	if parent then		if parent then
	local parameterStack = { parent.args[3], parent.args[2], parent.args[1], }		local parameterStack = { parent.args[1], parent.args[2], parent.args[3], }
			-- Then empty the stack and try to assign them as our variables.
	-- Then empty the stack and try to assign them as variables ~~here~~.		for _, nextParameter in ipairs(parameterStack) do
	~~while #parameterStack > 0 do~~
	~~-- Pop the next parameter from the stack~~
	~~local~~ nextParameter ~~= table.remove~~(parameterStack)
	if nextParameter and nextParameter ~= "" then		if nextParameter and nextParameter ~= "" then
	-- Prioritize setting the name first.		-- Prioritize setting the name first.
Line 121:		Line 118:
	end		end
	end		end

			-- Validate the name before we continue any further.
			validatedIcon = validateBuildingName(name)

	-- Handle default icon size.		-- Handle default icon size.
Line 126:		Line 126:
	iconSize = "none"		iconSize = "none"
	end		end

	~~validatedIcon = validateBuildingName(name)~~

	-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)		-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)

76561197969631737: Troubleshooting the icon sizes and plurals. maybe this works?

2024-10-18T01:19:22Z

Troubleshooting the icon sizes and plurals. maybe this works?

← Older revision		Revision as of 01:19, 18 October 2024
Line 110:		Line 110:
	else		else
	-- These could happen in either order, because their valid values are non-overlapping		-- These could happen in either order, because their valid values are non-overlapping
	if not iconSize and VALID_SIZE[nextParameter] then		if (not iconSize or iconSize == "") and VALID_SIZE[nextParameter] then
	iconSize = nextParameter		iconSize = nextParameter
	else		else
	if not ~~plural~~ and VALID_PLURAL[nextParameter] then		if not needsPlural and VALID_PLURAL[nextParameter] then
	~~plural~~ = nextParameter		needsPlural = nextParameter
	end		end
	end		end

76561197969631737: Maybe NOW it handles unnamed parameters?

2024-10-18T01:08:42Z

Maybe NOW it handles unnamed parameters?

← Older revision		Revision as of 01:08, 18 October 2024
Line 20:		Line 20:

	--region Private constants		--region Private constants

			local VALID_SIZE = {
			["none"] = true,
			["small"] = true,
			["medium"] = true,
			["large"] = true,
			["huge"] = true,
			}

			local VALID_PLURAL = {
			["s"] = true,
			["es"] = true,
			}

	--endregion		--endregion
Line 79:		Line 92:
	local name = frame.args.name		local name = frame.args.name
	local iconSize = frame.args.size		local iconSize = frame.args.size
	~~local needsPlural = frame.args.plural~~
	local display = frame.args.display		local display = frame.args.display
			local needsPlural

			-- Initialize the stack of unnamed parameters in reverse order, up to 3.
			local parent = frame:getParent()
			if parent then
			local parameterStack = { parent.args[3], parent.args[2], parent.args[1], }

			-- Then empty the stack and try to assign them as variables here.
			while #parameterStack > 0 do
			-- Pop the next parameter from the stack
			local nextParameter = table.remove(parameterStack)
			if nextParameter and nextParameter ~= "" then
			-- Prioritize setting the name first.
			if not name or name == "" then
			name = nextParameter
			else
			-- These could happen in either order, because their valid values are non-overlapping
			if not iconSize and VALID_SIZE[nextParameter] then
			iconSize = nextParameter
			else
			if not plural and VALID_PLURAL[nextParameter] then
			plural = nextParameter
			end
			end
			end
			end
			end
			end

	-- ~~If the iconSize was not specified, but plural was "s", then these will match. We need to unset the iconSize to be~~ default.		-- Handle default icon size.
	if iconSize ~~== needsPlural and (needsPlural~~ == "s" or ~~needsPlural == "es")~~ then		if not iconSize or iconSize == "" or not VALID_SIZE[iconSize] then
	iconSize = ~~nil~~		iconSize = "none"
	end		end

	~~-- It is valid by now; the above method already threw an error if not.~~
	validatedIcon = validateBuildingName(name)		validatedIcon = validateBuildingName(name)

	-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)		-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)
	if needsPlural == "s" or needsPlural == "es" then		if needsPlural == "s" or needsPlural == "es" then
	if string.match(name, "y$") then		if string.match(name,"y$") then
	name = string.sub(name, 1, -2) .. "ies"		name = string.sub(name,1,-2) .. "ies"
	needsPlural = nil -- unset, since it's incorporated into the name		needsPlural = nil -- unset now, since it's incorporated into the name itself
	else		else
	local needsSyllable = string.match(name, "[sxz]$") or string.match(name, "sh$") or string.match(name, "ch$")		local needsSyllable = string.match(name,"[sxz]$") or string.match(name,"sh$") or string.match(name,"ch$")
	needsPlural = needsSyllable and "es" or "s"		needsPlural = needsSyllable and "es" or "s"
	end		end
Line 115:		Line 154:
	args = viewParameters,		args = viewParameters,
	}		}

	end		end

76561197969631737: Undo revision 8878 by 76561197969631737 (talk)

2024-10-17T23:50:52Z

Undo revision 8878 by 76561197969631737 (talk)

← Older revision		Revision as of 23:50, 17 October 2024
Line 20:		Line 20:

	--region Private constants		--region Private constants

	~~local VALID_SIZE = {~~
	~~["none"] = true,~~
	~~["small"] = true,~~
	~~["medium"] = true,~~
	~~["large"] = true,~~
	~~["huge"] = true,~~
	}

	~~local VALID_PLURAL = {~~
	~~["s"] = true,~~
	~~["es"] = true,~~
	}

	--endregion		--endregion
Line 92:		Line 79:
	local name = frame.args.name		local name = frame.args.name
	local iconSize = frame.args.size		local iconSize = frame.args.size
			local needsPlural = frame.args.plural
	local display = frame.args.display		local display = frame.args.display
	~~local needsPlural~~

	~~-- Initialize the stack of unnamed parameters in reverse order, up to 3.~~
	~~local parent = frame:getParent()~~
	~~if parent then~~
	~~local parameterStack = { parent.args[3], parent.args[2], parent.args[1], }~~

	~~-- Then empty the stack and try to assign them as variables here.~~
	~~while #parameterStack > 0 do~~
	~~-- Pop the next parameter from the stack~~
	~~local nextParameter = table.remove(parameterStack)~~
	~~if nextParameter and nextParameter ~= "" then~~
	~~-- Prioritize setting the name first.~~
	~~if not name then~~
	~~name = nextParameter~~
	~~else~~
	~~-- These could happen in either order, because their valid values are non-overlapping~~
	~~if not iconSize and VALID_SIZE[nextParameter] then~~
	~~iconSize = nextParameter~~
	~~else~~
	~~if not plural and VALID_PLURAL[nextParameter] then~~
	~~plural = nextParameter~~
	~~end~~
	~~end~~
	~~end~~
	~~end~~
	~~end~~
	~~end~~

	-- ~~Handle~~ default ~~icon size~~.		-- If the iconSize was not specified, but plural was "s", then these will match. We need to unset the iconSize to be default.
	if ~~not~~ iconSize or ~~iconSize~~ == "" ~~or not VALID_SIZE[iconSize]~~ then		if iconSize == needsPlural and (needsPlural == "s" or needsPlural == "es") then
	iconSize = ~~"none"~~		iconSize = nil
	end		end

			-- It is valid by now; the above method already threw an error if not.
	validatedIcon = validateBuildingName(name)		validatedIcon = validateBuildingName(name)

	-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)		-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)
	if needsPlural == "s" or needsPlural == "es" then		if needsPlural == "s" or needsPlural == "es" then
	if string.match(name,"y$") then		if string.match(name, "y$") then
	name = string.sub(name,1,-2) .. "ies"		name = string.sub(name, 1, -2) .. "ies"
	needsPlural = nil -- unset ~~now~~, since it's incorporated into the name ~~itself~~		needsPlural = nil -- unset, since it's incorporated into the name
	else		else
	local needsSyllable = string.match(name,"[sxz]$") or string.match(name,"sh$") or string.match(name,"ch$")		local needsSyllable = string.match(name, "[sxz]$") or string.match(name, "sh$") or string.match(name, "ch$")
	needsPlural = needsSyllable and "es" or "s"		needsPlural = needsSyllable and "es" or "s"
	end		end

76561197969631737: Let's see if this handles unnamed parameters better.

2024-10-17T23:49:25Z

Let's see if this handles unnamed parameters better.

← Older revision		Revision as of 23:49, 17 October 2024
Line 20:		Line 20:

	--region Private constants		--region Private constants

			local VALID_SIZE = {
			["none"] = true,
			["small"] = true,
			["medium"] = true,
			["large"] = true,
			["huge"] = true,
			}

			local VALID_PLURAL = {
			["s"] = true,
			["es"] = true,
			}

	--endregion		--endregion
Line 79:		Line 92:
	local name = frame.args.name		local name = frame.args.name
	local iconSize = frame.args.size		local iconSize = frame.args.size
	~~local needsPlural = frame.args.plural~~
	local display = frame.args.display		local display = frame.args.display
			local needsPlural

			-- Initialize the stack of unnamed parameters in reverse order, up to 3.
			local parent = frame:getParent()
			if parent then
			local parameterStack = { parent.args[3], parent.args[2], parent.args[1], }

			-- Then empty the stack and try to assign them as variables here.
			while #parameterStack > 0 do
			-- Pop the next parameter from the stack
			local nextParameter = table.remove(parameterStack)
			if nextParameter and nextParameter ~= "" then
			-- Prioritize setting the name first.
			if not name then
			name = nextParameter
			else
			-- These could happen in either order, because their valid values are non-overlapping
			if not iconSize and VALID_SIZE[nextParameter] then
			iconSize = nextParameter
			else
			if not plural and VALID_PLURAL[nextParameter] then
			plural = nextParameter
			end
			end
			end
			end
			end
			end

	-- ~~If the iconSize was not specified, but plural was "s", then these will match. We need to unset the iconSize to be~~ default.		-- Handle default icon size.
	if iconSize ~~== needsPlural and (needsPlural~~ == "s" or ~~needsPlural == "es")~~ then		if not iconSize or iconSize == "" or not VALID_SIZE[iconSize] then
	iconSize = ~~nil~~		iconSize = "none"
	end		end

	~~-- It is valid by now; the above method already threw an error if not.~~
	validatedIcon = validateBuildingName(name)		validatedIcon = validateBuildingName(name)

	-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)		-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)
	if needsPlural == "s" or needsPlural == "es" then		if needsPlural == "s" or needsPlural == "es" then
	if string.match(name, "y$") then		if string.match(name,"y$") then
	name = string.sub(name, 1, -2) .. "ies"		name = string.sub(name,1,-2) .. "ies"
	needsPlural = nil -- unset, since it's incorporated into the name		needsPlural = nil -- unset now, since it's incorporated into the name itself
	else		else
	local needsSyllable = string.match(name, "[sxz]$") or string.match(name, "sh$") or string.match(name, "ch$")		local needsSyllable = string.match(name,"[sxz]$") or string.match(name,"sh$") or string.match(name,"ch$")
	needsPlural = needsSyllable and "es" or "s"		needsPlural = needsSyllable and "es" or "s"
	end		end

76561197969631737: Reverting to before tonight's changes dammit

2024-10-17T03:43:11Z

Reverting to before tonight's changes dammit

← Older revision		Revision as of 03:43, 17 October 2024
Line 20:		Line 20:

	--region Private constants		--region Private constants

	~~local VALID_SIZE = {~~
	~~["none"] = true,~~
	~~["small"] = true,~~
	~~["medium"] = true,~~
	~~["large"] = true,~~
	~~["huge"] = true,~~
	}

	~~local VALID_PLURAL = {~~
	~~["s"] = true,~~
	~~["es"] = true,~~
	}

	--endregion		--endregion
Line 92:		Line 79:
	local name = frame.args.name		local name = frame.args.name
	local iconSize = frame.args.size		local iconSize = frame.args.size
			local needsPlural = frame.args.plural
	local display = frame.args.display		local display = frame.args.display
	~~local plural~~

	-- We need to ~~handle~~ the ~~parameters here in Lua, since there is some flexibility afforded~~ to ~~authors. Create a stack FIFO in reverse order and use table.remove to pop the stack~~.		-- If the iconSize was not specified, but plural was "s", then these will match. We need to unset the iconSize to be default.
	~~local paramStack~~ = ~~{ frame.args[3], frame.args[2], frame.args[1], }~~		if iconSize == needsPlural and (needsPlural == "s" or needsPlural == "es") then
	~~while #paramStack > 0 do~~		iconSize = nil
	~~-- Pop the stack.~~
	~~local nextParameter~~ = ~~table.remove~~(~~paramStack~~)
	~~-- We likely added nil items to the array, so verify it exists~~
	~~if nextParameter then~~
	~~if not name then~~
	~~name = nextParameter~~
	~~end~~
	~~if not iconSize and VALID_SIZE[nextParameter] then~~
	iconSize = ~~nextParameter~~
	~~end~~
	~~if not plural and VALID_PLURAL[nextParameter] then~~
	~~plural = nextParameter~~
	~~end~~
	~~end~~
	end		end

	-- It is valid by now; the above method already threw an error if not.		-- It is valid by now; the above method already threw an error if not.
	validatedIcon = validateBuildingName(name)		validatedIcon = validateBuildingName(name)

	~~-- Provide a default icon size of none.~~
	~~if not iconSize or not VALID_SIZE[iconSize] then~~
	~~iconSize = "none"~~
	~~end~~

	-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)		-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)
	if ~~plural~~ == "s" or ~~plural~~ == "es" then		if needsPlural == "s" or needsPlural == "es" then
	if string.match(name, "y$") then		if string.match(name, "y$") then
	name = string.sub(name, 1, -2) .. "ies"		name = string.sub(name, 1, -2) .. "ies"
	~~plural~~ = nil -- unset, since it's ~~now~~ incorporated into the name		needsPlural = nil -- unset, since it's incorporated into the name
	else		else
	local needsSyllable = string.match(name, "[sxz]$") or string.match(name, "sh$") or string.match(name, "ch$")		local needsSyllable = string.match(name, "[sxz]$") or string.match(name, "sh$") or string.match(name, "ch$")
	~~plural~~ = needsSyllable and "es" or "s"		needsPlural = needsSyllable and "es" or "s"
	end		end
	else		else
	~~plural~~ = nil		needsPlural = nil
	end		end

	viewParameters = {		viewParameters = {
	["name"] = name,		["name"] = name,
	["plural"] = ~~plural~~,		["plural"] = needsPlural,
	["iconfilename"] = validatedIcon,		["iconfilename"] = validatedIcon,
	["iconsize"] = iconSize,		["iconsize"] = iconSize,

76561197969631737: still troubleshooting

2024-10-17T03:41:11Z

still troubleshooting

← Older revision		Revision as of 03:41, 17 October 2024
Line 105:		Line 105:
	name = nextParameter		name = nextParameter
	end		end
	if not ~~size~~ and VALID_SIZE[nextParameter] then		if not iconSize and VALID_SIZE[nextParameter] then
	iconSize = nextParameter		iconSize = nextParameter
	end		end

76561197969631737: refactored the parameter logic to be more robust.

2024-10-17T02:34:18Z

refactored the parameter logic to be more robust.

← Older revision		Revision as of 02:34, 17 October 2024
Line 20:		Line 20:

	--region Private constants		--region Private constants

			local VALID_SIZE = {
			["none"] = true,
			["small"] = true,
			["medium"] = true,
			["large"] = true,
			["huge"] = true,
			}

			local VALID_PLURAL = {
			["s"] = true,
			["es"] = true,
			}

	--endregion		--endregion
Line 79:		Line 92:
	local name = frame.args.name		local name = frame.args.name
	local iconSize = frame.args.size		local iconSize = frame.args.size
	~~local needsPlural = frame.args.plural~~
	local display = frame.args.display		local display = frame.args.display
			local plural

	-- If the ~~iconSize was not specified~~, ~~but plural was "s", then these will match~~. ~~We need~~ to ~~unset~~ the ~~iconSize to be default~~.		-- We need to handle the parameters here in Lua, since there is some flexibility afforded to authors. Create a stack FIFO in reverse order and use table.remove to pop the stack.
	~~if iconSize~~ == ~~needsPlural and~~ (~~needsPlural == "s" or needsPlural == "es"~~) then		local paramStack = { frame.args[3], frame.args[2], frame.args[1], }
	~~iconSize~~ = ~~"none"~~		while #paramStack > 0 do
	end		-- Pop the stack.
	~~-- If the iconSize was~~ not ~~specified,~~ and ~~the building name wasn't a named parameter (most of the time),~~ then ~~these will match. We need to unset the~~ iconSize ~~to default.~~		local nextParameter = table.remove(paramStack)
	if ~~iconSize~~ =~~= name then~~		-- We likely added nil items to the array, so verify it exists
	~~iconSize = "none"~~		if nextParameter then
			if not name then
			name = nextParameter
			end
			if not size and VALID_SIZE[nextParameter] then
			iconSize = nextParameter
			end
			if not plural and VALID_PLURAL[nextParameter] then
			plural = nextParameter
			end
			end
	end		end

	-- It is valid by now; the above method already threw an error if not.		-- It is valid by now; the above method already threw an error if not.
	validatedIcon = validateBuildingName(name)		validatedIcon = validateBuildingName(name)

			-- Provide a default icon size of none.
			if not iconSize or not VALID_SIZE[iconSize] then
			iconSize = "none"
			end

	-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)		-- The only valid value for mustBePlural is "s," so then make on check to see if name ends in a way that we need to add "es" at the end instead of just "s". For names that end in "y", we swap out the last character for "ies" instead. (This will require one-time setup for redirect pages.)
	if ~~needsPlural~~ == "s" or ~~needsPlural~~ == "es" then		if plural == "s" or plural == "es" then
	if string.match(name, "y$") then		if string.match(name, "y$") then
	name = string.sub(name, 1, -2) .. "ies"		name = string.sub(name, 1, -2) .. "ies"
	~~needsPlural~~ = nil -- unset, since it's incorporated into the name		plural = nil -- unset, since it's now incorporated into the name
	else		else
	local needsSyllable = string.match(name, "[sxz]$") or string.match(name, "sh$") or string.match(name, "ch$")		local needsSyllable = string.match(name, "[sxz]$") or string.match(name, "sh$") or string.match(name, "ch$")
	~~needsPlural~~ = needsSyllable and "es" or "s"		plural = needsSyllable and "es" or "s"
	end		end
	else		else
	~~needsPlural~~ = nil		plural = nil
	end		end

	viewParameters = {		viewParameters = {
	["name"] = name,		["name"] = name,
	["plural"] = ~~needsPlural~~,		["plural"] = plural,
	["iconfilename"] = validatedIcon,		["iconfilename"] = validatedIcon,
	["iconsize"] = iconSize,		["iconsize"] = iconSize,