mirror of
https://github.com/brues-code/ClassicAPI.git
synced 2026-11-16 16:10:36 +00:00
Stock 1.12.1 already defines DAYS_ABBR/HOURS_ABBR/MINUTES_ABBR/ SECONDS_ABBR (bare labels: "Day"/"Hr"/"Min"/"Sec") and the four *_ONELETTER_ABBR. Our enUS.lua loads after FrameXML, so redefining them with the modern "%d |4Day:Days;" format silently overwrote the native values and broke any native/other-addon code reading the bare labels. Remove those redefinitions from enUS.lua (keep only the strings stock genuinely lacks), and drop SecondsToTime / SecondsToTimeAbbrev / FormatUnit from TimeUtil — they were the only consumers of the modern-format _ABBR strings. SecondsToClock stays (uses the stock-missing HOURS_MINUTES_SECONDS / MINUTES_SECONDS). Remaining enUS entries sorted, all still have live consumers.
42 lines
1.3 KiB
Lua
42 lines
1.3 KiB
Lua
SECONDS_PER_MIN = 60;
|
|
SECONDS_PER_HOUR = 60 * SECONDS_PER_MIN;
|
|
SECONDS_PER_DAY = 24 * SECONDS_PER_HOUR;
|
|
SECONDS_PER_MONTH = 30 * SECONDS_PER_DAY;
|
|
SECONDS_PER_YEAR = 12 * SECONDS_PER_MONTH;
|
|
|
|
function SecondsToMinutes(seconds)
|
|
return seconds / SECONDS_PER_MIN;
|
|
end
|
|
|
|
function MinutesToSeconds(minutes)
|
|
return minutes * SECONDS_PER_MIN;
|
|
end
|
|
|
|
function ConvertSecondsToUnits(timestamp)
|
|
timestamp = math.max(timestamp, 0);
|
|
local days = math.floor(timestamp / SECONDS_PER_DAY);
|
|
timestamp = timestamp - (days * SECONDS_PER_DAY);
|
|
local hours = math.floor(timestamp / SECONDS_PER_HOUR);
|
|
timestamp = timestamp - (hours * SECONDS_PER_HOUR);
|
|
local minutes = math.floor(timestamp / SECONDS_PER_MIN);
|
|
timestamp = timestamp - (minutes * SECONDS_PER_MIN);
|
|
local seconds = math.floor(timestamp);
|
|
local milliseconds = timestamp - seconds;
|
|
return {
|
|
days = days,
|
|
hours = hours,
|
|
minutes = minutes,
|
|
seconds = seconds,
|
|
milliseconds = milliseconds,
|
|
};
|
|
end
|
|
|
|
function SecondsToClock(seconds, displayZeroHours)
|
|
local units = ConvertSecondsToUnits(seconds);
|
|
if units.hours > 0 or displayZeroHours then
|
|
return string.format(HOURS_MINUTES_SECONDS, units.hours, units.minutes, units.seconds);
|
|
else
|
|
return string.format(MINUTES_SECONDS, units.minutes, units.seconds);
|
|
end
|
|
end
|