diff options
| -rw-r--r-- | database/migrations/2016_01_04_143702_create_verbs_table.php | 2 | ||||
| -rw-r--r-- | database/seeds/VerbTableSeeder.php | 12 | ||||
| -rw-r--r-- | public/js/hebrewparsetrainer.js | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/database/migrations/2016_01_04_143702_create_verbs_table.php b/database/migrations/2016_01_04_143702_create_verbs_table.php index 81ed49e..f9bff98 100644 --- a/database/migrations/2016_01_04_143702_create_verbs_table.php +++ b/database/migrations/2016_01_04_143702_create_verbs_table.php @@ -36,7 +36,7 @@ class CreateVerbsTable extends Migration $table->string('stem', 24); $table->string('tense', 24); $table->enum('person', [1,2,3])->nullable(); - $table->enum('gender', ['m', 'f', 'c'])->nullable(); + $table->enum('gender', ['m', 'f'])->nullable(); $table->enum('number', ['s', 'p'])->nullable(); $table->timestamps(); diff --git a/database/seeds/VerbTableSeeder.php b/database/seeds/VerbTableSeeder.php index e8c97dd..89a8094 100644 --- a/database/seeds/VerbTableSeeder.php +++ b/database/seeds/VerbTableSeeder.php @@ -38,16 +38,22 @@ class VerbTableSeeder extends Seeder { Verb::create(['verb' => 'קָטַלְתְּ', 'root' => 'קטל', 'stem' => 'Qal', 'tense' => 'perfect', 'person' => 2, 'gender' => 'f', 'number' => 's']); Verb::create(['verb' => 'קָטַ֫לְתִּי', 'root' => 'קטל', 'stem' => 'Qal', - 'tense' => 'perfect', 'person' => 1, 'gender' => 'c', 'number' => 's']); + 'tense' => 'perfect', 'person' => 1, 'gender' => 'm', 'number' => 's']); + Verb::create(['verb' => 'קָטַ֫לְתִּי', 'root' => 'קטל', 'stem' => 'Qal', + 'tense' => 'perfect', 'person' => 1, 'gender' => 'f', 'number' => 's']); Verb::create(['verb' => 'קָֽטְלוּ', 'root' => 'קטל', 'stem' => 'Qal', - 'tense' => 'perfect', 'person' => 3, 'gender' => 'c', 'number' => 'p']); + 'tense' => 'perfect', 'person' => 3, 'gender' => 'm', 'number' => 'p']); + Verb::create(['verb' => 'קָֽטְלוּ', 'root' => 'קטל', 'stem' => 'Qal', + 'tense' => 'perfect', 'person' => 3, 'gender' => 'f', 'number' => 'p']); Verb::create(['verb' => 'קְטַלְתֶּם', 'root' => 'קטל', 'stem' => 'Qal', 'tense' => 'perfect', 'person' => 2, 'gender' => 'm', 'number' => 'p']); Verb::create(['verb' => 'קְטַלְתֶּן', 'root' => 'קטל', 'stem' => 'Qal', 'tense' => 'perfect', 'person' => 2, 'gender' => 'f', 'number' => 'p']); Verb::create(['verb' => 'קָטַ֫לְנוּ', 'root' => 'קטל', 'stem' => 'Qal', - 'tense' => 'perfect', 'person' => 1, 'gender' => 'c', 'number' => 'p']); + 'tense' => 'perfect', 'person' => 1, 'gender' => 'm', 'number' => 'p']); + Verb::create(['verb' => 'קָטַ֫לְנוּ', 'root' => 'קטל', 'stem' => 'Qal', + 'tense' => 'perfect', 'person' => 1, 'gender' => 'f', 'number' => 'p']); } }
\ No newline at end of file diff --git a/public/js/hebrewparsetrainer.js b/public/js/hebrewparsetrainer.js index 300715d..f98d5b9 100644 --- a/public/js/hebrewparsetrainer.js +++ b/public/js/hebrewparsetrainer.js @@ -130,7 +130,7 @@ $(document).ready(function(){ var genders = ['m', 'f', 'c', null]; var numbers = ['s', 'p', null]; - var re = /^\s*(\w+)\s+(\w+)(?:\s+(?:([123])\s*)?([mfc])\s*([sp])\s*)?$/; + var re = /^\s*(\w+)\s+(\w+)(?:\s+(?:([123])\s*)?([mf])\s*([sp])\s*)?$/; var match = parsing.match(re); if (match == null) return false; @@ -168,8 +168,7 @@ $(document).ready(function(){ function parsingToString(parsing, extended) { var genders = { 'm': 'masculine', - 'f': 'feminine', - 'c': 'communis generis' + 'f': 'feminine' }; var numbers = { 's': 'singular', |