[pve-devel] [PATCH yew-widget-toolkit v3 1/1] improve translatable strings

[Maximiliano Sandoval <m.sandoval@proxmox.com>]

Regarding the "may" change: we error when the fields are empty, hence
must is more appropriate.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 src/widget/form/field.rs    | 2 +-
 src/widget/form/number.rs   | 4 ++--
 src/widget/form/selector.rs | 2 +-
 src/widget/form/textarea.rs | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/widget/form/field.rs b/src/widget/form/field.rs
index 314b5e16..da3b9777 100644
--- a/src/widget/form/field.rs
+++ b/src/widget/form/field.rs
@@ -329,7 +329,7 @@ impl ManagedField for StandardField {
 
         if value.is_empty() {
             if props.required {
-                return Err(Error::msg(tr!("Field may not be empty.")));
+                return Err(Error::msg(tr!("Field must not be empty.")));
             } else {
                 return Ok(Value::String(String::new()));
             }
diff --git a/src/widget/form/number.rs b/src/widget/form/number.rs
index 78d44a39..298b4c8b 100644
--- a/src/widget/form/number.rs
+++ b/src/widget/form/number.rs
@@ -433,7 +433,7 @@ impl<T: NumberTypeInfo> ManagedField for NumberField<T> {
 
         if is_empty {
             if props.required {
-                return Err(Error::msg(tr!("Field may not be empty.")));
+                return Err(Error::msg(tr!("Field must not be empty.")));
             } else {
                 return Ok(Value::Null);
             }
@@ -441,7 +441,7 @@ impl<T: NumberTypeInfo> ManagedField for NumberField<T> {
 
         let number = match T::value_to_number(value) {
             Ok(number) => number,
-            Err(err) => return Err(Error::msg(tr!("Input invalid: {}", err.to_string()))),
+            Err(err) => return Err(Error::msg(tr!("Invalid input: {}", err.to_string()))),
         };
 
         if let Some(min) = props.min {
diff --git a/src/widget/form/selector.rs b/src/widget/form/selector.rs
index c7a2d7b2..75f25da7 100644
--- a/src/widget/form/selector.rs
+++ b/src/widget/form/selector.rs
@@ -208,7 +208,7 @@ impl<S: DataStore + 'static> ManagedField for SelectorField<S> {
 
         if value.is_empty() {
             if props.required {
-                bail!("Field may not be empty.");
+                bail!("Field must not be empty.");
             } else {
                 return Ok(Value::String(String::new()));
             }
diff --git a/src/widget/form/textarea.rs b/src/widget/form/textarea.rs
index bf63a495..1f3246a2 100644
--- a/src/widget/form/textarea.rs
+++ b/src/widget/form/textarea.rs
@@ -139,7 +139,7 @@ impl ManagedField for TextAreaField {
 
         if value.is_empty() {
             if props.required {
-                return Err(Error::msg(tr!("Field may not be empty.")));
+                return Err(Error::msg(tr!("Field must not be empty.")));
             } else {
                 return Ok(Value::String(String::new()));
             }
-- 
2.47.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel