From bc06db03a2c289ad408861c3da37f3fef6f884a6 Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Sun, 1 Jun 2025 13:55:19 -0400 Subject: [PATCH 1/5] group general instructions and update translation files --- client/src/locales/en.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 08e3511a7..15a04b7fd 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -532,7 +532,12 @@ "passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.", "saving": "Saving..." }, - "uptimeCreateSelectURL": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.", + "uptimeGeneralInstructions": { + "http": "Enter the URL (e.g., https://example.com) and add a clear display name that appears on the dashboard.", + "ping": "Enter the URL or IP to ping (e.g., https://example.com or 192.168.1.100) and add a clear display name that appears on the dashboard.", + "docker": "Enter the Docker ID of your container (must be full 64-char ID). You can run `docker inspect ` to get it.", + "port": "Enter the URL or IP of the server, the port number, and a clear display name that appears on the dashboard." + }, "settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting", "sendTestEmail": "Send test email", "emailSent": "Email sent successfully", From 50e6767259ca69ee7e258c9b4af722700d7e800c Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Sun, 1 Jun 2025 13:56:13 -0400 Subject: [PATCH 2/5] dynamically update string based on selected monitor.type --- client/src/Pages/Uptime/Create/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx index 65a025b83..cd81d1cad 100644 --- a/client/src/Pages/Uptime/Create/index.jsx +++ b/client/src/Pages/Uptime/Create/index.jsx @@ -353,7 +353,7 @@ const CreateMonitor = () => { > {t("settingsGeneralSettings")} - {t("uptimeCreateSelectURL")} + {t(`uptimeGeneralInstructions.${monitor.type}`)} Date: Sun, 1 Jun 2025 14:03:56 -0400 Subject: [PATCH 3/5] update the en translation values --- client/src/locales/en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 15a04b7fd..f74e9ac92 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -533,10 +533,10 @@ "saving": "Saving..." }, "uptimeGeneralInstructions": { - "http": "Enter the URL (e.g., https://example.com) and add a clear display name that appears on the dashboard.", - "ping": "Enter the URL or IP to ping (e.g., https://example.com or 192.168.1.100) and add a clear display name that appears on the dashboard.", - "docker": "Enter the Docker ID of your container (must be full 64-char ID). You can run `docker inspect ` to get it.", - "port": "Enter the URL or IP of the server, the port number, and a clear display name that appears on the dashboard." + "http": "Enter the URL or IP to monitor (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.", + "ping": "Enter the URL or IP to ping (e.g., https://example.com/ or 192.168.1.100) and add a clear display name that appears on the dashboard.", + "docker": "Enter the Docker ID of your container. Docker IDs must be the full 64 char Docker ID. You can run docker inpsect to get the full container ID.", + "port": "Enter the URL or IP of the server, the port number and a clear display name that appears on the dashboard." }, "settingsEmailConnectionHost": "Email connection host - Hostname to use in the HELO/EHLO greeting", "sendTestEmail": "Send test email", From d6658d16f9297ab9eb744408db60bf733276d358 Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Sun, 1 Jun 2025 14:14:35 -0400 Subject: [PATCH 4/5] update translation values for pt-BR --- client/src/locales/pt-BR.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/src/locales/pt-BR.json b/client/src/locales/pt-BR.json index 5e7810cde..c1b4815e6 100644 --- a/client/src/locales/pt-BR.json +++ b/client/src/locales/pt-BR.json @@ -532,7 +532,12 @@ "passwordRequirements": "A nova senha deve conter pelo menos 8 caracteres e deve ter pelo menos uma letra maiúscula, uma letra minúscula, um número e um caractere especial.", "saving": "Salvando..." }, - "uptimeCreateSelectURL": "Insira a URL ou IP a ser monitorado (por exemplo, https://example.com/ ou 192.168.1.100) e adicione um nome de exibição que irá aparecer no painel.", + "uptimeGeneralInstructions": { + "http": "Insira a URL ou o IP a ser monitorado (ex.: https://example.com/ ou 192.168.1.100) e adicione um nome de exibição claro que será exibido no painel.", + "ping": "Insira a URL ou o IP para executar o ping (ex.: https://example.com/ ou 192.168.1.100) e adicione um nome de exibição claro que será exibido no painel.", + "docker": "Insira o ID do seu contêiner Docker. Os IDs do Docker devem conter todos os 64 caracteres. Você pode executar o comando docker inspect para obter o ID completo do contêiner.", + "port": "Insira a URL ou o IP do servidor, o número da porta e um nome de exibição claro que será exibido no painel." + }, "settingsEmailConnectionHost": "Host de conexão de e-mail - Nome do host a ser usado na saudação HELO/EHLO", "sendTestEmail": "Enviar e-mail de teste", "emailSent": "E-mail enviado com sucesso", From 4e414e289dc088301361584fe07b5ad00ee24e6d Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Sun, 1 Jun 2025 14:23:00 -0400 Subject: [PATCH 5/5] update translation values for ru --- client/src/locales/ru.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/src/locales/ru.json b/client/src/locales/ru.json index 60627c23f..039743be7 100644 --- a/client/src/locales/ru.json +++ b/client/src/locales/ru.json @@ -532,7 +532,12 @@ "passwordRequirements": "Новый пароль должен содержать не менее 8 символов и содержать как минимум одну заглавную букву, одну строчную букву, одну цифру и один специальный символ.", "saving": "Сохранение..." }, - "uptimeCreateSelectURL": "Введите URL-адрес или IP-адрес для отслеживания (например, https://example.com/ или 192.168.1.100) и добавьте понятное отображаемое имя, которое будет отображаться на панели мониторинга.", + "uptimeGeneralInstructions": { + "http": "Введите URL или IP-адрес для мониторинга (например, https://example.com/ или 192.168.1.100) и добавьте понятное имя, которое будет отображаться на панели.", + "ping": "Введите URL или IP-адрес для пинга (например, https://example.com/ или 192.168.1.100) и добавьте понятное имя, которое будет отображаться на панели.", + "docker": "Введите идентификатор контейнера Docker. Идентификатор должен содержать все 64 символа. Вы можете выполнить команду docker inspect , чтобы получить полный идентификатор контейнера.", + "port": "Введите URL или IP-адрес сервера, номер порта и понятное имя, которое будет отображаться на панели." + }, "settingsEmailConnectionHost": "", "sendTestEmail": "", "emailSent": "",