diff --git a/common/src/util/mod.rs b/common/src/util/mod.rs index 831145cc11..0167fda1ce 100644 --- a/common/src/util/mod.rs +++ b/common/src/util/mod.rs @@ -4,6 +4,7 @@ mod option; pub const GIT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/githash")); pub const GIT_TAG: &str = include_str!(concat!(env!("OUT_DIR"), "/gittag")); +pub const VELOREN_VERSION_STAGE: &str = "Pre-Alpha"; lazy_static::lazy_static! { pub static ref GIT_HASH: &'static str = GIT_VERSION.split('/').next().expect("failed to retrieve git_hash!"); @@ -11,9 +12,9 @@ lazy_static::lazy_static! { pub static ref GIT_DATE: String = GIT_DATETIME.split('-').take(3).collect::>().join("-"); pub static ref GIT_TIME: &'static str = GIT_DATETIME.split('-').nth(3).expect("failed to retrieve git_time!"); pub static ref DISPLAY_VERSION: String = if GIT_TAG == "" { - format!("nightly-{}", GIT_DATE.to_string()) + format!("{}-{}", VELOREN_VERSION_STAGE, GIT_DATE.to_string()) } else { - format!("stable-{}", GIT_TAG.to_string()) + format!("{}-{}", VELOREN_VERSION_STAGE, GIT_TAG.to_string()) }; pub static ref DISPLAY_VERSION_LONG: String = if GIT_TAG == "" { format!("{} ({})", DISPLAY_VERSION.as_str(), GIT_HASH.to_string()) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 3f8465e4da..e34d113292 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -732,7 +732,7 @@ impl Hud { .set(self.ids.hurt_bg, ui_widgets); } // Alpha Disclaimer - Text::new(&format!("Veloren Pre-Alpha {}", &version)) + Text::new(&format!("Veloren {}", &version)) .font_id(self.fonts.cyri.conrod_id) .font_size(self.fonts.cyri.scale(10)) .color(TEXT_COLOR) diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index 22565ee452..bbe0831fe1 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -717,7 +717,7 @@ impl CharSelectionUi { .set(self.ids.version, ui_widgets); // Alpha Disclaimer Text::new(&format!( - "Veloren Pre-Alpha {}", + "Veloren {}", common::util::DISPLAY_VERSION.as_str() )) .font_id(self.fonts.cyri.conrod_id) diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs index 57d6010c8b..9bcc3f72b1 100644 --- a/voxygen/src/menu/main/ui.rs +++ b/voxygen/src/menu/main/ui.rs @@ -361,7 +361,7 @@ impl<'a> MainMenuUi { .set(self.ids.version, ui_widgets); // Alpha Disclaimer Text::new(&format!( - "Veloren Pre-Alpha {}", + "Veloren {}", common::util::DISPLAY_VERSION.as_str() )) .font_id(self.fonts.cyri.conrod_id)