שינויים

נוספו 79 בתים ,  18:43, 12 בספטמבר 2020
מ
אין תקציר עריכה
שורה 806: שורה 806:  
    
 
    
 
local outputPrefix = ''
 
local outputPrefix = ''
local parts = mw.text.split(dateRangeStr,' +%- +')
+
local parts = mw.text.split(dateRangeStr,' +[–%-] +')
 
assert(#parts==2 or #parts==1, "Date range expected format is from - to or from (e.g from - now)")
 
assert(#parts==2 or #parts==1, "Date range expected format is from - to or from (e.g from - now)")
 
 
שורה 899: שורה 899:  
return dif
 
return dif
 
else
 
else
return outputPrefix..lang:formatDuration(dif, diffFormat)
+
local res =  outputPrefix..lang:formatDuration(dif, diffFormat)
 +
-- post process formatDuration which is not good enough
 +
res= mw.ustring.gsub(res,"וגם ([0-9])","ו־%1")
 +
res= mw.ustring.gsub(res,"וגם ([א-ת])","ו%1")
 +
return res
 
end
 
end
 
end
 
end
שורה 924: שורה 928:  
-- the following translations are needed because the underline function
 
-- the following translations are needed because the underline function
 
-- local format is wierd
 
-- local format is wierd
str = mw.ustring.gsub(str,  
+
str = mw.ustring.gsub(str, "(כ)־([א-ת])", "%1%2")
"(כ)־([א-ת])", "%1%2")
  −
str= mw.ustring.gsub(str,"וגם ([0-9])","ו-%1")
  −
str= mw.ustring.gsub(str,"וגם ([א-ת])","ו%1");
      
if frame.args[2] == "גיל" then
 
if frame.args[2] == "גיל" then
משתמש אלמוני