Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "manifold"
-version = "6.1.0"
+version = "6.0.0"
 authors = ["Lucy Bladen <admin@lbladen.uk>"]
 edition = "2021"
 

src/config.rs

@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::path::PathBuf;
 use config::Config;
 use poise::serenity_prelude::ChannelId;
 use crate::ManifoldResult;
@@ -25,7 +26,8 @@ pub struct ManifoldConfig {
     pub nickname: String,
     pub services: HashMap<String, FuelTank>,
     pub database: DatabaseConfig,
-    pub responses_file_path: String,
+    pub responses_file_path: PathBuf,
+    pub locale: String,
 }
 
 impl ManifoldConfig {

src/lib.rs

@@ -81,9 +81,8 @@ pub async fn prepare_client<T: EventHandler>(arguments: ArgMatches, intents: Gat
     info!("Reading configuration...");
     debug!("Configuration file path: {}", &config_file);
     let bot_config = ManifoldConfig::new(&config_file, bot_environment).expect(&*format!("Could not read configuration file {}", &config_file));
-    let bot_locale = arguments.get_one::<String>("locale").unwrap();
 
-    rust_i18n::set_locale(bot_locale);
+    rust_i18n::set_locale(bot_config.locale.as_str());
 
     let manager = ConnectionManager::<PgConnection>::new(format!("postgresql://{user}:{pass}@{host}:{port}/{database}", user=&bot_config.database.user, pass=&bot_config.database.pass, host=&bot_config.database.host, port=&bot_config.database.port, database=&bot_config.database.database_name));
     let pool = r2d2::Pool::builder()
@@ -92,7 +91,7 @@ pub async fn prepare_client<T: EventHandler>(arguments: ArgMatches, intents: Gat
         .expect("Database setup error!");
 
     let mut responses = Responses::new();
-    responses.reload(&PathBuf::from(&format!("{file}.{locale}.txt", file=bot_config.responses_file_path, locale=bot_locale))).expect("Could not load responses file!");
+    responses.reload(&PathBuf::from(&bot_config.responses_file_path)).expect("Could not load responses file!");
 
     let token = env::var("DISCORD_TOKEN").expect(
         "Could not find an environment variable called DISCORD_TOKEN",