「モジュール:Wd」の版間の差分

モジュール:Wd (ソースを閲覧)

2017年5月13日 (土) 10:59時点における版

896 バイト追加、 2017年5月13日 (土)

en:Module:Wd 2017年5月12日 (金) 08:40(UTC)より

匿名利用者

template>K-iczn

@@ 360行目: / 360行目: @@
 function addDelimiters(num)
 	return i18n.addDelimiters(num)
+end
+function replaceDecimalMark(num)
+	return mw.ustring.gsub(num, "[.]", i18n['numeric']['decimal-mark'], 1)
 end
@@ 605行目: / 609行目: @@
 			-- strip + signs from front
 			local value = mw.ustring.gsub(snak.datavalue.value['amount'], "^\+(.+)$", "%1")
-			-- replace decimal mark based on locale
-			value = mw.ustring.gsub(value, "[.]", i18n['numeric']['decimal-mark'], 1)
 			if not raw then
+				-- replace decimal mark based on locale
+				value = replaceDecimalMark(value)
+				-- add delimiters for readability
 				value = addDelimiters(value)
 				local unit = convertUnit(snak.datavalue.value['unit'], link)
 				if unit then
 					value = value .. unit
@@ 831行目: / 838行目: @@
 			local precision, numDigits, strFormat, value, globe
 			local latValue, latitude, latDegrees, latMinutes, latSeconds
-			local latDirection = i18n['coord']['latitude-north']
 			local lonValue, longitude, lonDegrees, lonMinutes, lonSeconds
-			local lonDirection = i18n['coord']['longitude-east']
+			local latDirection, latDirectionN, latDirectionS, latDirectionEN
+			local lonDirection, lonDirectionE, lonDirectionW, lonDirectionEN
-			local degSymbol = i18n['coord']['degrees']
+			local latDirectionEN_N = "N"
-			local minSymbol = i18n['coord']['minutes']
+			local latDirectionEN_S = "S"
-			local secSymbol = i18n['coord']['seconds']
+			local lonDirectionEN_E = "E"
-			local separator = i18n['coord']['separator']
+			local lonDirectionEN_W = "W"
-			if raw then
+			if not raw then
+				latDirectionN = i18n['coord']['latitude-north']
+				latDirectionS = i18n['coord']['latitude-south']
+				lonDirectionE = i18n['coord']['longitude-east']
+				lonDirectionW = i18n['coord']['longitude-west']
+				degSymbol = i18n['coord']['degrees']
+				minSymbol = i18n['coord']['minutes']
+				secSymbol = i18n['coord']['seconds']
+				separator = i18n['coord']['separator']
+			else
+				latDirectionN = latDirectionEN_N
+				latDirectionS = latDirectionEN_S
+				lonDirectionE = lonDirectionEN_E
+				lonDirectionW = lonDirectionEN_W
 				degSymbol = "/"
 				minSymbol = "/"
@@ 851行目: / 873行目: @@
 			if latitude < 0 then
-				latDirection = i18n['coord']['latitude-south']
+				latDirection = latDirectionS
+				latDirectionEN = latDirectionEN_S
 				latitude = math.abs(latitude)
+			else
+				latDirection = latDirectionN
+				latDirectionEN = latDirectionEN_N
 			end
 			if longitude < 0 then
-				lonDirection = i18n['coord']['longitude-west']
+				lonDirection = lonDirectionW
+				lonDirectionEN = lonDirectionEN_W
 				longitude = math.abs(longitude)
+			else
+				lonDirection = lonDirectionE
+				lonDirectionEN = lonDirectionEN_E
 			end
@@ 900行目: / 931行目: @@
 				lonSeconds = string.format(strFormat, lonSeconds)
-				-- replace decimal marks based on locale
+				if not raw then
-				latSeconds = mw.ustring.gsub(latSeconds, "[.]", i18n['numeric']['decimal-mark'], 1)
+					-- replace decimal marks based on locale
-				lonSeconds = mw.ustring.gsub(lonSeconds, "[.]", i18n['numeric']['decimal-mark'], 1)
+					latSeconds = replaceDecimalMark(latSeconds)
+					lonSeconds = replaceDecimalMark(lonSeconds)
+				end
 				latValue = latValue .. latSeconds .. secSymbol
@@ 922行目: / 955行目: @@
 				end
-				value = "[https://tools.wmflabs.org/geohack/geohack.php?language="..self.langCode.."&params="..latitude.."_"..latDirection.."_"..longitude.."_"..lonDirection.."_globe:"..globe.." "..value.."]"
+				value = "[https://tools.wmflabs.org/geohack/geohack.php?language="..self.langCode.."&params="..latitude.."_"..latDirectionEN.."_"..longitude.."_"..lonDirectionEN.."_globe:"..globe.." "..value.."]"
 			end
@@ 1,415行目: / 1,448行目: @@
 			end
+			-- if this module is being substituted then build a regular template call, otherwise expand the template
 			if mw.isSubsting() then
 				for i, v in pairs(params) do