GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-23 09:52:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use [Dig] instead of Digits in Time, to avoid commas in English.

Browse Source
This commit is contained in:
bjorn
2008-02-25 21:24:12 +00:00
parent de23fe7483
commit 9aa025007a
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/resource/time/Time.gf
View File

@@ -19,6 +19,8 @@ Hour ;
Minute ; Minute ;
Weekday ; Weekday ;
[Dig]{1};
fun fun
DateTimeDateTime : Date -> Time -> DateTime ; DateTimeDateTime : Date -> Time -> DateTime ;
@@ -31,14 +33,14 @@ YearMonthDate : Year -> MonthName -> Date ; -- March 1995
YearMonthDayDate : Year -> MonthName -> Day -> Date ; -- January 1st, 2006 YearMonthDayDate : Year -> MonthName -> Day -> Date ; -- January 1st, 2006
NumYear : Numeral -> Year ; NumYear : Numeral -> Year ;
DigYear : Digits -> Year ; DigYear : [Dig] -> Year ;
NumMonth : Sub100 -> Month ; NumMonth : Sub100 -> Month ;
DigMonth : Digits -> Month ; DigMonth : [Dig] -> Month ;
NameMonth : MonthName -> Month ; NameMonth : MonthName -> Month ;
NumDay : Sub100 -> Day ; NumDay : Sub100 -> Day ;
DigDay : Digits -> Day ; DigDay : [Dig] -> Day ;
FormalTime : Hour -> Minute -> Time ; -- "two twenty" FormalTime : Hour -> Minute -> Time ; -- "two twenty"
PastTime : Hour -> Minute -> Time ; -- "twenty past two" PastTime : Hour -> Minute -> Time ; -- "twenty past two"
@@ -47,9 +49,9 @@ HourTime : Hour -> Time ; -- "two o'clock"
ExactTime : Hour -> Time ; -- "sharp" ExactTime : Hour -> Time ; -- "sharp"
NumHour : Numeral -> Hour ; NumHour : Numeral -> Hour ;
DigHour : Digits -> Hour ; DigHour : [Dig] -> Hour ;
NumMinute : Numeral -> Minute ; NumMinute : Numeral -> Minute ;
DigMinute : Digits -> Minute ; DigMinute : [Dig] -> Minute ;
fun fun
january : MonthName ; january : MonthName ;
@@ -80,6 +82,7 @@ fun
OnDate : Date -> Adv ; OnDate : Date -> Adv ;
AtTime : Time -> Adv ; AtTime : Time -> Adv ;
{- {-
Add: Add:

6
lib/resource/time/TimeEng.gf
View File

@@ -17,6 +17,8 @@ Hour = SS ;
Minute = SS ; Minute = SS ;
Time = SS ; Time = SS ;
[Dig] = { s : CardOrd => Str } ;
lin lin
DateTimeDateTime date time = { s = date.s ++ "at" ++ time.s }; DateTimeDateTime date time = { s = date.s ++ "at" ++ time.s };
@@ -84,4 +86,8 @@ OnDate date = let prep = case date.t of {
AtTime time = { s = "at" ++ time.s } ; AtTime time = { s = "at" ++ time.s } ;
BaseDig d = { s = \\o => d.s!o } ;
ConsDig d ds = { s = \\o => d.s!NCard ++ ds.s!o } ;
} ; } ;