added the phrase "what time is it" in ten languages. For simplicity, this is a Greeting and not a Question, which means that it has a variant appearing with ! rather than ? , similar to "how are you". Correcting this would require analysing the structure of the phrase so that it can be constructed in QS.

13 files changed, 28 insertions, 13 deletions

diff --git a/examples/phrasebook/Greetings.gf b/examples/phrasebook/Greetings.gf
index 614824dc4..580b1560b 100644
--- a/examples/phrasebook/Greetings.gf
+++ b/examples/phrasebook/Greetings.gf
@@ -23,5 +23,6 @@ fun
   GCongratulations : Greeting ;
   GHappyBirthday : Greeting ;
   GGoodLuck : Greeting ; 
+  GWhatTime : Greeting ;
 
 }
diff --git a/examples/phrasebook/GreetingsBul.gf b/examples/phrasebook/GreetingsBul.gf
index 69da7a4e7..f271d7717 100644
--- a/examples/phrasebook/GreetingsBul.gf
+++ b/examples/phrasebook/GreetingsBul.gf
@@ -26,5 +26,6 @@ lin
   GCongratulations = mkGreeting "поздравления";
   GHappyBirthday = mkGreeting "честит рожден ден" ;
   GGoodLuck = mkGreeting "успех" ; 
+  GWhatTime = mkGreeting "колко е часът" ;
 
 }
diff --git a/examples/phrasebook/GreetingsChi.gf b/examples/phrasebook/GreetingsChi.gf
index d781d15be..ba08c52d9 100644
--- a/examples/phrasebook/GreetingsChi.gf
+++ b/examples/phrasebook/GreetingsChi.gf
@@ -27,5 +27,6 @@ lin
   GCongratulations = mkInterj "祝贺您" ;
   GHappyBirthday = mkInterj "祝你生日快乐" ;
   GGoodLuck = D.good_luck_Interj ;
+  GWhatTime = mkInterj "现在是什么时候" ;
 
 }
diff --git a/examples/phrasebook/GreetingsEng.gf b/examples/phrasebook/GreetingsEng.gf
index f00f2938b..1bfb75287 100644
--- a/examples/phrasebook/GreetingsEng.gf
+++ b/examples/phrasebook/GreetingsEng.gf
@@ -23,4 +23,5 @@ lin
   GCongratulations = mkGreeting "congratulations";
   GHappyBirthday = mkGreeting "happy birthday" ;
   GGoodLuck = mkGreeting "good luck" ; 
+  GWhatTime = mkGreeting "what time is it" | mkGreeting "what is the time" ;
 }
diff --git a/examples/phrasebook/GreetingsFin.gf b/examples/phrasebook/GreetingsFin.gf
index 40f2a519a..4fc71c1aa 100644
--- a/examples/phrasebook/GreetingsFin.gf
+++ b/examples/phrasebook/GreetingsFin.gf
@@ -25,4 +25,6 @@ lin
   GCongratulations = mkGreeting "onnittelut";
   GHappyBirthday = mkGreeting "hyv�� syntym�p�iv��" ;
   GGoodLuck = mkGreeting "onnea" ; 
+  GWhatTime = mkGreeting "paljonko kello on" | mkGreeting "mit� kello on" ;
+
 }
diff --git a/examples/phrasebook/GreetingsFre.gf b/examples/phrasebook/GreetingsFre.gf
index dca30e881..71faf5c66 100644
--- a/examples/phrasebook/GreetingsFre.gf
+++ b/examples/phrasebook/GreetingsFre.gf
@@ -26,5 +26,6 @@ lin
   GCongratulations = mkGreeting "f�licitations";
   GHappyBirthday = mkGreeting "joyeux anniversaire" ;
   GGoodLuck = mkGreeting "bonne chance" ; 
+  GWhatTime = mkGreeting "quelle heure est-il" ;
 
 }
diff --git a/examples/phrasebook/GreetingsGer.gf b/examples/phrasebook/GreetingsGer.gf
index f6c405b0b..f027d70ac 100644
--- a/examples/phrasebook/GreetingsGer.gf
+++ b/examples/phrasebook/GreetingsGer.gf
@@ -25,6 +25,7 @@ lin
   GCongratulations = mkGreeting "herzlichen Gl�ckwunsch";
   GHappyBirthday = mkGreeting "alles Gute zum Geburtstag" ;
   GGoodLuck = mkGreeting "viel Gl�ck" ; 
+  GWhatTime = mkGreeting "wieviel Uhr ist es" | mkGreeting "wie sp�t ist es" ;
 
 }
 
diff --git a/examples/phrasebook/GreetingsHin.gf b/examples/phrasebook/GreetingsHin.gf
index 97cba0489..06b641b33 100644
--- a/examples/phrasebook/GreetingsHin.gf
+++ b/examples/phrasebook/GreetingsHin.gf
@@ -26,4 +26,6 @@ lin
   GCongratulations = P.ss "बधाई हो";
   GHappyBirthday = P.ss "जन्मदिन की शुभकामनाएँ" ;
   GGoodLuck = P.ss "शुभकामनाएँ" ; 
+  GWhatTime = P.ss "कितने बजे हैं" ;
+
 }
diff --git a/examples/phrasebook/GreetingsIta.gf b/examples/phrasebook/GreetingsIta.gf
index 4263416f5..968c523eb 100644
--- a/examples/phrasebook/GreetingsIta.gf
+++ b/examples/phrasebook/GreetingsIta.gf
@@ -26,5 +26,6 @@ lin
   GCongratulations = mkGreeting "congratulazioni";
   GHappyBirthday = mkGreeting "buon compleanno" ;
   GGoodLuck = mkGreeting "buona fortuna" ; 
+  GWhatTime = mkGreeting "che ore sono" ;
 
 }
diff --git a/examples/phrasebook/GreetingsSpa.gf b/examples/phrasebook/GreetingsSpa.gf
index 604765a33..d0b39abd9 100644
--- a/examples/phrasebook/GreetingsSpa.gf
+++ b/examples/phrasebook/GreetingsSpa.gf
@@ -26,6 +26,6 @@ lin
   GSorryPol = mkGreeting "disculpe" ; 
   GThanks = mkGreeting "gracias" ;
   GTheCheck = mkGreeting "la cuenta" ;
-
+  GWhatTime = mkGreeting "qué ora es" ;
 
 }
diff --git a/examples/phrasebook/GreetingsSwe.gf b/examples/phrasebook/GreetingsSwe.gf
index 850c635d2..63d576884 100644
--- a/examples/phrasebook/GreetingsSwe.gf
+++ b/examples/phrasebook/GreetingsSwe.gf
@@ -24,5 +24,6 @@ lin
   GCongratulations = mkGreeting "grattis";
   GHappyBirthday = mkGreeting "grattis p� f�delsedagen" ;
   GGoodLuck = mkGreeting "lycka till" ; 
+  GWhatTime = mkGreeting "vad �r klockan" | mkGreeting "hur mycket �r klockan" ;
 
 }
diff --git a/examples/phrasebook/Makefile b/examples/phrasebook/Makefile
index 5d016b89b..f7d6b8549 100644
--- a/examples/phrasebook/Makefile
+++ b/examples/phrasebook/Makefile
@@ -1,6 +1,9 @@
 compile = runghc Compile 
 
-all: demo missing
+all: demo missing gfos
+
+gfos:
+	mkdir -p gfos && cp -p *.gfo gfos
 
 thaidroid: #thaiscript
 	cp -p Phrasebook.pgf FullPhrasebook.pgf
diff --git a/examples/phrasebook/missing.txt b/examples/phrasebook/missing.txt
index ed775b51a..bd2bdb8a7 100644
--- a/examples/phrasebook/missing.txt
+++ b/examples/phrasebook/missing.txt
@@ -1,21 +1,21 @@
 DisambPhrasebookEng : ObjPlur ThesPlur ThesePlur ThosePlur
 PhrasebookBul : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookCat : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookDan : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookDut : ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookCat : GWhatTime ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookDan : GWhatTime ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookDut : GWhatTime ObjPlur ThesPlur ThesePlur ThosePlur
 PhrasebookEng : ObjPlur ThesPlur ThesePlur ThosePlur
 PhrasebookFin : ObjPlur ThesPlur ThesePlur ThosePlur
 PhrasebookFre : ObjPlur ThesPlur ThesePlur ThosePlur
 PhrasebookGer : ObjPlur ThesPlur ThesePlur ThosePlur
 PhrasebookHin : AScared ATired MMust ObjPlur ThesPlur ThesePlur ThosePlur
 PhrasebookIta : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookLav : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookNor : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookPes : AHasAge AHasChildren AHasRoom AHasTable AmountCurrency Belgian DrinkNumber ItCost MCan MKnow MMust NNumeral ObjNumber ObjPlur PNumber PPrice ThesPlur ThesePlur ThosePlur V2Wait VWait
-PhrasebookPol : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookRon : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookRus : Belgian Belgium Flemish ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookLav : GWhatTime ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookNor : GWhatTime ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookPes : AHasAge AHasChildren AHasRoom AHasTable AmountCurrency Belgian DrinkNumber GWhatTime ItCost MCan MKnow MMust NNumeral ObjNumber ObjPlur PNumber PPrice ThesPlur ThesePlur ThosePlur V2Wait VWait
+PhrasebookPol : GWhatTime ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookRon : GWhatTime ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookRus : Belgian Belgium Flemish GWhatTime ObjPlur ThesPlur ThesePlur ThosePlur
 PhrasebookSpa : ObjPlur ThesPlur ThesePlur ThosePlur
 PhrasebookSwe : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookTha : ObjPlur ThesPlur ThesePlur ThosePlur
-PhrasebookUrd : MMust ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookTha : GWhatTime ObjPlur ThesPlur ThesePlur ThosePlur
+PhrasebookUrd : GWhatTime MMust ObjPlur ThesPlur ThesePlur ThosePlur