更改

删除420字节 、 2021年12月27日 (一) 04:05
Undid revision 1062166786 by Matthiaspaul (talk); should be fixed now, and if not, please ping me with examples as I couldn't reproduce the original error
第9行: 第9行:     
local mArguments --initialize lazily
 
local mArguments --initialize lazily
 +
local mFormatLink = require('Module:Format link')
 
local mHatnote = require('Module:Hatnote')
 
local mHatnote = require('Module:Hatnote')
 
local libraryUtil = require('libraryUtil')
 
local libraryUtil = require('libraryUtil')
第22行: 第23行:     
--default options table used across the list stringification functions
 
--default options table used across the list stringification functions
-- 本地化注意
   
local stringifyListDefaultOptions = {
 
local stringifyListDefaultOptions = {
conjunction = "",
+
conjunction = "and",
separator = "",
+
separator = ",",
altSeparator = "",
+
altSeparator = ";",
space = "",
+
space = " ",
formatted = false,
+
formatted = false
boldfaced = false,
  −
quotes = false
   
}
 
}
 +
 +
--Searches display text only
 +
local function searchDisp(haystack, needle)
 +
return string.find(
 +
string.sub(haystack, (string.find(haystack, '|') or 0) + 1), needle
 +
)
 +
end
    
-- Stringifies a list generically; probably shouldn't be used directly
 
-- Stringifies a list generically; probably shouldn't be used directly
function stringifyList(list, options)
+
local function stringifyList(list, options)
 
-- Type-checks, defaults, and a shortcut
 
-- Type-checks, defaults, and a shortcut
 
checkType("stringifyList", 1, list, "table")
 
checkType("stringifyList", 1, list, "table")
第45行: 第50行:  
local s = options.space
 
local s = options.space
 
-- Format the list if requested
 
-- Format the list if requested
if options.formatted then list = mHatnote.formatPages(unpack(list)) end
+
if options.formatted then
 +
list = mFormatLink.formatPages(
 +
{categorizeMissing = mHatnote.missingTargetCat}, list
 +
)
 +
end
 
-- Set the separator; if any item contains it, use the alternate separator
 
-- Set the separator; if any item contains it, use the alternate separator
 
local separator = options.separator
 
local separator = options.separator
--searches display text only
  −
function searchDisp(t, f)
  −
return string.find(string.sub(t, (string.find(t, '|') or 0) + 1), f)
  −
end
   
for k, v in pairs(list) do
 
for k, v in pairs(list) do
-- 本地化注意
  −
if options.boldfaced then
  −
list[k] = '\'\'\'' .. list[k] .. '\'\'\''
  −
end
  −
if options.quotes then
  −
list[k] = '「' .. list[k] .. '」'
  −
end
   
if searchDisp(v, separator) then
 
if searchDisp(v, separator) then
 
separator = options.altSeparator
 
separator = options.altSeparator
第67行: 第65行:  
-- Set the conjunction, apply Oxford comma, and force a comma if #1 has "§"
 
-- Set the conjunction, apply Oxford comma, and force a comma if #1 has "§"
 
local conjunction = s .. options.conjunction .. s
 
local conjunction = s .. options.conjunction .. s
-- 本地化注意
+
if #list == 2 and searchDisp(list[1], "§") or #list > 2 then
-- separator .. conjunction的结果是“、和”
+
conjunction = separator .. conjunction
-- if #list == 2 and searchDisp(list[1], "§") or #list > 2 then
+
end
-- conjunction = separator .. conjunction
  −
-- end
   
-- Return the formatted string
 
-- Return the formatted string
 
return mw.text.listToText(list, separator .. s, conjunction)
 
return mw.text.listToText(list, separator .. s, conjunction)
第77行: 第73行:     
--DRY function
 
--DRY function
-- 本地化注意
+
function p.conjList (conj, list, fmt)
function conjList (conj, list, fmt, bold, quo)
+
return stringifyList(list, {conjunction = conj, formatted = fmt})
return stringifyList(list, {conjunction = conj, formatted = fmt, boldfaced = bold, quotes=quo})
   
end
 
end
    
-- Stringifies lists with "and" or "or"
 
-- Stringifies lists with "and" or "or"
-- 本地化注意
+
function p.andList (...) return p.conjList("and", ...) end
function p.andList (...) return conjList("", ...) end
+
function p.orList (...) return p.conjList("or", ...) end
function p.orList (...) return conjList("", ...) end
      
--------------------------------------------------------------------------------
 
--------------------------------------------------------------------------------
第95行: 第89行:     
--default options table used across the forSee family of functions
 
--default options table used across the forSee family of functions
-- 本地化注意
   
local forSeeDefaultOptions = {
 
local forSeeDefaultOptions = {
andKeyword = '',
+
andKeyword = 'and',
 
title = mw.title.getCurrentTitle().text,
 
title = mw.title.getCurrentTitle().text,
otherText = '其他用法',
+
otherText = 'other uses',
forSeeForm = '关于%s,请见%s。',
+
forSeeForm = 'For %s, see %s.',
 
}
 
}
    
--Collapses duplicate punctuation
 
--Collapses duplicate punctuation
-- 本地化注意
+
local function punctuationCollapse (text)
function punctuationCollapse (text)
   
local replacements = {
 
local replacements = {
 
["%.%.$"] = ".",
 
["%.%.$"] = ".",
第112行: 第104行:  
["%.%]%]%.$"] = ".]]",
 
["%.%]%]%.$"] = ".]]",
 
["%?%]%]%.$"] = "?]]",
 
["%?%]%]%.$"] = "?]]",
["%!%]%]%.$"] = "!]]",
+
["%!%]%]%.$"] = "!]]"
["%。%。$"] = "。",
  −
["%?%。$"] = "?",
  −
["%!%。$"] = "!",
  −
["%。%]%]%。$"] = "。]]",
  −
["%?%]%]%。$"] = "?]]",
  −
["%!%]%]%。$"] = "!]]"
   
}
 
}
 
for k, v in pairs(replacements) do text = string.gsub(text, k, v) end
 
for k, v in pairs(replacements) do text = string.gsub(text, k, v) end
第193行: 第179行:  
for k, v in pairs(forSeeTable) do
 
for k, v in pairs(forSeeTable) do
 
local useStr = v.use or options.otherText
 
local useStr = v.use or options.otherText
-- 本地化注意
+
local pagesStr =
local pagesStr = p.andList(v.pages, true, true, true) or '「\'\'\'' .. mHatnote._formatLink(mHatnote.disambiguate(options.title)) .. '\'\'\'」'
+
p.andList(v.pages, true) or
 +
mFormatLink._formatLink{
 +
categorizeMissing = mHatnote.missingTargetCat,
 +
link = mHatnote.disambiguate(options.title)
 +
}
 
local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)
 
local forSeeStr = string.format(options.forSeeForm, useStr, pagesStr)
 
forSeeStr = punctuationCollapse(forSeeStr)
 
forSeeStr = punctuationCollapse(forSeeStr)
第202行: 第192行:  
if options.extratext then table.insert(strList, punctuationCollapse(options.extratext..'.')) end
 
if options.extratext then table.insert(strList, punctuationCollapse(options.extratext..'.')) end
 
-- Return the concatenated list
 
-- Return the concatenated list
return table.concat(strList)
+
return table.concat(strList, ' ')
 
end
 
end