(Por) fix Portuguese time

This commit is contained in:
odanoburu
2018-10-26 18:28:22 +00:00
parent 7e60a931c8
commit fa34877ea3

View File

@@ -59,68 +59,63 @@ lin
Year = NP ; Year = NP ;
param param
Period = Manhã | Tarde | Noite ; Period = Manha | Tarde | Noite | None ;
oper oper
noPrep : Prep = mkPrep [] ; noPrep : Prep = mkPrep [] ;
-- lin lin
-- timeunitAdv n time = timeunitAdv n time =
-- let n_card : Card = lin Card n; let n_card : Card = lin Card n;
-- n_hours_NP : NP = mkNP n_card time ; n_hours_NP : NP = mkNP n_card time ;
-- in S.mkAdv for_Prep n_hours_NP | S.mkAdv to_Prep n_hours_NP ;--| S.mkAdv (n_hours_NP.s ! R.Nom) ; in S.mkAdv for_Prep n_hours_NP | S.mkAdv to_Prep n_hours_NP ;--| S.mkAdv (n_hours_NP.s ! R.Nom) ;
-- oneHour = mkHour "1" Manhã Sg ; oneHour = mkHour "1" Manha Sg ;
-- twoHour = mkHour "2" Manhã Pl ; twoHour = mkHour "2" Manha Pl ;
-- threeHour = mkHour "3" Manhã Pl ; threeHour = mkHour "3" Manha Pl ;
-- fourHour = mkHour "4" Manhã Pl ; fourHour = mkHour "4" Manha Pl ;
-- fiveHour = mkHour "5" Manhã Pl ; fiveHour = mkHour "5" Manha Pl ;
-- sixHour = mkHour "6" Manhã Pl ; sixHour = mkHour "6" Manha Pl ;
-- sevenHour = mkHour "7" Manhã Pl ; sevenHour = mkHour "7" Manha Pl ;
-- eightHour = mkHour "8" Manhã Pl ; eightHour = mkHour "8" Manha Pl ;
-- nineHour = mkHour "9" Manhã Pl ; nineHour = mkHour "9" Manha Pl ;
-- tenHour = mkHour "10" Manhã Pl ; tenHour = mkHour "10" Manha Pl ;
-- elevenHour = mkHour "11" Manhã Pl ; elevenHour = mkHour "11" Manha Pl ;
-- twelveHour = mkHour "12" Tarde Pl ; twelveHour = {s = "meio-dia" ; pe = None ; n = Sg} ;
-- thirteenHour = mkHour "13" Tarde Sg ; thirteenHour = mkHour "13" Tarde Pl ;
-- fourteenHour = mkHour "14" Tarde Pl ; fourteenHour = mkHour "14" Tarde Pl ;
-- fifteenHour = mkHour "15" Tarde Pl ; fifteenHour = mkHour "15" Tarde Pl ;
-- sixteenHour = mkHour "16" Tarde Pl ; sixteenHour = mkHour "16" Tarde Pl ;
-- seventeenHour = mkHour "17" Noite Pl ; seventeenHour = mkHour "17" Tarde Pl ;
-- eighteenHour = mkHour "18" Noite Pl ; eighteenHour = mkHour "18" Tarde Pl ;
-- nineteenHour = mkHour "19" Noite Pl ; nineteenHour = mkHour "19" Noite Pl ;
-- twentyHour = mkHour "20" Noite Pl ; twentyHour = mkHour "20" Noite Pl ;
-- twentyOneHour = mkHour "21" Noite Pl ; twentyOneHour = mkHour "21" Noite Pl ;
-- twentyTwoHour = mkHour "22" Noite Pl ; twentyTwoHour = mkHour "22" Noite Pl ;
-- twentyThreeHour = mkHour "23" Noite Pl ; twentyThreeHour = mkHour "23" Noite Pl ;
-- twentyFourHour = mkHour "meia-noite" ; pe = Manhã ; n = Sg} ; twentyFourHour = {s = "meia-noite" ; pe = None ; n = Sg} ;
-- timeHour h = mkAdv (hourStr h) ; timeHour h = mkAdv (a ! h.n ++ h.s ++ period ! h.pe) ;
-- timeHourMinute h m = let timeHourMinute h m = let
-- min = m.s ! Masc ++ variants {"" ; numForms "minuto" "minutos" ! m.n} min = m.s ! Masc
-- in in
-- mkAdv (a ! h.n ++ h.s ++ (hora ! h.n | "") ++ "e" ++ min ++ variants {"" ; period ! h.pe}) ; mkAdv (a ! h.n ++ h.s ++ "e" ++ min ++ period ! h.pe) ;
-- oper oper
-- mkHour : Str -> Period -> Number ; mkHour : Str -> Period -> Number -> {s : Str ; pe : Period ; n : Number} ;
-- mkHour num p n = S.mkUtt (S.mkCard num) ** {p = p ; n = n} ; mkHour num pe n = S.mkUtt (S.mkCard num) ** {pe = pe ; n = n} ;
-- period : Period => Str ; period : Period => Str ;
-- period = table { period = table {
-- Manhã => "da manhã" ; Manha => "da manhã" ;
-- Tarde => "da tarde" ; Tarde => "da tarde" ;
-- Noite => "da noite" Noite => "da noite" ;
-- } ; None => ""
} ;
-- a : Number => Str ; a : Number => Str ;
-- a = numForms "à" "às" ; a = numForms "à" "às" ;
-- hora : Number => Str ;
-- hora = numForms "hora" "horas" ;
-- hourStr : Hour -> Str ;
-- hourStr h = a ! h.n ++ h.s ++ variants {"" ; ("" | hora ! h.n) ++ period ! h.pe ; hora ! h.n} ;
lin lin
weekdayPunctualAdv w = lin Adv {s = w.s ! C.Sg} ; -- lundi weekdayPunctualAdv w = lin Adv {s = w.s ! C.Sg} ; -- lundi