From a3be68930e42efb4b359bd0fe6630d03fa8d2636 Mon Sep 17 00:00:00 2001
From: Maxicarlos08 <maxicarlos08@gmail.com>
Date: Mon, 2 Oct 2023 22:39:30 +0200
Subject: [PATCH] review comments

---
 assets/voxygen/i18n/en/common.ftl   |  2 --
 assets/voxygen/i18n/en/hud/misc.ftl | 29 ++++++++++++++++-------------
 client/examples/chat-cli/main.rs    |  1 +
 voxygen/src/menu/main/mod.rs        |  2 --
 voxygen/src/menu/main/ui/mod.rs     |  4 ++--
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/assets/voxygen/i18n/en/common.ftl b/assets/voxygen/i18n/en/common.ftl
index 6d304bfdbc..0b69c4d703 100644
--- a/assets/voxygen/i18n/en/common.ftl
+++ b/assets/voxygen/i18n/en/common.ftl
@@ -2,8 +2,6 @@ common-username = username
 common-singleplayer = Singleplayer
 common-multiplayer = Multiplayer
 common-servers = Servers
-common-server = Server
-common-client = Client
 common-quit = Quit
 common-settings = Settings
 common-languages = Languages
diff --git a/assets/voxygen/i18n/en/hud/misc.ftl b/assets/voxygen/i18n/en/hud/misc.ftl
index 4365dfc75f..7f5b51943e 100644
--- a/assets/voxygen/i18n/en/hud/misc.ftl
+++ b/assets/voxygen/i18n/en/hud/misc.ftl
@@ -60,19 +60,22 @@ hud-stay= Stay
 hud-sit = Sit
 hud-steer = Steer
 hud-portal = Portal
+
+-server = Server
+-client = Client
 hud-init-stage-singleplayer = Starting singleplayer server...
-hud-init-stage-server-db-migrations = [{ common-server }]: Applying database migrations...
-hud-init-stage-server-db-vacuum = [{ common-server }]: Cleaning up database...
-hud-init-stage-server-worldsim-erosion = [{ common-server }]: Erosion { $percentage }%
-hud-init-stage-server-worldciv-civcreate = [{ common-server }]: Generated { $generated } out of { $total } civilizations
-hud-init-stage-server-worldciv-site = [{ common-server }]: Generating sites...
-hud-init-stage-server-economysim = [{ common-server }]: Simulating economy...
-hud-init-stage-server-spotgen = [{ common-server }]: Generating spots...
-hud-init-stage-server-starting = [{ common-server }]: Starting server...
+hud-init-stage-server-db-migrations = [{ -server }]: Applying database migrations...
+hud-init-stage-server-db-vacuum = [{ -server }]: Cleaning up database...
+hud-init-stage-server-worldsim-erosion = [{ -server }]: Erosion { $percentage }%
+hud-init-stage-server-worldciv-civcreate = [{ -server }]: Generated { $generated } out of { $total } civilizations
+hud-init-stage-server-worldciv-site = [{ -server }]: Generating sites...
+hud-init-stage-server-economysim = [{ -server }]: Simulating economy...
+hud-init-stage-server-spotgen = [{ -server }]: Generating spots...
+hud-init-stage-server-starting = [{ -server }]: Starting server...
 hud-init-stage-multiplayer = Starting multiplayer
-hud-init-stage-client-connection-establish = [{ common-client }]: Establishing connection to server...
-hud-init-stage-client-request-server-version = [{ common-client }]: Waiting for server version...
-hud-init-stage-client-authentication = [{ common-client }]: Authenticating...
-hud-init-stage-client-load-init-data = [{ common-client }]: Loading initialization data from server...
-hud-init-stage-client-starting-client = [{ common-client }]: Preparing Client...
+hud-init-stage-client-connection-establish = [{ -client }]: Establishing connection to server...
+hud-init-stage-client-request-server-version = [{ -client }]: Waiting for server version...
+hud-init-stage-client-authentication = [{ -client }]: Authenticating...
+hud-init-stage-client-load-init-data = [{ -client }]: Loading initialization data from server...
+hud-init-stage-client-starting-client = [{ -client }]: Preparing Client...
 hud-init-stage-render-pipeline = Creating render pipeline ({ $done }/{ $total })
diff --git a/client/examples/chat-cli/main.rs b/client/examples/chat-cli/main.rs
index 40d7d3614e..fb766195d3 100644
--- a/client/examples/chat-cli/main.rs
+++ b/client/examples/chat-cli/main.rs
@@ -64,6 +64,7 @@ fn main() {
             &username,
             &password,
             |provider| provider == "https://auth.veloren.net",
+            &|_| {},
         ))
         .expect("Failed to create client instance");
 
diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs
index 74ebb0a4e4..25ddce1c9e 100644
--- a/voxygen/src/menu/main/mod.rs
+++ b/voxygen/src/menu/main/mod.rs
@@ -36,8 +36,6 @@ pub enum DetailedInitializationStage {
     CreatingRenderPipeline(usize, usize),
 }
 
-// TODO: show status messages for waiting on server creation, client init, and
-// pipeline creation (we can show progress of pipeline creation)
 enum InitState {
     None,
     // Waiting on the client initialization
diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs
index 2668ad2c7e..cf83b03dd3 100644
--- a/voxygen/src/menu/main/ui/mod.rs
+++ b/voxygen/src/menu/main/ui/mod.rs
@@ -636,7 +636,7 @@ impl Controls {
         }
     }
 
-    fn init_stage(&mut self, stage: DetailedInitializationStage) {
+    fn update_init_stage(&mut self, stage: DetailedInitializationStage) {
         if let Screen::Connecting { init_stage, .. } = &mut self.screen {
             *init_stage = stage
         }
@@ -729,7 +729,7 @@ impl MainMenuUi {
 
     pub fn update_stage(&mut self, stage: DetailedInitializationStage) {
         tracing::trace!(?stage, "Updating stage");
-        self.controls.init_stage(stage);
+        self.controls.update_init_stage(stage);
     }
 
     pub fn connected(&mut self) { self.controls.exit_connect_screen(); }