From 5006c08ea74e55b2b43c6fe830936c5ac7ce6e56 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Tue, 17 May 2022 17:23:05 -0700 Subject: [PATCH] move languages into tauri resources --- {lang => src-tauri/resources/lang}/en.json | 0 src-tauri/src/lang.rs | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename {lang => src-tauri/resources/lang}/en.json (100%) diff --git a/lang/en.json b/src-tauri/resources/lang/en.json similarity index 100% rename from lang/en.json rename to src-tauri/resources/lang/en.json diff --git a/src-tauri/src/lang.rs b/src-tauri/src/lang.rs index dba9315..36547ed 100644 --- a/src-tauri/src/lang.rs +++ b/src-tauri/src/lang.rs @@ -3,7 +3,7 @@ pub async fn get_lang(window: tauri::Window, lang: String) -> String { let lang = lang.to_lowercase(); // Send contents of language file back - let contents = match std::fs::read_to_string(format!("../lang/{}.json", lang)) { + let contents = match std::fs::read_to_string(format!("./resources/lang/{}.json", lang)) { Ok(x) => x, Err(e) => { emit_lang_err(window, format!("Failed to read language file: {}", e)); @@ -19,7 +19,7 @@ pub async fn get_languages() -> std::collections::HashMap { // for each lang file, set the key as the filename and the value as the lang_name contained in the file let mut languages = std::collections::HashMap::new(); - let mut lang_files = std::fs::read_dir("../lang").unwrap(); + let mut lang_files = std::fs::read_dir("./resources/lang").unwrap(); while let Some(entry) = lang_files.next() { let entry = entry.unwrap();