Merge pull request #293 from Rustmail/292-migrate-i18n-rs-to-local-crate-rustmail-i18n-due-to-inactivity

chore(i18n): migrate i18n-rs to local crate rustmail i18n due to inactivity

Author: Akinator31

Cargo.lock

@@ -1,3 +1,3 @@
 [workspace]
 members = ["rustmail", "rustmail_panel", "rustmail_types"]
-resolver = "3"
+resolver = "3"

Cargo.toml

@@ -40,4 +40,7 @@ If you need help, join the [Discord server][discord-invite] and ask for assistan
 
 ## License
 
-This project is licensed under the [AGPLv3 License](https://github.com/Rustmail/rustmail/blob/main/LICENSE).
+This project is licensed under the [AGPLv3 License](https://github.com/Rustmail/rustmail/blob/main/LICENSE).
+
+> **Note:** The `rustmail-panel` i18n module includes code derived from [i18n-rs](https://github.com/opensass/i18n-rs),
+> which is licensed under the MIT License.

README.md

@@ -13,7 +13,6 @@ gloo-net = "0.6.0"
 gloo-utils = "0.2.0"
 web-sys = { version = "0.3.77", features = ["HtmlSelectElement"] }
 serde_json = "1.0.145"
-i18nrs = { version = "0.1.7", features = ["yew"] }
 serde = { version = "1.0.228", features = ["derive"] }
 js-sys = "0.3.82"
 wasm-bindgen = "0.2.106"
@@ -22,4 +21,4 @@ ammonia = "4.1.2"
 pulldown-cmark = "0.13.0"
 chrono = { version = "0.4", features = ["serde", "wasmbind"] }
 chrono-tz = { version = "0.10", features = ["serde"] }
-[build-dependencies]
+[build-dependencies]

rustmail_panel/Cargo.toml

@@ -1,7 +1,7 @@
 use crate::components::forbidden::Forbidden403;
+use crate::i18n::yew::use_translation;
 use crate::types::PanelPermission;
 use gloo_net::http::Request;
-use i18nrs::yew::use_translation;
 use serde::{Deserialize, Serialize};
 use wasm_bindgen_futures::spawn_local;
 use web_sys::HtmlInputElement;
@@ -131,11 +131,19 @@ pub fn api_keys_page() -> Html {
                                 error.set(Some(i18n_clone.t("panel.apikeys.error_parse")));
                             }
                         } else {
-                            error.set(Some(format!("{}: {}", i18n_clone.t("panel.apikeys.error_load"), resp.status())));
+                            error.set(Some(format!(
+                                "{}: {}",
+                                i18n_clone.t("panel.apikeys.error_load"),
+                                resp.status()
+                            )));
                         }
                     }
                     Err(e) => {
-                        error.set(Some(format!("{}: {:?}", i18n_clone.t("panel.apikeys.error_network"), e)));
+                        error.set(Some(format!(
+                            "{}: {:?}",
+                            i18n_clone.t("panel.apikeys.error_network"),
+                            e
+                        )));
                     }
                 }
                 loading.set(false);
@@ -384,12 +392,16 @@ fn create_api_key_modal(props: &CreateApiKeyModalProps) -> Html {
                 .unwrap_or_default();
 
             if name.trim().is_empty() {
-                error.set(Some(i18n_clone.t("panel.apikeys.modal.error_name_required")));
+                error.set(Some(
+                    i18n_clone.t("panel.apikeys.modal.error_name_required"),
+                ));
                 return;
             }
 
             if selected_permissions.is_empty() {
-                error.set(Some(i18n_clone.t("panel.apikeys.modal.error_permission_required")));
+                error.set(Some(
+                    i18n_clone.t("panel.apikeys.modal.error_permission_required"),
+                ));
                 return;
             }
 
@@ -418,14 +430,24 @@ fn create_api_key_modal(props: &CreateApiKeyModalProps) -> Html {
                                 on_created.emit(response.api_key);
                                 error.set(None);
                             } else {
-                                error.set(Some(i18n_clone2.t("panel.apikeys.modal.error_parse_response")));
+                                error.set(Some(
+                                    i18n_clone2.t("panel.apikeys.modal.error_parse_response"),
+                                ));
                             }
                         } else {
-                            error.set(Some(format!("{}: {}", i18n_clone2.t("panel.apikeys.modal.error_create"), resp.status())));
+                            error.set(Some(format!(
+                                "{}: {}",
+                                i18n_clone2.t("panel.apikeys.modal.error_create"),
+                                resp.status()
+                            )));
                         }
                     }
                     Err(e) => {
-                        error.set(Some(format!("{}: {:?}", i18n_clone2.t("panel.apikeys.error_network"), e)));
+                        error.set(Some(format!(
+                            "{}: {:?}",
+                            i18n_clone2.t("panel.apikeys.error_network"),
+                            e
+                        )));
                     }
                 }
                 creating.set(false);

rustmail_panel/src/components/api_keys.rs

@@ -1,7 +1,7 @@
 use crate::components::forbidden::Forbidden403;
+use crate::i18n::yew::use_translation;
 use crate::types::PanelPermission;
 use gloo_net::http::Request;
-use i18nrs::yew::use_translation;
 use wasm_bindgen_futures::spawn_local;
 use yew::prelude::*;
 

rustmail_panel/src/components/configuration.rs

@@ -1,5 +1,5 @@
+use crate::i18n::yew::use_translation;
 use crate::pages::panel::PanelRoute;
-use i18nrs::yew::use_translation;
 use yew::prelude::*;
 use yew_router::prelude::*;
 

rustmail_panel/src/components/forbidden.rs

@@ -1,4 +1,4 @@
-use i18nrs::yew::use_translation;
+use crate::i18n::yew::use_translation;
 use yew::prelude::*;
 
 #[function_component(Home)]

rustmail_panel/src/components/home.rs

@@ -1,4 +1,4 @@
-use i18nrs::yew::use_translation;
+use crate::i18n::yew::use_translation;
 use yew::prelude::*;
 
 #[derive(Properties, PartialEq, Clone)]

rustmail_panel/src/components/language_switcher.rs

@@ -1,8 +1,9 @@
+use crate::i18n::yew::use_translation;
 use yew::{Html, function_component, html};
 
 #[function_component(LogoutButton)]
 pub fn logout_button() -> Html {
-    let (i18n, _set_language) = i18nrs::yew::use_translation();
+    let (i18n, _set_language) = use_translation();
 
     html! {
         <a href="/api/auth/logout"