From: Celine <celine_kappeler@gmx.de>
Date: Wed, 3 Apr 2024 19:03:11 +0000 (+0200)
Subject: V 0.1.2 Grammatik
X-Git-Url: https://gitweb.hamatoma.de/?a=commitdiff_plain;h=2ad57a0af30f2883a4e166131a038e5efbc35e8a;p=gadeku.git

V 0.1.2 Grammatik

- Korrekturen in GermanGrammar::verbPresent() und verbImperfect()
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b47c180..191a869 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,14 @@
+# V 0.1.2 Grammatik
+
+## Changed
+- Korrekturen in GermanGrammar::verbPresent() und verbImperfect()
+
 # V 0.1.1 Verb improvements
 
 # Added
 - GermanGrammar
 
-# Changed
+## Changed
 - only entry of infinitive on verbs
 
-# V 0.1.0 Initial commit
+## V 0.1.0 Initial commit
diff --git a/app/Helpers/GermanGrammar.php b/app/Helpers/GermanGrammar.php
index febc372..3814253 100644
--- a/app/Helpers/GermanGrammar.php
+++ b/app/Helpers/GermanGrammar.php
@@ -27,7 +27,7 @@ class GermanGrammar
             }
         } else {
             $end1 = 'ten';
-            $end2 = 'test';
+            $end3 = 'tet';
             if (str_ends_with($base, 't')) {
                 // rosten
                 $between = 'e';
@@ -41,7 +41,7 @@ class GermanGrammar
                     $rc = "$base$between$end1";
                     break;
                 case 2:
-                    $rc = "$base$between$end2";
+                    $rc = "$base$between$end3";
                     break;
             }
         }
@@ -56,8 +56,10 @@ class GermanGrammar
     {
         $base = substr($infinitive, 0, strlen($infinitive) - 2);
         if (str_ends_with($base, 's')) {
+            // reisen
             $end2 = 't';
         } else {
+            // kochen
             $end2 = 'st';
         }
         if ($singular) {
@@ -66,9 +68,11 @@ class GermanGrammar
                     $rc = $base . 'e';
                     break;
                 case 2:
-                default:
                     $rc = $base . $end2;
                     break;
+                default:
+                    $rc = $base . 't';
+                    break;
             }
         } else {
             switch ($person) {
@@ -77,7 +81,7 @@ class GermanGrammar
                     $rc = $base . 'en';
                     break;
                 case 2:
-                    $rc = $base . $end2;
+                    $rc = $base . 't';
                     break;
             }
         }
diff --git a/package-lock.json b/package-lock.json
index 555773d..d02a26e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
                 "bootstrap": "^5.2.3",
                 "laravel-vite-plugin": "^1.0",
                 "sass": "^1.56.1",
-                "vite": "^5.2.7"
+                "vite": "^5.2.8"
             }
         },
         "node_modules/@esbuild/aix-ppc64": {
@@ -1044,9 +1044,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.7.tgz",
-            "integrity": "sha512-k14PWOKLI6pMaSzAuGtT+Cf0YmIx12z9YGon39onaJNy8DLBfBJrzg9FQEmkAM5lpHBZs9wksWAsyF/HkpEwJA==",
+            "version": "5.2.8",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz",
+            "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.20.1",
diff --git a/package.json b/package.json
index 17849ec..207a576 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,6 @@
         "bootstrap": "^5.2.3",
         "laravel-vite-plugin": "^1.0",
         "sass": "^1.56.1",
-        "vite": "^5.2.7"
+        "vite": "^5.2.8"
     }
 }