From 8455cb502aef91ad41f741b7a5ba24f19c3638b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Mon, 14 Apr 2025 11:14:41 +0100 Subject: [PATCH] fix(web): make hostname strings fully translatable Since they were not. Also take the opportunity for dropping "please" usage according to SUSE documentation style guide. https://documentation.suse.com/style/current/single-html/docu_styleguide/index.html#sec-vocabulary --- web/src/components/system/HostnamePage.test.tsx | 6 +++--- web/src/components/system/HostnamePage.tsx | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/src/components/system/HostnamePage.test.tsx b/web/src/components/system/HostnamePage.test.tsx index 31dce95c16..6b0602c483 100644 --- a/web/src/components/system/HostnamePage.test.tsx +++ b/web/src/components/system/HostnamePage.test.tsx @@ -100,7 +100,7 @@ describe("HostnamePage", () => { static: "", }); screen.getByText("Success alert:"); - screen.getByText("Hostname successfully updated."); + screen.getByText("Hostname successfully updated"); }); }); @@ -135,7 +135,7 @@ describe("HostnamePage", () => { static: "testing-server", }); screen.getByText("Success alert:"); - screen.getByText("Hostname successfully updated."); + screen.getByText("Hostname successfully updated"); }); it("renders an error when static hostname is selected but left empty", async () => { @@ -163,7 +163,7 @@ describe("HostnamePage", () => { }); screen.getByText("Warning alert:"); - screen.getByText(/Something went wrong/); + screen.getByText(/Hostname could not be updated/); }); }); diff --git a/web/src/components/system/HostnamePage.tsx b/web/src/components/system/HostnamePage.tsx index e6e5455c74..e1896b4b20 100644 --- a/web/src/components/system/HostnamePage.tsx +++ b/web/src/components/system/HostnamePage.tsx @@ -46,6 +46,7 @@ export default function HostnamePage() { const hasTransientHostname = isEmpty(staticHostname); const [success, setSuccess] = useState(null); const [error, setError] = useState(null); + const [requestError, setRequestError] = useState(null); const [settingHostname, setSettingHostname] = useState(!hasTransientHostname); const [hostname, setHostname] = useState(staticHostname); @@ -55,6 +56,7 @@ export default function HostnamePage() { const submit = async (e: SyntheticEvent) => { e.preventDefault(); setError(null); + setRequestError(null); setSuccess(null); if (settingHostname && isEmpty(hostname)) { @@ -63,10 +65,8 @@ export default function HostnamePage() { } updateHostname({ static: settingHostname ? hostname : "" }) - .then(() => setSuccess("Hostname successfully updated.")) - .catch(() => - setError("Something went wrong while updating the hostname. Please, try again."), - ); + .then(() => setSuccess(_("Hostname successfully updated"))) + .catch(() => setRequestError(_("Hostname could not be updated"))); }; // TRANSLATORS: The title for a notification shown when the static hostname @@ -99,6 +99,7 @@ export default function HostnamePage() {
{success && } + {requestError && } {error && ( {error}