Modul:Detect singular: Unterschied zwischen den Versionen

Modul:Detect singular (Quelltext anzeigen)

27 Bytes hinzugefügt , vor 2 Jahren

simplify logic a bit

Anonymer Benutzer

@@ Zeile 25: / Zeile 25: @@
 	end
 	if plainFind(s,'forcedetectplural') then -- magic data string to return false
+		return false
+	end
+	-- count number of list items
+	local numListItems = countMatches(s,'<%s*li')
+	-- if exactly one, then singular, if more than one, then plural
+	if numListItems == 1 then
+		return true
+	end
+	if numListItems > 1 then
 		return false
 	end
 	-- replace all wikilinks with fixed string
 	s = mw.ustring.gsub(s,'%b[]','WIKILINK')
-	-- replace all list items with a fixed string
-	s, numListItems = mw.ustring.gsub(s,'<%s*li%s*>.-<%s*/li%s*>','<li>LISTITEM</li>')
 	local hasComma = checkComma and mw.ustring.find(s, '%a,%s')
-	local hasMultipleListElements = numListItems > 1
 	local hasAnd = mw.ustring.find(s,'%Aand%A')
 	local hasBreak = mw.ustring.find(s,'<%s*br')
 	local hasBullets = checkBullets and countMatches(s,'%*+') > 1
 	local multipleQids = mw.ustring.find(s,'Q%d+[%p%s]+Q%d+') -- has multiple QIDs in a row
-	return not (hasComma or hasMultipleListElements or hasAnd or hasBreak or hasBullets or multipleQids)
+	return not (hasComma or hasAnd or hasBreak or hasBullets or multipleQids)
 end