Merge branch 'NginxProxyManager:develop' into develop

frontend/check-locales.cjs

@@ -9,6 +9,7 @@
 const allLocales = [
 	["en", "en-US"],
 	["es", "es-ES"],
+	["de", "de-DE"],
 ];
 
 const ignoreUnused = [

frontend/src/locale/IntlProvider.tsx

@@ -1,23 +1,23 @@
 import { createIntl, createIntlCache } from "react-intl";
+import langDe from "./lang/de.json";
 import langEn from "./lang/en.json";
 import langEs from "./lang/es.json";
-import langDe from "./lang/de.json";
 import langList from "./lang/lang-list.json";
 
 // first item of each array should be the language code,
 // not the country code
 // Remember when adding to this list, also update check-locales.js script
 const localeOptions = [
-  ["en", "en-US"],
-  ["es", "es-ES"],
-	["de", "de-DE"]
+	["en", "en-US"],
+	["es", "es-ES"],
+	["de", "de-DE"],
 ];
 
 const loadMessages = (locale?: string): typeof langList & typeof langEn => {
 	const thisLocale = locale || "en";
 	switch (thisLocale.slice(0, 2)) {
-	  case "es":
-			return Object.assign({}, langList, langEs);
+		case "es":
+			return Object.assign({}, langList, langEn, langEs);
 		case "de":
 			return Object.assign({}, langList, langEn, langDe);
 		default:
@@ -27,8 +27,8 @@ const loadMessages = (locale?: string): typeof langList & typeof langEn => {
 
 const getFlagCodeForLocale = (locale?: string) => {
 	switch (locale) {
-	  case "es-ES":
-	  case "es":
+		case "es-ES":
+		case "es":
 			return "ES";
 		case "de-DE":
 		case "de":
@@ -56,10 +56,7 @@ const getLocale = (short = false) => {
 const cache = createIntlCache();
 
 const initialMessages = loadMessages(getLocale());
-let intl = createIntl(
-	{ locale: getLocale(), messages: initialMessages },
-	cache,
-);
+let intl = createIntl({ locale: getLocale(), messages: initialMessages }, cache);
 
 const changeLocale = (locale: string): void => {
 	const messages = loadMessages(locale);
@@ -99,12 +96,4 @@ const T = ({
 	);
 };
 
-export {
-	localeOptions,
-	getFlagCodeForLocale,
-	getLocale,
-	createIntl,
-	changeLocale,
-	intl,
-	T,
-};
+export { localeOptions, getFlagCodeForLocale, getLocale, createIntl, changeLocale, intl, T };

frontend/src/locale/lang/de.json

@@ -169,7 +169,7 @@
   "public": "Öffentlich",
   "redirection-host": "Redirection Host",
   "redirection-host.forward-domain": "Forward Domain",
-  "redirection-host.forward-http-code" : "HTTP Code",
+  "redirection-host.forward-http-code": "HTTP Code",
   "redirection-hosts": "Redirection Hosts",
   "redirection-hosts.count": "{count} {count, plural, one {Redirection Host} other {Redirection Hosts}}",
   "role.admin": "Administrator",
@@ -213,4 +213,4 @@
   "user.switch-light": "Zum Light Mode wechslen",
   "username": "Benutzername",
   "users": "Benutzer"
-}
+}

frontend/src/locale/lang/lang-list.json

@@ -2,4 +2,4 @@
   "locale-de-DE": "German",
   "locale-en-US": "English",
   "locale-es-ES": "Español"
-}
+}

frontend/src/locale/src/en.json

@@ -189,7 +189,7 @@
 		"defaultMessage": "Expires"
 	},
 	"column.http-code": {
-		"defaultMessage": "Access"
+		"defaultMessage": "HTTP Code"
 	},
 	"column.incoming-port": {
 		"defaultMessage": "Incoming Port"