merge lang changes back in

Added translation using Weblate (German (Low))
2024-11-09 20:00:12 +00:00 · 2023-06-22 22:01:37 +01:00 · 2023-06-22 23:00:57 +02:00 · 2023-06-22 23:00:57 +02:00 · 2023-06-22 21:57:19 +01:00
7 changed files with 181 additions and 3 deletions
--- a/config/config-base.json
+++ b/config/config-base.json
@ -403,7 +403,7 @@
                    "value": "",
                    "depends_true": "enabled",
                    "required": "false",
-                    "description": "Click the edit icon next to the \"User Page\" Setting to add custom Markdown messages that will be shown to the user."
+                    "description": "Click the edit icon next to the \"User Page\" Setting to add custom Markdown messages that will be shown to the user. Note message cards are not private, little effort is required for anyone to view them."
                }
            }
        },
--- a/html/form-base.html
+++ b/html/form-base.html
@ -30,6 +30,7 @@
    window.reCAPTCHA = {{ .reCAPTCHA }};
    window.reCAPTCHASiteKey = "{{ .reCAPTCHASiteKey }}";
    window.userPageEnabled = {{ .userPageEnabled }};
+    window.userPageAddress = "{{ .userPageAddress }}";
 </script>
 {{ if .passwordReset }}
 <script src="js/pwr.js" type="module"></script>
--- a/html/user.html
+++ b/html/user.html
@ -26,7 +26,7 @@
            window.validationStrings = JSON.parse({{ .validationStrings }});
        </script>
        {{ template "header.html" . }}
-        <title>{{ .lang.Strings.myAccount }}</title>
+        <title>{{ .strings.myAccount }}</title>
    </head>
    <body class="max-w-full overflow-x-hidden section">
        <div id="modal-email" class="modal">
--- a/lang/setup/nds.json
+++ b/lang/setup/nds.json
@ -0,0 +1,152 @@
+{
+    "meta": {
+        "name": ""
+    },
+    "strings": {
+        "pageTitle": "",
+        "next": "",
+        "back": "",
+        "optional": "",
+        "serverType": "",
+        "disabled": "",
+        "enabled": "",
+        "port": "",
+        "message": "",
+        "serverAddress": "",
+        "emailSubject": "",
+        "URL": "",
+        "apiKey": "",
+        "error": "",
+        "errorInvalidUserPass": "",
+        "errorNotAdmin": "",
+        "errorUserDisabled": "",
+        "error404": "",
+        "errorConnectionRefused": "",
+        "errorUnknown": ""
+    },
+    "startPage": {
+        "welcome": "",
+        "pressStart": "",
+        "httpsNotice": "",
+        "start": ""
+    },
+    "endPage": {
+        "finished": "",
+        "restartMessage": "",
+        "refreshPage": ""
+    },
+    "language": {
+        "title": "",
+        "description": "",
+        "defaultAdminLang": "",
+        "defaultFormLang": "",
+        "defaultEmailLang": ""
+    },
+    "general": {
+        "title": "",
+        "listenAddress": "",
+        "urlBase": "",
+        "urlBaseNotice": "",
+        "lightTheme": "",
+        "darkTheme": "",
+        "useHTTPS": "",
+        "httpsPort": "",
+        "useHTTPSNotice": "",
+        "pathToCertificate": "",
+        "pathToKeyFile": ""
+    },
+    "updates": {
+        "title": "",
+        "description": "",
+        "updateChannel": "",
+        "stable": "",
+        "unstable": ""
+    },
+    "login": {
+        "title": "",
+        "description": "",
+        "authorizeWithJellyfin": "",
+        "authorizeManual": "",
+        "adminOnly": "",
+        "allowAll": "",
+        "allowAllDescription": "",
+        "emailNotice": ""
+    },
+    "jellyfinEmby": {
+        "title": "",
+        "description": "",
+        "embyNotice": "",
+        "internal": "",
+        "external": "",
+        "replaceJellyfin": "",
+        "replaceJellyfinNotice": "",
+        "addressExternalNotice": "",
+        "testConnection": ""
+    },
+    "ombi": {
+        "title": "",
+        "description": "",
+        "apiKeyNotice": ""
+    },
+    "messages": {
+        "title": "",
+        "description": ""
+    },
+    "email": {
+        "title": "",
+        "description": "",
+        "method": "",
+        "useEmailAsUsername": "",
+        "useEmailAsUsernameNotice": "",
+        "fromAddress": "",
+        "senderName": "",
+        "dateFormat": "",
+        "dateFormatNotice": "",
+        "encryption": "",
+        "mailgunApiURL": ""
+    },
+    "notifications": {
+        "title": "",
+        "description": ""
+    },
+    "welcomeEmails": {
+        "title": "",
+        "description": ""
+    },
+    "inviteEmails": {
+        "title": "",
+        "description": ""
+    },
+    "passwordResets": {
+        "title": "",
+        "description": "",
+        "pathToJellyfin": "",
+        "pathToJellyfinNotice": "",
+        "resetLinks": "",
+        "resetLinksNotice": "",
+        "resetLinksLanguage": "",
+        "setPassword": "",
+        "setPasswordNotice": ""
+    },
+    "passwordValidation": {
+        "title": "",
+        "description": "",
+        "length": "",
+        "uppercase": "",
+        "lowercase": "",
+        "numbers": "",
+        "special": ""
+    },
+    "helpMessages": {
+        "title": "",
+        "description": "",
+        "contactMessage": "",
+        "contactMessageNotice": "",
+        "helpMessage": "",
+        "helpMessageNotice": "",
+        "successMessage": "",
+        "successMessageNotice": "",
+        "emailMessage": "",
+        "emailMessageNotice": ""
+    }
+}
--- a/lang/telegram/nds.json
+++ b/lang/telegram/nds.json
@ -0,0 +1,16 @@
+{
+    "meta": {
+        "name": ""
+    },
+    "strings": {
+        "startMessage": "",
+        "discordStartMessage": "",
+        "matrixStartMessage": "",
+        "invalidPIN": "",
+        "pinSuccess": "",
+        "languageMessage": "",
+        "languageMessageDiscord": "",
+        "languageSet": "",
+        "discordDMs": ""
+    }
+}
--- a/ts/form.ts
+++ b/ts/form.ts
@ -36,6 +36,7 @@ interface formWindow extends Window {
    reCAPTCHA: boolean;
    reCAPTCHASiteKey: string;
    userPageEnabled: boolean;
+    userPageAddress: string;
 }

 loadLangSelector("form");
@ -348,7 +349,8 @@ const create = (event: SubmitEvent) => {
                } else {
                    if (window.userPageEnabled) {
                        const userPageNoticeArea = document.getElementById("modal-success-user-page-area");
-                        userPageNoticeArea.textContent = userPageNoticeArea.textContent.replace("{myAccount}", userPageNoticeArea.getAttribute("my-account-term"));
+                        const link = `<a href="${window.userPageAddress}" target="_blank">${userPageNoticeArea.getAttribute("my-account-term")}</a>`;
+                        userPageNoticeArea.innerHTML = userPageNoticeArea.textContent.replace("{myAccount}", link);
                    }
                    window.successModal.show();
                }
--- a/views.go
+++ b/views.go
@ -596,6 +596,12 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
 	discord := discordEnabled && app.config.Section("discord").Key("show_on_reg").MustBool(true)
 	matrix := matrixEnabled && app.config.Section("matrix").Key("show_on_reg").MustBool(true)

+	userPageAddress := app.config.Section("invite_emails").Key("url_base").String()
+	if userPageAddress == "" {
+		userPageAddress = app.config.Section("password_resets").Key("url_base").String()
+	}
+	userPageAddress += "/my/account"
+
 	data := gin.H{
 		"urlBase":            app.getURLBase(gc),
 		"cssClass":           app.cssClass,
@ -630,6 +636,7 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
 		"reCAPTCHA":          app.config.Section("captcha").Key("recaptcha").MustBool(false),
 		"reCAPTCHASiteKey":   app.config.Section("captcha").Key("recaptcha_site_key").MustString(""),
 		"userPageEnabled":    app.config.Section("user_page").Key("enabled").MustBool(false),
+		"userPageAddress":    userPageAddress,
 	}
 	if telegram {
 		data["telegramPIN"] = app.telegram.NewAuthToken()
Author	SHA1	Message	Date
Harvey Tindall	9bcbffde5d	merge lang changes back in	2023-06-22 22:01:37 +01:00
c9rnelius	c37735f2e8	Added translation using Weblate (German (Low))	2023-06-22 23:00:57 +02:00
c9rnelius	165abc7bea	Added translation using Weblate (German (Low))	2023-06-22 23:00:57 +02:00
Harvey Tindall	7aaafb90e3	form: actually link to the my account page forgot to do this before. shown on the success modal.	2023-06-22 21:57:19 +01:00