fix: translation keys

Author: abhinavxd

cmd/conversation.go

@@ -648,7 +648,7 @@ func handleCreateConversation(r *fastglue.Request) error {
 		if err := app.conversation.DeleteConversation(conversationUUID); err != nil {
 			app.lo.Error("error deleting conversation", "error", err)
 		}
-		return sendErrorEnvelope(r, envelope.NewError(envelope.GeneralError, app.i18n.Ts("globals.messages.errorSending", "name", "{globals.terms.conversation}"), nil))
+		return sendErrorEnvelope(r, envelope.NewError(envelope.GeneralError, app.i18n.Ts("globals.messages.errorSending", "name", "{globals.terms.message}"), nil))
 	}
 
 	// Assign the conversation to the agent or team.

cmd/inboxes.go

@@ -126,11 +126,9 @@ func handleDeleteInbox(r *fastglue.Request) error {
 	if err != nil {
 		return sendErrorEnvelope(r, err)
 	}
-
 	if err := reloadInboxes(app); err != nil {
 		return r.SendErrorEnvelope(fasthttp.StatusInternalServerError, app.i18n.Ts("globals.messages.couldNotReload", "name", "{globals.terms.inbox}"), nil, envelope.GeneralError)
 	}
-
 	return r.SendEnvelope(true)
 }
 
@@ -140,17 +138,14 @@ func validateInbox(app *App, inbox imodels.Inbox) error {
 	if _, err := mail.ParseAddress(inbox.From); err != nil {
 		return envelope.NewError(envelope.InputError, app.i18n.Ts("globals.messages.invalidFromAddress"), nil)
 	}
-
 	if len(inbox.Config) == 0 {
-		return envelope.NewError(envelope.InputError, app.i18n.Ts("globals.messages.empty", "name", "{globals.terms.inbox} config"), nil)
+		return envelope.NewError(envelope.InputError, app.i18n.Ts("globals.messages.empty", "name", "config"), nil)
 	}
-
 	if inbox.Name == "" {
-		return envelope.NewError(envelope.InputError, app.i18n.Ts("globals.messages.empty", "name", "{globals.terms.inbox} name"), nil)
+		return envelope.NewError(envelope.InputError, app.i18n.Ts("globals.messages.empty", "name", "name"), nil)
 	}
-
 	if inbox.Channel == "" {
-		return envelope.NewError(envelope.InputError, app.i18n.Ts("globals.messages.empty", "name", "{globals.terms.inbox} channel"), nil)
+		return envelope.NewError(envelope.InputError, app.i18n.Ts("globals.messages.empty", "name", "channel"), nil)
 	}
 	return nil
 }

cmd/install.go

@@ -25,8 +25,8 @@ func install(ctx context.Context, db *sqlx.DB, fs stuffbin.FileSystem, idempoten
 
 	// Make sure the system user password is strong enough.
 	password := os.Getenv("LIBREDESK_SYSTEM_USER_PASSWORD")
-	if password != "" && !user.IsStrongSystemUserPassword(password) && !schemaInstalled {
-		log.Fatalf("system user password is not strong, %s", user.SystemUserPasswordHint)
+	if password != "" && !user.IsStrongPassword(password) && !schemaInstalled {
+		log.Fatalf("system user password is not strong, %s", user.PasswordHint)
 	}
 
 	if !idempotentInstall {

cmd/media.go

@@ -76,7 +76,7 @@ func handleMediaUpload(r *fastglue.Request) error {
 		app.lo.Error("error: uploaded file size is larger than max allowed", "size", bytesToMegabytes(srcFileSize), "max_allowed", consts.MaxFileUploadSizeMB)
 		return r.SendErrorEnvelope(
 			fasthttp.StatusRequestEntityTooLarge,
-			app.i18n.Ts("media.fileSizeTooLarge", "size", fmt.Sprint(consts.MaxFileUploadSizeMB), "unit", "MB"),
+			app.i18n.Ts("media.fileSizeTooLarge", "size", fmt.Sprintf("%dMB", consts.MaxFileUploadSizeMB)),
 			nil,
 			envelope.GeneralError,
 		)

cmd/users.go

@@ -411,7 +411,7 @@ func handleSetPassword(r *fastglue.Request) error {
 	}
 
 	if password == "" {
-		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, app.i18n.Ts("globals.messages.empty", "name", "`password`"), nil, envelope.InputError)
+		return r.SendErrorEnvelope(fasthttp.StatusBadRequest, app.i18n.Ts("globals.messages.empty", "name", "{globals.terms.password}"), nil, envelope.InputError)
 	}
 
 	if err := app.user.ResetPassword(token, password); err != nil {

i18n/en.json

@@ -539,7 +539,7 @@
   "account.avatarRemoved": "Avatar removed",
   "conversation.resolveWithoutAssignee": "Cannot resolve the conversation without an assigned user, Please assign a user before attempting to resolve",
   "conversation.notMemberOfTeam": "You're not a member of this team, Please refresh the page and try again",
-  "conversation.viewPermissionDenied": "You do not have access to view this view",
+  "conversation.viewPermissionDenied": "You do not have access to this view",
   "conversation.errorGeneratingMessageID": "Error generating message ID",
   "conversation.invalidSnoozeDuration": "Invalid snooze duration",
   "conversation.errorUnassigningOpenConversations": "Error unassigning open conversations",