()
- .set_inner_text("CLICKED!");
+ if use_i18n().is_some() {
+ ev.target()
+ .unwrap()
+ .unchecked_into::
()
+ .set_inner_text("CLICKED!");
+ }
}
>
@@ -55,7 +56,7 @@ fn Child() -> impl IntoView {
}
#[wasm_bindgen_test]
-async fn context_outise_reactive_ownership_tree() {
+async fn context_outside_reactive_ownership_tree() {
let fails_div = move || input_by_id("fails");
let success_div = move || input_by_id("success");
diff --git a/end2end/tests/cookie.rs b/end2end/tests/cookie.rs
index bc642ca1..11608bb3 100644
--- a/end2end/tests/cookie.rs
+++ b/end2end/tests/cookie.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
use leptos_fluent::{cookie, leptos_fluent};
use leptos_fluent_csr_minimal_example::{LanguageSelector, TRANSLATIONS};
use tests_helpers::{element_text, input_by_id, mount, unmount};
diff --git a/end2end/tests/cookie_to_localstorage.rs b/end2end/tests/cookie_to_localstorage.rs
index 507aa3ad..d176d4cb 100644
--- a/end2end/tests/cookie_to_localstorage.rs
+++ b/end2end/tests/cookie_to_localstorage.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
use leptos_fluent::{cookie, leptos_fluent, localstorage};
use leptos_fluent_csr_minimal_example::{LanguageSelector, TRANSLATIONS};
use tests_helpers::{element_text, input_by_id, mount, unmount};
diff --git a/end2end/tests/csr_complete.rs b/end2end/tests/csr_complete.rs
index 7adcde46..006ba7b5 100644
--- a/end2end/tests/csr_complete.rs
+++ b/end2end/tests/csr_complete.rs
@@ -1,3 +1,4 @@
+use leptos::prelude::*;
use leptos_fluent::localstorage;
use leptos_fluent_csr_complete_example::App;
use tests_helpers::{element_text, html, input_by_id, mount, sleep, unmount};
@@ -15,12 +16,15 @@ async fn csr_complete_example() {
// translations working
en().click();
+ sleep(30).await;
assert_eq!(element_text("p"), "Select a language:");
es().click();
+ sleep(30).await;
assert!(es().checked());
assert!(!en().checked());
assert_eq!(element_text("p"), "Selecciona un idioma:");
en().click();
+ sleep(30).await;
assert!(en().checked());
assert_eq!(element_text("p"), "Select a language:");
assert!(!es().checked());
@@ -46,8 +50,10 @@ async fn csr_complete_example() {
localstorage::delete("language");
assert_eq!(localstorage::get("language"), None);
es().click();
+ sleep(30).await;
assert_eq!(localstorage::get("language"), Some("es".to_string()));
en().click();
+ sleep(30).await;
assert_eq!(localstorage::get("language"), Some("en".to_string()));
localstorage::delete("language");
diff --git a/end2end/tests/csr_minimal.rs b/end2end/tests/csr_minimal.rs
index 20f01582..18c3ce30 100644
--- a/end2end/tests/csr_minimal.rs
+++ b/end2end/tests/csr_minimal.rs
@@ -1,3 +1,4 @@
+use leptos::prelude::*;
use leptos_fluent::localstorage;
use leptos_fluent_csr_minimal_example::App;
use tests_helpers::{element_text, html, input_by_id, mount, sleep, unmount};
@@ -17,6 +18,7 @@ async fn csr_minimal_example() {
// translations working
assert_eq!(element_text("p"), "Select a language:");
es().click();
+ sleep(30).await;
assert!(es().checked());
assert!(!en().checked());
assert_eq!(element_text("p"), "Selecciona un idioma:");
@@ -25,8 +27,10 @@ async fn csr_minimal_example() {
localstorage::delete("language");
assert_eq!(localstorage::get("language"), None);
en().click();
+ sleep(30).await;
assert_eq!(localstorage::get("language"), None);
es().click();
+ sleep(30).await;
assert_eq!(localstorage::get("language"), None);
// sync_html_tag_lang not activated
@@ -34,9 +38,11 @@ async fn csr_minimal_example() {
html().remove_attribute("lang").unwrap();
assert_eq!(html().lang(), "".to_string());
es().click();
+ sleep(30).await;
assert!(es().checked());
assert_eq!(html().lang(), "".to_string());
en().click();
+ sleep(30).await;
assert!(en().checked());
assert_eq!(html().lang(), "".to_string());
diff --git a/end2end/tests/localstorage.rs b/end2end/tests/localstorage.rs
index 80819cb9..1af15c88 100644
--- a/end2end/tests/localstorage.rs
+++ b/end2end/tests/localstorage.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
use leptos_fluent::{leptos_fluent, localstorage};
use leptos_fluent_csr_minimal_example::{LanguageSelector, TRANSLATIONS};
use tests_helpers::{element_text, input_by_id, mount, unmount};
diff --git a/end2end/tests/localstorage_to_cookie.rs b/end2end/tests/localstorage_to_cookie.rs
index 0237fd03..087557f9 100644
--- a/end2end/tests/localstorage_to_cookie.rs
+++ b/end2end/tests/localstorage_to_cookie.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
use leptos_fluent::{cookie, leptos_fluent, localstorage};
use leptos_fluent_csr_minimal_example::{LanguageSelector, TRANSLATIONS};
use tests_helpers::{element_text, input_by_id, mount, unmount};
diff --git a/end2end/tests/url_param.rs b/end2end/tests/url_param.rs
index 6ecd14e1..254c1b92 100644
--- a/end2end/tests/url_param.rs
+++ b/end2end/tests/url_param.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
use leptos_fluent::{leptos_fluent, url};
use leptos_fluent_csr_minimal_example::{LanguageSelector, TRANSLATIONS};
use tests_helpers::{element_text, input_by_id, mount, sleep, unmount};
@@ -28,17 +28,17 @@ async fn test_url_param() {
// set_language_to_url_param
mount!(App);
- assert_eq!(leptos::window().location().search().unwrap(), "");
+ assert_eq!(leptos::prelude::window().location().search().unwrap(), "");
es().click();
sleep(30).await;
assert_eq!(
- leptos::window().location().search().unwrap(),
+ leptos::prelude::window().location().search().unwrap(),
format!("?{URL_PARAM}=es")
);
en().click();
sleep(30).await;
assert_eq!(
- leptos::window().location().search().unwrap(),
+ leptos::prelude::window().location().search().unwrap(),
format!("?{URL_PARAM}=en")
);
unmount!();
diff --git a/end2end/tests/url_param_to_cookie.rs b/end2end/tests/url_param_to_cookie.rs
index e055c540..7017bedd 100644
--- a/end2end/tests/url_param_to_cookie.rs
+++ b/end2end/tests/url_param_to_cookie.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
use leptos_fluent::{cookie, leptos_fluent, url};
use leptos_fluent_csr_minimal_example::{LanguageSelector, TRANSLATIONS};
use tests_helpers::{element_text, input_by_id, mount, unmount};
diff --git a/end2end/tests/url_param_to_localstorage.rs b/end2end/tests/url_param_to_localstorage.rs
index 83dee5d2..a058b88a 100644
--- a/end2end/tests/url_param_to_localstorage.rs
+++ b/end2end/tests/url_param_to_localstorage.rs
@@ -1,4 +1,4 @@
-use leptos::*;
+use leptos::prelude::*;
use leptos_fluent::{leptos_fluent, localstorage, url};
use leptos_fluent_csr_minimal_example::{LanguageSelector, TRANSLATIONS};
use tests_helpers::{element_text, input_by_id, mount, unmount};
diff --git a/examples/csr-complete/Cargo.toml b/examples/csr-complete/Cargo.toml
index d9729943..17c83fa9 100644
--- a/examples/csr-complete/Cargo.toml
+++ b/examples/csr-complete/Cargo.toml
@@ -9,7 +9,7 @@ name = "leptos_fluent_csr_complete_example"
path = "src/lib.rs"
[dependencies]
-leptos = { version = "0.6", features = ["csr"] }
+leptos = { version = "0.7", features = ["csr"] }
leptos-fluent = { path = "../../leptos-fluent", features = ["json"] }
fluent-templates = { version = "0.11", default-features = false, features = [
"macros",
diff --git a/examples/csr-complete/src/lib.rs b/examples/csr-complete/src/lib.rs
index 268b9f06..97158da3 100644
--- a/examples/csr-complete/src/lib.rs
+++ b/examples/csr-complete/src/lib.rs
@@ -1,5 +1,5 @@
use fluent_templates::static_loader;
-use leptos::*;
+use leptos::prelude::*;
use leptos_fluent::{expect_i18n, leptos_fluent, move_tr, Language};
static_loader! {
@@ -10,8 +10,9 @@ static_loader! {
}
#[component]
-pub fn App() -> impl IntoView {
+fn I18n(children: Children) -> impl IntoView {
leptos_fluent! {
+ children: children(),
translations: [TRANSLATIONS],
languages: "./locales/languages.json",
locales: "./locales",
@@ -36,21 +37,26 @@ pub fn App() -> impl IntoView {
initial_language_from_navigator_to_cookie: true,
initial_language_from_navigator_to_localstorage: true,
set_language_from_navigator: true,
- };
+ }
+}
- LanguageSelector
+#[component]
+pub fn App() -> impl IntoView {
+ view! {
+
+
+
+ }
}
#[component]
fn LanguageSelector() -> impl IntoView {
- let i18n = expect_i18n();
-
view! {
{move_tr!("select-a-language")}
@@ -58,13 +64,17 @@ fn LanguageSelector() -> impl IntoView {
-
- {move_tr!("html-tag-lang-is", { "lang" => i18n.language.get().id.to_string() })}
+ {move_tr!(
+ "html-tag-lang-is", { "lang" => expect_i18n().language.read().id.to_string() }
+ )}
{move_tr!("add-es-en-url-param")}
-
- {move_tr!("html-tag-dir-is", { "dir" => i18n.language.get().dir.to_string() })}
+ {move_tr!(
+ "html-tag-dir-is", { "dir" => expect_i18n().language.read().dir.to_string() }
+ )}
@@ -74,6 +84,7 @@ fn LanguageSelector() -> impl IntoView {
fn render_language(lang: &'static Language) -> impl IntoView {
// Passed as atrribute, `Language` is converted to their code,
// so `
impl IntoView {
name="language"
value=lang
checked=lang.is_active()
- on:click=move |_| lang.activate()
+ on:click=move |_| i18n.language.set(lang)
type="radio"
/>
diff --git a/examples/csr-complete/src/main.rs b/examples/csr-complete/src/main.rs
index cc810413..10632ad0 100644
--- a/examples/csr-complete/src/main.rs
+++ b/examples/csr-complete/src/main.rs
@@ -1,7 +1,4 @@
-use leptos::*;
-use leptos_fluent_csr_complete_example::App;
-
pub fn main() {
console_error_panic_hook::set_once();
- mount_to_body(App);
+ leptos::mount::mount_to_body(leptos_fluent_csr_complete_example::App);
}
diff --git a/examples/csr-minimal/Cargo.toml b/examples/csr-minimal/Cargo.toml
index ce7b845a..bfd3fa4f 100644
--- a/examples/csr-minimal/Cargo.toml
+++ b/examples/csr-minimal/Cargo.toml
@@ -9,8 +9,8 @@ name = "leptos_fluent_csr_minimal_example"
path = "src/lib.rs"
[dependencies]
-leptos = { version = "0.6", features = ["csr"] }
-leptos-fluent = { path = "../../leptos-fluent", default-features = false }
+leptos = { version = "0.7", features = ["csr"] }
+leptos-fluent = { path = "../../leptos-fluent" }
fluent-templates = { version = "0.11", default-features = false, features = [
"macros",
"walkdir"
diff --git a/examples/csr-minimal/src/lib.rs b/examples/csr-minimal/src/lib.rs
index 00a04695..589b6860 100644
--- a/examples/csr-minimal/src/lib.rs
+++ b/examples/csr-minimal/src/lib.rs
@@ -1,5 +1,5 @@
use fluent_templates::static_loader;
-use leptos::*;
+use leptos::prelude::*;
use leptos_fluent::{expect_i18n, leptos_fluent, move_tr};
static_loader! {
@@ -10,13 +10,21 @@ static_loader! {
}
#[component]
-pub fn App() -> impl IntoView {
+pub fn I18n(children: Children) -> impl IntoView {
leptos_fluent! {
+ children: children(),
translations: [TRANSLATIONS],
locales: "./locales",
- };
+ }
+}
- LanguageSelector
+#[component]
+pub fn App() -> impl IntoView {
+ view! {
+
+
+
+ }
}
#[component]
@@ -39,7 +47,7 @@ pub fn LanguageSelector() -> impl IntoView {
name="language"
value=lang
checked=lang.is_active()
- on:click=move |_| lang.activate()
+ on:click=move |_| i18n.language.set(lang)
/>