admin/Spanish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Add English translations to exceptional yo forms' (#20) from issue/19-exceptional-yo-english into main

Browse Source 
Reviewed-on: #20
This commit was merged in pull request #20.
This commit is contained in:
admin
2026-04-16 08:03:35 -05:00
parent ff4f906128 5b69f3b630
commit b17fb49d49
3 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Conjuga/Conjuga/Services/DataLoader.swift
View File

@@ -3,7 +3,7 @@ import SharedModels
import Foundation import Foundation
actor DataLoader { actor DataLoader {
static let courseDataVersion = 5 static let courseDataVersion = 6
static let courseDataKey = "courseDataVersion" static let courseDataKey = "courseDataVersion"
/// Quick check: does the DB need seeding or course data refresh? /// Quick check: does the DB need seeding or course data refresh?

2
Conjuga/Conjuga/course_data.json
View File

File diff suppressed because one or more lines are too long

100
Conjuga/Scripts/course_data.json
View File

@@ -8486,7 +8486,7 @@
"cards": [ "cards": [
{ {
"front": "tener", "front": "tener",
"back": "tengo", "back": "tengo — I have",
"examples": [ "examples": [
{ {
"es": "The Spanish Verb \"Tener\"", "es": "The Spanish Verb \"Tener\"",
@@ -8504,7 +8504,7 @@
}, },
{ {
"front": "venir", "front": "venir",
"back": "vengo", "back": "vengo — I come",
"examples": [ "examples": [
{ {
"es": "Lo mejor está por venir.", "es": "Lo mejor está por venir.",
@@ -8522,7 +8522,7 @@
}, },
{ {
"front": "hacer", "front": "hacer",
"back": "hago", "back": "hago — I do, I make",
"examples": [ "examples": [
{ {
"es": "Expressions with \"Hacer\"", "es": "Expressions with \"Hacer\"",
@@ -8540,7 +8540,7 @@
}, },
{ {
"front": "salir", "front": "salir",
"back": "salgo", "back": "salgo — I go out",
"examples": [ "examples": [
{ {
"es": "Usa el ascensor para salir.", "es": "Usa el ascensor para salir.",
@@ -8558,7 +8558,7 @@
}, },
{ {
"front": "caer", "front": "caer",
"back": "caigo", "back": "caigo — I fall",
"examples": [ "examples": [
{ {
"es": "¡Acabo de caer en que tengo una cita con el dentista en diez minutos!", "es": "¡Acabo de caer en que tengo una cita con el dentista en diez minutos!",
@@ -8576,7 +8576,7 @@
}, },
{ {
"front": "traer", "front": "traer",
"back": "traigo", "back": "traigo — I bring",
"examples": [ "examples": [
{ {
"es": "Esto puede traer cambios profundos en bares, discotecas y restaurantes.", "es": "Esto puede traer cambios profundos en bares, discotecas y restaurantes.",
@@ -8594,7 +8594,7 @@
}, },
{ {
"front": "poner", "front": "poner",
"back": "pongo", "back": "pongo — I put",
"examples": [ "examples": [
{ {
"es": "Después de bañar a la bebé, hay que ponerle ropa limpia.", "es": "Después de bañar a la bebé, hay que ponerle ropa limpia.",
@@ -8612,7 +8612,7 @@
}, },
{ {
"front": "decir", "front": "decir",
"back": "digo", "back": "digo — I say",
"examples": [ "examples": [
{ {
"es": "¿Jura decir la verdad?", "es": "¿Jura decir la verdad?",
@@ -8630,7 +8630,7 @@
}, },
{ {
"front": "conducir", "front": "conducir",
"back": "conduzco", "back": "conduzco — I lead, I drive",
"examples": [ "examples": [
{ {
"es": "conducir(kohn-doo-seer)", "es": "conducir(kohn-doo-seer)",
@@ -8648,7 +8648,7 @@
}, },
{ {
"front": "conocer", "front": "conocer",
"back": "conozco", "back": "conozco — I know, I meet",
"examples": [ "examples": [
{ {
"es": "conocer(koh-noh-sehr)", "es": "conocer(koh-noh-sehr)",
@@ -8666,7 +8666,7 @@
}, },
{ {
"front": "agradecer", "front": "agradecer",
"back": "agradezco", "back": "agradezco — I thank",
"examples": [ "examples": [
{ {
"es": "agradecer(ah-grah-deh-sehr)", "es": "agradecer(ah-grah-deh-sehr)",
@@ -8684,7 +8684,7 @@
}, },
{ {
"front": "parecer", "front": "parecer",
"back": "parezco", "back": "parezco — I seem",
"examples": [ "examples": [
{ {
"es": "parecer(pah-reh-sehr)", "es": "parecer(pah-reh-sehr)",
@@ -8702,7 +8702,7 @@
}, },
{ {
"front": "crecer", "front": "crecer",
"back": "crezco", "back": "crezco — I grow",
"examples": [ "examples": [
{ {
"es": "crecer(kreh-sehr)", "es": "crecer(kreh-sehr)",
@@ -8720,7 +8720,7 @@
}, },
{ {
"front": "producir", "front": "producir",
"back": "produzco", "back": "produzco — I produce",
"examples": [ "examples": [
{ {
"es": "producir(proh-doo-seer)", "es": "producir(proh-doo-seer)",
@@ -8738,7 +8738,7 @@
}, },
{ {
"front": "traducir", "front": "traducir",
"back": "traduzco", "back": "traduzco — I translate",
"examples": [ "examples": [
{ {
"es": "traducir(trah-doo-seer)", "es": "traducir(trah-doo-seer)",
@@ -8756,7 +8756,7 @@
}, },
{ {
"front": "establecer", "front": "establecer",
"back": "establezco", "back": "establezco — I establish",
"examples": [ "examples": [
{ {
"es": "establecer(ehs-tah-bleh-sehr)", "es": "establecer(ehs-tah-bleh-sehr)",
@@ -8774,7 +8774,7 @@
}, },
{ {
"front": "elejir", "front": "elejir",
"back": "elijo", "back": "elijo — I choose",
"examples": [ "examples": [
{ {
"es": "En realidad cada persona será libre de elejir su comida.", "es": "En realidad cada persona será libre de elejir su comida.",
@@ -8792,7 +8792,7 @@
}, },
{ {
"front": "proteger", "front": "proteger",
"back": "protejo", "back": "protejo — I protect",
"examples": [ "examples": [
{ {
"es": "proteger(proh-teh-hehr)", "es": "proteger(proh-teh-hehr)",
@@ -8810,7 +8810,7 @@
}, },
{ {
"front": "dirigir", "front": "dirigir",
"back": "dirijo", "back": "dirijo — I manage, I direct",
"examples": [ "examples": [
{ {
"es": "dirigir(dee-ree-heer)", "es": "dirigir(dee-ree-heer)",
@@ -8828,7 +8828,7 @@
}, },
{ {
"front": "fingir", "front": "fingir",
"back": "finjo", "back": "finjo — I pretend, I feign",
"examples": [ "examples": [
{ {
"es": "fingir(feen-heer)", "es": "fingir(feen-heer)",
@@ -8846,7 +8846,7 @@
}, },
{ {
"front": "sumergir", "front": "sumergir",
"back": "sumerjo", "back": "sumerjo — I submerge",
"examples": [ "examples": [
{ {
"es": "sumergir(soo-mehr-heer)", "es": "sumergir(soo-mehr-heer)",
@@ -8864,7 +8864,7 @@
}, },
{ {
"front": "ver", "front": "ver",
"back": "veo", "back": "veo — I see",
"examples": [ "examples": [
{ {
"es": "¿Quieres ver mi carro nuevo?", "es": "¿Quieres ver mi carro nuevo?",
@@ -8882,7 +8882,7 @@
}, },
{ {
"front": "saber", "front": "saber",
"back": "sé", "back": "sé — I know, I taste",
"examples": [ "examples": [
{ {
"es": "El saber popular se basa en creencias.", "es": "El saber popular se basa en creencias.",
@@ -8900,7 +8900,7 @@
}, },
{ {
"front": "distinguir", "front": "distinguir",
"back": "distingo", "back": "distingo — I distinguish",
"examples": [ "examples": [
{ {
"es": "distinguir(dees-teeng-geer)", "es": "distinguir(dees-teeng-geer)",
@@ -8918,7 +8918,7 @@
}, },
{ {
"front": "oír", "front": "oír",
"back": "oigo", "back": "oigo — I hear",
"examples": [ "examples": [
{ {
"es": "Me quejé a mucha gente, pero nadie quiso oírme.", "es": "Me quejé a mucha gente, pero nadie quiso oírme.",
@@ -8943,7 +8943,7 @@
"cards": [ "cards": [
{ {
"front": "tener", "front": "tener",
"back": "tengo", "back": "tengo — I have",
"examples": [ "examples": [
{ {
"es": "The Spanish Verb \"Tener\"", "es": "The Spanish Verb \"Tener\"",
@@ -8961,7 +8961,7 @@
}, },
{ {
"front": "venir", "front": "venir",
"back": "vengo", "back": "vengo — I come",
"examples": [ "examples": [
{ {
"es": "Lo mejor está por venir.", "es": "Lo mejor está por venir.",
@@ -8979,7 +8979,7 @@
}, },
{ {
"front": "hacer", "front": "hacer",
"back": "hago", "back": "hago — I do, I make",
"examples": [ "examples": [
{ {
"es": "Expressions with \"Hacer\"", "es": "Expressions with \"Hacer\"",
@@ -8997,7 +8997,7 @@
}, },
{ {
"front": "salir", "front": "salir",
"back": "salgo", "back": "salgo — I go out",
"examples": [ "examples": [
{ {
"es": "Usa el ascensor para salir.", "es": "Usa el ascensor para salir.",
@@ -9015,7 +9015,7 @@
}, },
{ {
"front": "caer", "front": "caer",
"back": "caigo", "back": "caigo — I fall",
"examples": [ "examples": [
{ {
"es": "¡Acabo de caer en que tengo una cita con el dentista en diez minutos!", "es": "¡Acabo de caer en que tengo una cita con el dentista en diez minutos!",
@@ -9033,7 +9033,7 @@
}, },
{ {
"front": "traer", "front": "traer",
"back": "traigo", "back": "traigo — I bring",
"examples": [ "examples": [
{ {
"es": "Esto puede traer cambios profundos en bares, discotecas y restaurantes.", "es": "Esto puede traer cambios profundos en bares, discotecas y restaurantes.",
@@ -9051,7 +9051,7 @@
}, },
{ {
"front": "poner", "front": "poner",
"back": "pongo", "back": "pongo — I put",
"examples": [ "examples": [
{ {
"es": "Después de bañar a la bebé, hay que ponerle ropa limpia.", "es": "Después de bañar a la bebé, hay que ponerle ropa limpia.",
@@ -9069,7 +9069,7 @@
}, },
{ {
"front": "decir", "front": "decir",
"back": "digo", "back": "digo — I say",
"examples": [ "examples": [
{ {
"es": "¿Jura decir la verdad?", "es": "¿Jura decir la verdad?",
@@ -9087,7 +9087,7 @@
}, },
{ {
"front": "conducir", "front": "conducir",
"back": "conduzco", "back": "conduzco — I lead, I drive",
"examples": [ "examples": [
{ {
"es": "conducir(kohn-doo-seer)", "es": "conducir(kohn-doo-seer)",
@@ -9105,7 +9105,7 @@
}, },
{ {
"front": "conocer", "front": "conocer",
"back": "conozco", "back": "conozco — I know, I meet",
"examples": [ "examples": [
{ {
"es": "conocer(koh-noh-sehr)", "es": "conocer(koh-noh-sehr)",
@@ -9123,7 +9123,7 @@
}, },
{ {
"front": "agradecer", "front": "agradecer",
"back": "agradezco", "back": "agradezco — I thank",
"examples": [ "examples": [
{ {
"es": "agradecer(ah-grah-deh-sehr)", "es": "agradecer(ah-grah-deh-sehr)",
@@ -9141,7 +9141,7 @@
}, },
{ {
"front": "parecer", "front": "parecer",
"back": "parezco", "back": "parezco — I seem",
"examples": [ "examples": [
{ {
"es": "parecer(pah-reh-sehr)", "es": "parecer(pah-reh-sehr)",
@@ -9159,7 +9159,7 @@
}, },
{ {
"front": "crecer", "front": "crecer",
"back": "crezco", "back": "crezco — I grow",
"examples": [ "examples": [
{ {
"es": "crecer(kreh-sehr)", "es": "crecer(kreh-sehr)",
@@ -9177,7 +9177,7 @@
}, },
{ {
"front": "producir", "front": "producir",
"back": "produzco", "back": "produzco — I produce",
"examples": [ "examples": [
{ {
"es": "producir(proh-doo-seer)", "es": "producir(proh-doo-seer)",
@@ -9195,7 +9195,7 @@
}, },
{ {
"front": "traducir", "front": "traducir",
"back": "traduzco", "back": "traduzco — I translate",
"examples": [ "examples": [
{ {
"es": "traducir(trah-doo-seer)", "es": "traducir(trah-doo-seer)",
@@ -9213,7 +9213,7 @@
}, },
{ {
"front": "establecer", "front": "establecer",
"back": "establezco", "back": "establezco — I establish",
"examples": [ "examples": [
{ {
"es": "establecer(ehs-tah-bleh-sehr)", "es": "establecer(ehs-tah-bleh-sehr)",
@@ -9231,7 +9231,7 @@
}, },
{ {
"front": "elejir", "front": "elejir",
"back": "elijo", "back": "elijo — I choose",
"examples": [ "examples": [
{ {
"es": "En realidad cada persona será libre de elejir su comida.", "es": "En realidad cada persona será libre de elejir su comida.",
@@ -9249,7 +9249,7 @@
}, },
{ {
"front": "proteger", "front": "proteger",
"back": "protejo", "back": "protejo — I protect",
"examples": [ "examples": [
{ {
"es": "proteger(proh-teh-hehr)", "es": "proteger(proh-teh-hehr)",
@@ -9267,7 +9267,7 @@
}, },
{ {
"front": "dirigir", "front": "dirigir",
"back": "dirijo", "back": "dirijo — I manage, I direct",
"examples": [ "examples": [
{ {
"es": "dirigir(dee-ree-heer)", "es": "dirigir(dee-ree-heer)",
@@ -9285,7 +9285,7 @@
}, },
{ {
"front": "fingir", "front": "fingir",
"back": "finjo", "back": "finjo — I pretend, I feign",
"examples": [ "examples": [
{ {
"es": "fingir(feen-heer)", "es": "fingir(feen-heer)",
@@ -9303,7 +9303,7 @@
}, },
{ {
"front": "sumergir", "front": "sumergir",
"back": "sumerjo", "back": "sumerjo — I submerge",
"examples": [ "examples": [
{ {
"es": "sumergir(soo-mehr-heer)", "es": "sumergir(soo-mehr-heer)",
@@ -9321,7 +9321,7 @@
}, },
{ {
"front": "ver", "front": "ver",
"back": "veo", "back": "veo — I see",
"examples": [ "examples": [
{ {
"es": "¿Quieres ver mi carro nuevo?", "es": "¿Quieres ver mi carro nuevo?",
@@ -9339,7 +9339,7 @@
}, },
{ {
"front": "saber", "front": "saber",
"back": "sé", "back": "sé — I know, I taste",
"examples": [ "examples": [
{ {
"es": "El saber popular se basa en creencias.", "es": "El saber popular se basa en creencias.",
@@ -9357,7 +9357,7 @@
}, },
{ {
"front": "distinguir", "front": "distinguir",
"back": "distingo", "back": "distingo — I distinguish",
"examples": [ "examples": [
{ {
"es": "distinguir(dees-teeng-geer)", "es": "distinguir(dees-teeng-geer)",
@@ -9375,7 +9375,7 @@
}, },
{ {
"front": "oír", "front": "oír",
"back": "oigo", "back": "oigo — I hear",
"examples": [ "examples": [
{ {
"es": "Me quejé a mucha gente, pero nadie quiso oírme.", "es": "Me quejé a mucha gente, pero nadie quiso oírme.",