UI Utility

src/langu/language_creator.rs

@@ -9,19 +9,15 @@ pub fn create_languages() {
     let mut debug_messages = JsonValue::new_object();
 
     // FRONTEND
-    frontend_messages.insert(
-        "USER_CONTEXT_GET_CONVERSATIONS",
-        "User {} is loading conversations",
-    );
-    frontend_messages.insert(
-        "USER_CONTEXT_GET_COMMUNITIES",
-        "User {} is loading communities",
-    );
-    frontend_messages.insert("ADD_CONVERSATION", "User {} added {}");
+    frontend_messages.insert("GET_CHATS", "User {} is loading conversations");
+    frontend_messages.insert("MESSAGE_GET", "User {} is loading messages");
+    frontend_messages.insert("get_communities", "User {} is loading communities");
+    frontend_messages.insert("client_connected", "Client {} connected");
+    frontend_messages.insert("add_conversation", "User {} added {}");
 
     // OMIKRON
     omikron_messages.insert(
-        "IdentificationResponse",
+        "identification_response",
         "IOTA identified on Omikron, {} users!",
     );
 
@@ -32,6 +28,7 @@ pub fn create_languages() {
     general_texts.insert("IOTA_ID", "IOTA ID: {}-####-####-####-############");
     general_texts.insert("USER_ID", "USER ID: {}");
     general_texts.insert("USER_IDS", "USER IDS: {}");
+    general_texts.insert("SETUP_COMPLETED", "Launched");
 
     // DEBUG
     debug_messages.insert("", "");
@@ -55,4 +52,9 @@ pub fn create_languages() {
         "debug.json",
         &debug_messages.to_string(),
     );
+    save_file(
+        "languages/en_INT",
+        "general.json",
+        &general_texts.to_string(),
+    );
 }

src/langu/language_manager.rs

@@ -32,9 +32,7 @@ pub fn from_key(key: &str) -> String {
     LANGUAGE_PACK
         .lock()
         .unwrap()
-        .language
-        .get(key)
-        .unwrap_or(&String::new())
+        .get_translation(key)
         .to_string()
 }
 
@@ -90,9 +88,18 @@ impl LanguagePack {
             self.language
                 .insert(key.to_string(), value.as_str().unwrap().to_string());
         }
-    }
 
-    pub fn get_translation(&self, key: &str) -> &String {
-        self.language.get(key).unwrap()
+        let general_messages = file_util::load_file(&path, "general.json");
+        let general_messages = parse(&general_messages).unwrap();
+        for (key, value) in general_messages.entries() {
+            self.language
+                .insert(key.to_string(), value.as_str().unwrap().to_string());
+        }
+    }
+    pub fn get_translation(&self, key: &str) -> String {
+        match self.language.get(key) {
+            Some(v) if !v.is_empty() => v.clone(),
+            _ => key.to_uppercase(),
+        }
     }
 }