diff --git a/generate.py b/generate.py index 3d96024..bd58a39 100755 --- a/generate.py +++ b/generate.py @@ -81,14 +81,18 @@ network = Network( ), hat_den = Choice( versuch = [": ",], - prüfungszeit = [f": Prüfung am {date} um ",], + prüfungszeit = [(f": Prüfung am {date} um ", f": exam on {date}, ")], augenfarbe = [": ",], ), augenfarbe = Choice( - augen = ["grüne ", "braune ", "blaue ",], + augen = [ + ("grüne ", "green "), + ("braune ", "brown "), + ("blaue ", "blue "), + ], ), augen = FixedText( - stop = "Augen.", + stop = ("Augen.", "eyes."), ), prüfungszeit = Choice( uhr = [ @@ -109,29 +113,28 @@ network = Network( ], ), uhr = FixedText( - stop = " Uhr.", - ), - prüfungsart = Choice( #inactive - prüfung = ["schriftliche ", "mündliche "], - ), - prüfung = FixedText( #inactive - stop = "Prüfung.", - ), - prüfungsname = Choice( #inactive - prüfungsname_end = get_names("chemie.csv"), - ), - prüfungsname_end = FixedText( #incative - stop = "'.", + stop = (" Uhr.", "."), ), versuch = Choice( - nicht = ["Erstversuch ", "1. Versuch "], - bestanden = ["Erstversuch ", "1. Versuch ", "Zweitversuch ", "2. Versuch "], + nicht = [ + ("Erstversuch ", "first attempt"), + ("1. Versuch ", "1st attempt"), + ], + bestanden = [ + ("Erstversuch ", "first attempt"), + ("1. Versuch ", "1st attempt"), + ("Zweitversuch ", "second attempt"), + ("2. Versuch ", "2nd attempt"), + ], ), nicht = Choice( - bestanden = ["nicht ", ""], + bestanden = [ + ("nicht ", "not "), + "" + ], ), bestanden = FixedText( - stop = "bestanden.", + stop = ("bestanden.", "passed."), ), )