From c224fd8f39e78b2d0b3f14f514cf0453ba2f4ac3 Mon Sep 17 00:00:00 2001
From: Olga <137053456+ImenaOphelia@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:08:34 +0100
Subject: [PATCH 1/2] Update spanish-transforms.js

Add subjunctive stem-changing verbs, more imperative forms and irregular gerund forms

Signed-off-by: Olga <137053456+ImenaOphelia@users.noreply.github.com>
---
 ext/js/language/es/spanish-transforms.js | 29 +++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/ext/js/language/es/spanish-transforms.js b/ext/js/language/es/spanish-transforms.js
index 202f1387a9..2bd32756c0 100644
--- a/ext/js/language/es/spanish-transforms.js
+++ b/ext/js/language/es/spanish-transforms.js
@@ -92,6 +92,9 @@ export const spanishTransforms = {
             description: 'feminine form of an adjective',
             rules: [
                 suffixInflection('a', 'o', ['adj'], ['adj']),
+                suffixInflection('a', '', ['adj'], ['adj']), // encantadora -> encantador, española -> español
+                ...[...'aeio'].map((v) => suffixInflection(`${v}na`, `${addAccent(v)}n`, ['adj'], ['adj'])), // dormilona -> dormilón, chiquitina -> chiquitín
+                ...[...'aeio'].map((v) => suffixInflection(`${v}sa`, `${addAccent(v)}s`, ['adj'], ['adj'])), // francesa -> francés
             ],
         },
         'present indicative': {
@@ -338,9 +341,18 @@ export const spanishTransforms = {
             name: 'progressive',
             description: 'Progressive form of a verb',
             rules: [
+                // regular
                 suffixInflection('ando', 'ar', ['v_ar'], ['v_ar']),
                 suffixInflection('iendo', 'er', ['v_er'], ['v_er']),
                 suffixInflection('iendo', 'ir', ['v_ir'], ['v_ir']),
+                // vowel before the ending (-yendo)
+                suffixInflection('ayendo', 'aer', ['v_er'], ['v_er']), // traer -> trayendo, caer -> cayendo
+                suffixInflection('eyendo', 'eer', ['v_er'], ['v_er']), // leer -> leyendo
+                suffixInflection('uyendo', 'uir', ['v_ir'], ['v_ir']), // huir -> huyendo
+                // irregular
+                wholeWordInflection('oyendo', 'oír', ['v'], ['v']),
+                wholeWordInflection('yendo', 'ir', ['v'], ['v']),
+                // TODO stem-changing verbs
             ],
         },
         'imperative': {
@@ -349,12 +361,15 @@ export const spanishTransforms = {
             rules: [
                 // -ar verbs
                 suffixInflection('a', 'ar', ['v_ar'], ['v_ar']),
+                suffixInflextion('emos', 'ar', ['v_ar'], ['v_ar']),
                 suffixInflection('ad', 'ar', ['v_ar'], ['v_ar']),
                 // -er verbs
                 suffixInflection('e', 'er', ['v_er'], ['v_er']),
+                suffixInflextion('amos', 'ar', ['v_er'], ['v_er']),
                 suffixInflection('ed', 'er', ['v_er'], ['v_er']),
                 // -ir verbs
                 suffixInflection('e', 'ir', ['v_ir'], ['v_ir']),
+                suffixInflextion('amos', 'ar', ['v_ir'], ['v_ir']),
                 suffixInflection('id', 'ir', ['v_ir'], ['v_ir']),
                 // irregular verbs
                 wholeWordInflection('diga', 'decir', ['v'], ['v']),
@@ -367,7 +382,19 @@ export const spanishTransforms = {
                 wholeWordInflection('di', 'decir', ['v'], ['v']),
                 wholeWordInflection('pon', 'poner', ['v'], ['v']),
                 wholeWordInflection('sal', 'salir', ['v'], ['v']),
-                // TODO: negative commands, nosotros & vosotros commands
+                // negative commands
+                // -ar verbs
+                suffixInflection('es', 'ar', ['v_ar'], ['v_ar']),
+                suffixInflection('emos', 'ar', ['v_ar'], ['v_ar']),
+                suffixInflection('éis', 'ar', ['v_ar'], ['v_ar']),
+                // -er verbs
+                suffixInflection('as', 'er', ['v_er'], ['v_er']),
+                suffixInflection('amos', 'er', ['v_er'], ['v_er']),
+                suffixInflection('áis', 'er', ['v_er'], ['v_er']),
+                // -ir verbs
+                suffixInflection('as', 'ir', ['v_ir'], ['v_ir']),
+                suffixInflection('amos', 'ir', ['v_ir'], ['v_ir']),
+                suffixInflection('áis', 'ir', ['v_ir'], ['v_ir']),
             ],
         },
         'conditional': {

From 9ac0e62cde8e5705cffa509f1078b9f07555b3ff Mon Sep 17 00:00:00 2001
From: Olga <137053456+ImenaOphelia@users.noreply.github.com>
Date: Sat, 30 Nov 2024 10:36:50 +0100
Subject: [PATCH 2/2] Update spanish-transforms.js

spelling errors

Signed-off-by: Olga <137053456+ImenaOphelia@users.noreply.github.com>
---
 ext/js/language/es/spanish-transforms.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/js/language/es/spanish-transforms.js b/ext/js/language/es/spanish-transforms.js
index 2bd32756c0..02d4c5c348 100644
--- a/ext/js/language/es/spanish-transforms.js
+++ b/ext/js/language/es/spanish-transforms.js
@@ -361,15 +361,15 @@ export const spanishTransforms = {
             rules: [
                 // -ar verbs
                 suffixInflection('a', 'ar', ['v_ar'], ['v_ar']),
-                suffixInflextion('emos', 'ar', ['v_ar'], ['v_ar']),
+                suffixInflection('emos', 'ar', ['v_ar'], ['v_ar']),
                 suffixInflection('ad', 'ar', ['v_ar'], ['v_ar']),
                 // -er verbs
                 suffixInflection('e', 'er', ['v_er'], ['v_er']),
-                suffixInflextion('amos', 'ar', ['v_er'], ['v_er']),
+                suffixInflection('amos', 'ar', ['v_er'], ['v_er']),
                 suffixInflection('ed', 'er', ['v_er'], ['v_er']),
                 // -ir verbs
                 suffixInflection('e', 'ir', ['v_ir'], ['v_ir']),
-                suffixInflextion('amos', 'ar', ['v_ir'], ['v_ir']),
+                suffixInflection('amos', 'ar', ['v_ir'], ['v_ir']),
                 suffixInflection('id', 'ir', ['v_ir'], ['v_ir']),
                 // irregular verbs
                 wholeWordInflection('diga', 'decir', ['v'], ['v']),