diff options
| -rw-r--r-- | public/js/luoparsetrainer.js | 36 | ||||
| -rw-r--r-- | resources/views/trainer.blade.php | 4 |
2 files changed, 23 insertions, 17 deletions
diff --git a/public/js/luoparsetrainer.js b/public/js/luoparsetrainer.js index 092fba8..45965d8 100644 --- a/public/js/luoparsetrainer.js +++ b/public/js/luoparsetrainer.js @@ -44,9 +44,9 @@ $(document).ready(function(){ , 'inf ': 'Infinitivus' }; break; case 2: - buts = { 'Act ': 'Activum' - , 'Med ': 'Medium' - , 'Pass ': 'Passivum' + buts = { 'act ': 'Activum' + , 'med ': 'Medium' + , 'pass ': 'Passivum' }; break; case 3: if (val.match(/ inf /)) { @@ -138,7 +138,7 @@ $(document).ready(function(){ <div class='col-md-12'>\ <div class='form-group'>\ <label for='trainer-input-"+input_count+"'>Determineer:</label>\ - <input type='text' class='form-control' id='trainer-input-"+input_count+"' placeholder='Bijvoorbeeld: pr ind Act 1 ev' spellcheck='false'/>\ + <input type='text' class='form-control' id='trainer-input-"+input_count+"' placeholder='Bijvoorbeeld: pr ind act 1 ev' spellcheck='false'/>\ </div>\ </div>\ </div>"; @@ -245,16 +245,15 @@ $(document).ready(function(){ function findVoice(voice) { switch (voice) { - case 'Act': return 'A'; - case 'Med': return 'M'; - case 'Pass': return 'P'; - case 'Med-pass': return 'MP'; + case 'act': return 'A'; + case 'med': return 'M'; + case 'pass': return 'P'; default: return undefined; } } function parseAnswer(parsing) { - var match = parsing.match(/^\s*(pr|impf|aor|fut|pf|pqpf)\s+(ind|conj|opt|imp!)\s+(Act|Med|Pass|Med-pass)\s+([123])\s*([em]v)\s*$/); + var match = parsing.match(/^\s*(pr|impf|aor|fut|pf|pqpf)\s+(ind|conj|opt|imp!)\s+(act|med|pass)\s+([123])\s*([em]v)\s*$/); if (match) { var tense = findTense(match[1]); var mode = findMode(match[2]); @@ -274,7 +273,7 @@ $(document).ready(function(){ }; } - match = parsing.match(/^\s*(pr|impf|aor|fut|pf|pqpf)\s+ptc\s+(Act|Med|Pass|Med-pass)\s+([MFN])\s+(nom|gen|dat|acc)\s+([em]v)\s*$/); + match = parsing.match(/^\s*(pr|impf|aor|fut|pf|pqpf)\s+ptc\s+(act|med|pass)\s+([MFN])\s+(nom|gen|dat|acc)\s+([em]v)\s*$/); if (match) { var tense = findTense(match[1]); var voice = findVoice(match[2]); @@ -293,7 +292,7 @@ $(document).ready(function(){ }; } - match = parsing.match(/^\s*(pr|impf|aor|fut|pf|pqpf)\s+inf\s+(Act|Med|Pass|Med-pass)\s*$/); + match = parsing.match(/^\s*(pr|impf|aor|fut|pf|pqpf)\s+inf\s+(act|med|pass)\s*$/); if (match) { var tense = findTense(match[1]); var voice = findVoice(match[2]); @@ -333,11 +332,18 @@ $(document).ready(function(){ } } - function parsingToString(parsing, abbr) { - var tense = abbr === true ? abbreviate(parsing.tense) : parsing.tense; - var mode = abbr === true ? abbreviate(parsing.mode) : parsing.mode; + function parsingToString(parsing) { + var tense = parsing.tense; + var mode = parsing.mode; + var voice; + switch (parsing.voice) { + case 'A': voice = 'act'; break; + case 'M': voice = 'med'; break; + case 'P': voice = 'pass'; break; + default: voice = parsing.voice; + } var number = parsing.number == 'sg' ? 'ev' : 'mv'; - var tense_mode_voice = [tense, mode, parsing.voice].join(' '); + var tense_mode_voice = [tense, mode, voice].join(' '); switch (parsing.mode) { case 'infinitivus': diff --git a/resources/views/trainer.blade.php b/resources/views/trainer.blade.php index 6540f3b..1d16411 100644 --- a/resources/views/trainer.blade.php +++ b/resources/views/trainer.blade.php @@ -53,7 +53,7 @@ use LuoParseTrainer\Tense; @section('content') <div id="trainer"> <div id="trainer-input-container"> - <p class="bg-danger" id="trainer-404">There are no verbs matching the criteria in our database.</p> + <p class="bg-danger" id="trainer-404">Er staan geen werkwoorden met de gevraagde vorm in de database.</p> <p class="lead"><span class="greek greek-large" id="trainer-verb"></span><span id="trainer-answer"></span></p> </div> <div id="trainer-input-fancy"></div> @@ -67,7 +67,7 @@ use LuoParseTrainer\Tense; <p> <strong>Tempora</strong> (tijden): gebruik de afkortingen pr(aesens), imp(er)f(ectum), aor(istus), fut(urum), p(er)f(ectum) en p(lus)q(uam)p(er)f(ectum).<br/> <strong>Modi</strong> (wijzen): ind(icativus), conj(unctivus), opt(ativus), imp!(erativus), p(ar)t(i)c(ipium), inf(initivus).<br/> - <strong>Genera</strong>: Act(ivum), Med(ium), Pass(ivum).<br/> + <strong>Genera</strong>: act(ivum), med(ium), pass(ivum).<br/> <strong>Persoon</strong> (indien van toepassing): 1, 2 of 3.<br/> <strong>Geslacht</strong> (indien van toepassing): M(asculinum), F(emininum), N(eutrum).<br/> <strong>Naamval</strong> (indien van toepassing): nom(inativus), gen(itivus), dat(ivus), acc(usativus).<br/> |