make email templates more intuitive

tinode · Aug 30, 2022 · 538cad2 · 538cad2
1 parent df465dd
commit 538cad2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/server/hdl_files.go b/server/hdl_files.go
@@ -155,6 +155,7 @@ func largeFileReceive(wrt http.ResponseWriter, req *http.Request) {
 	// Check authorization: either auth information or SID must be present
 	uid, challenge, err := authHttpRequest(req)
 	if err != nil {
+		logs.Info.Println("File upload auth failed", err)
 		writeHttpResponse(decodeStoreError(err, msgID, "", now, nil), err)
 		return
 	}
@@ -171,6 +172,7 @@ func largeFileReceive(wrt http.ResponseWriter, req *http.Request) {
 	// Check if uploads are handled elsewhere.
 	headers, statusCode, err := mh.Headers(req, false)
 	if err != nil {
+		logs.Info.Println("Headers check failed", err)
 		writeHttpResponse(decodeStoreError(err, "", "", now, nil), err)
 		return
 	}
@@ -205,6 +207,7 @@ func largeFileReceive(wrt http.ResponseWriter, req *http.Request) {
 
 	file, _, err := req.FormFile("file")
 	if err != nil {
+		logs.Info.Println("Invalid multipart form", err)
 		if strings.Contains(err.Error(), "request body too large") {
 			writeHttpResponse(ErrTooLarge(msgID, "", now), err)
 		} else {
@@ -242,7 +245,7 @@ func largeFileReceive(wrt http.ResponseWriter, req *http.Request) {
 
 	fdef, err = store.Files.FinishUpload(fdef, true, size)
 	if err != nil {
-		logs.Info.Println("Upload failed", file, "key", fdef.Location, err)
+		logs.Info.Println("Failed to finalize upload", file, "key", fdef.Location, err)
 		// Best effort cleanup.
 		mh.Delete([]string{fdef.Location})
 		writeHttpResponse(decodeStoreError(err, msgID, "", now, nil), err)

diff --git a/server/templ/email-validation-en.templ b/server/templ/email-validation-en.templ
@@ -26,7 +26,7 @@ Tinode registration: confirm email
 <p>You're receiving this message because someone used your email to register at
 <a href="{{.HostUrl}}">Tinode</a>.</p>
 
-<p><a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}">Click</a> to confirm
+<p><a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}">Click to confirm</a>
 or go to
 <a href="{{.HostUrl}}#cred?what=email">{{.HostUrl}}#cred?method=email</a>
 and enter the following code:</p>

diff --git a/server/templ/email-validation-es.templ b/server/templ/email-validation-es.templ
@@ -17,7 +17,7 @@ Registro Tinode: Correo de confirmación
 <p>Estás recibiendo este correo porque alguien uso tu correo para registrarse en
 <a href="{{.HostUrl}}">Tinode</a>.</p>
 
-<p><a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}">Clic</a> para confirmar
+<p><a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}">Clic para confirmar</a>
 o ve a
 <a href="{{.HostUrl}}#cred?what=email">{{.HostUrl}}#cred?method=email</a>
 e ingresa el siguiente código:</p>

diff --git a/server/templ/email-validation-fr.templ b/server/templ/email-validation-fr.templ
@@ -17,7 +17,7 @@ Tinode enregistrement : confirmer l'adresse e-mail
 <p>Vous recevez ce message car quelqu'un a utilisé votre adresse électronique pour s'inscrire sur le site
 <a href="{{.HostUrl}}">Tinode</a>.</p>
 
-<p><a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}">Cliquer ici</a> pour confimer
+<p><a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}">Cliquer ici pour confimer</a>
 ou rendez-vous à l'adresse
 <a href="{{.HostUrl}}#cred?what=email">{{.HostUrl}}#cred?method=email</a>
 et entrez le code suivant :</p>

diff --git a/server/templ/email-validation-ru.templ b/server/templ/email-validation-ru.templ
@@ -16,7 +16,7 @@
 
 <p>Вы получили это сообщение потому, что зарегистрировались в <a href="{{.HostUrl}}">Tinode</a>.</p>
 
-<p>Кликните <a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}&hl=RU">здесь</a> чтобы подтвердить
+<p><a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}&hl=RU">Кликните здесь чтобы подтвердить</a>
 регистрацию или перейдите по сслыке
 <a href="{{.HostUrl}}#cred?what=email">{{.HostUrl}}#cred?method=email&hl=RU</a>
 и введите следующий код:</p>

diff --git a/server/templ/email-validation-vi.templ b/server/templ/email-validation-vi.templ
@@ -26,7 +26,7 @@ Xác thực đăng ký tài khoản Tinode
 <p>Bạn nhận được tin nhắn này bởi vì có ai đó đã dùng email này để đăng ký tài khoản tại
 <a href="{{.HostUrl}}">Tinode</a>.</p>
 
-<p><a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}">Bấm</a> để xác nhận
+<p><a href="{{.HostUrl}}#cred?method=email&code={{.Code}}&token={{.Token}}">Bấm để xác nhận</a>
 hoặc đi tới liên kết
 <a href="{{.HostUrl}}#cred?what=email">{{.HostUrl}}#cred?method=email</a>
 và nhập mã xác thực:</p>