diff --git a/lib/resource/abstract/Time.gf b/lib/resource/abstract/Time.gf index 10c17809d..a55d41f79 100644 --- a/lib/resource/abstract/Time.gf +++ b/lib/resource/abstract/Time.gf @@ -36,4 +36,20 @@ friday : Weekday ; saturday : Weekday ; sunday : Weekday ; +{- +Add: + +years + +dates: the x:th of y + +relative weeks: next week, last week, in x weeks, x weeks ago + +relative days: today, tomorrow, yesterday, the day before yesterday, +the day after tomorrow, in x days, x days ago + +relative time: in x minutes, in x hours + +-} + } ; diff --git a/lib/resource/swedish/TimeSwe.gf b/lib/resource/swedish/TimeSwe.gf index daf27ac96..7eafdc767 100644 --- a/lib/resource/swedish/TimeSwe.gf +++ b/lib/resource/swedish/TimeSwe.gf @@ -1,3 +1,4 @@ +--# -path=.:../scandinavian:../abstract:../../prelude concrete TimeSwe of Time = NumeralsSwe ** open Prelude, MorphoSwe, CategoriesSwe, ParadigmsSwe in { @@ -13,8 +14,8 @@ DayDate day = ss (day.s ! singular ! Indef ! nominative) ; DayTimeDate day time = ss (day.s ! singular ! Indef ! nominative ++ "klockan" ++ time.s) ; FormalTime = infixSS "och" ; -PastTime h m = ss (m.s ++ "över" ++ h.s) ; -ToTime h m = ss (m.s ++ "i" ++ h.s) ; +PastTime h m = ss (m.s ++ variants { "" ; "minuter" } ++ "över" ++ h.s) ; +ToTime h m = ss (m.s ++ variants { "" ; "minuter" } ++ "i" ++ h.s) ; ExactTime h = ss (h.s ++ "prick") ; NumHour n = {s = n.s ! Neutr} ;