From eb02a4733d16cae06b9e662c91bc4106563acbd5 Mon Sep 17 00:00:00 2001 From: kaedr Date: Fri, 15 Oct 2021 19:41:31 -0400 Subject: [PATCH] Fixed obfuscation of error messages caused by previous commits --- assets/voxygen/i18n/en/main.ron | 2 +- voxygen/src/menu/main/mod.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/voxygen/i18n/en/main.ron b/assets/voxygen/i18n/en/main.ron index 35a8830591..79c7f4ad90 100644 --- a/assets/voxygen/i18n/en/main.ron +++ b/assets/voxygen/i18n/en/main.ron @@ -60,7 +60,7 @@ https://veloren.net/account/."#, "main.login.select_language": "Select a language", "main.login.client_version": "Client Version", "main.login.server_version": "Server Version", - "main.login.client_init_failed": "Client failed to initialize.", + "main.login.client_init_failed": "Client failed to initialize: {init_fail_reason}", "main.login.username_bad_characters": "Username contains invalid characters! (Only alphanumeric, '_' and '-' are allowed)", "main.login.username_too_long": "Username is too long! Max length is: {max_len}", "main.servers.select_server": "Select a server", diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs index c0be40a378..e2bcc6b8ee 100644 --- a/voxygen/src/menu/main/mod.rs +++ b/voxygen/src/menu/main/mod.rs @@ -154,7 +154,8 @@ impl PlayState for MainMenuState { global_state.info_message = Some( localized_strings .get("main.login.client_init_failed") - .to_owned(), + .to_owned() + .replace("{init_fail_reason}", e.as_str()), ); }, Some(InitMsg::IsAuthTrusted(auth_server)) => {