From 570e3a1e54ee17ccdb1f780697363561d6386a87 Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Fri, 30 Apr 2021 13:54:53 +0100
Subject: [PATCH] fix en-es name and filename

---
 api.go                                 | 1 -
 lang/admin/{es-ES.json => es-es.json}  | 2 +-
 lang/common/{es-ES.json => es-es.json} | 2 +-
 lang/email/{es-ES.json => es-es.json}  | 2 +-
 lang/form/{es-ES.json => es-es.json}   | 2 +-
 lang/setup/{es-ES.json => es-es.json}  | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename lang/admin/{es-ES.json => es-es.json} (99%)
 rename lang/common/{es-ES.json => es-es.json} (93%)
 rename lang/email/{es-ES.json => es-es.json} (99%)
 rename lang/form/{es-ES.json => es-es.json} (98%)
 rename lang/setup/{es-ES.json => es-es.json} (99%)

diff --git a/api.go b/api.go
index a44364b..8cbf83a 100644
--- a/api.go
+++ b/api.go
@@ -1668,7 +1668,6 @@ func (app *appContext) GetEmail(gc *gin.Context) {
 			newEmail = true
 			msg, err = app.email.constructWelcome("", time.Time{}, app, true)
 			content = msg.Text
-			conditionals = []string{"{yourAccountWillExpire}"}
 		} else {
 			variables = app.storage.customEmails.WelcomeEmail.Variables
 		}
diff --git a/lang/admin/es-ES.json b/lang/admin/es-es.json
similarity index 99%
rename from lang/admin/es-ES.json
rename to lang/admin/es-es.json
index 1906c10..a4379b3 100644
--- a/lang/admin/es-ES.json
+++ b/lang/admin/es-es.json
@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Inglés (US)"
+        "name": "Español (ES)"
     },
     "strings": {
         "invites": "Invitaciones",
diff --git a/lang/common/es-ES.json b/lang/common/es-es.json
similarity index 93%
rename from lang/common/es-ES.json
rename to lang/common/es-es.json
index bb874a4..5a1e8a6 100644
--- a/lang/common/es-ES.json
+++ b/lang/common/es-es.json
@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Inglés (US)"
+        "name": "Español (ES)"
     },
     "strings": {
         "username": "Nombre de usuario",
diff --git a/lang/email/es-ES.json b/lang/email/es-es.json
similarity index 99%
rename from lang/email/es-ES.json
rename to lang/email/es-es.json
index 0b4a05d..dbecfb5 100644
--- a/lang/email/es-ES.json
+++ b/lang/email/es-es.json
@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Inglés (US)"
+        "name": "Español (ES)"
     },
     "strings": {
         "ifItWasNotYou": "Si no fue usted, ignore este correo electrónico.",
diff --git a/lang/form/es-ES.json b/lang/form/es-es.json
similarity index 98%
rename from lang/form/es-ES.json
rename to lang/form/es-es.json
index 8db1ca8..38190ef 100644
--- a/lang/form/es-ES.json
+++ b/lang/form/es-es.json
@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Inglés (US)"
+        "name": "Español (ES)"
     },
     "strings": {
         "pageTitle": "Crear cuenta de Jellyfin",
diff --git a/lang/setup/es-ES.json b/lang/setup/es-es.json
similarity index 99%
rename from lang/setup/es-ES.json
rename to lang/setup/es-es.json
index 4b1b03e..c70c3fe 100644
--- a/lang/setup/es-ES.json
+++ b/lang/setup/es-es.json
@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Inglés (US)"
+        "name": "Español (ES)"
     },
     "strings": {
         "pageTitle": "Configuración - jfa-go",