From b4591b6e2fd91292f57862e213b8d5921aead7ea Mon Sep 17 00:00:00 2001 From: Vlad Date: Fri, 27 Jan 2023 14:19:21 +0300 Subject: [PATCH] Updater: Use built-in strings as placeholders for the first run (#479) --- .../fra_h1_mod_common_mp/localizedstrings/french.json | 4 ++-- data/zonetool/h1_mod_common/localizedstrings/english.json | 5 +++-- data/zonetool/localizedstrings/french.json | 4 ++-- data/zonetool/localizedstrings/russian.json | 4 ++-- src/client/resources/ui_scripts/updater.lua | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/data/zonetool/fra_h1_mod_common_mp/localizedstrings/french.json b/data/zonetool/fra_h1_mod_common_mp/localizedstrings/french.json index 4107673a..fbabba13 100644 --- a/data/zonetool/fra_h1_mod_common_mp/localizedstrings/french.json +++ b/data/zonetool/fra_h1_mod_common_mp/localizedstrings/french.json @@ -25,8 +25,8 @@ "LUA_MENU_EDIT_STATS": "Modifier les statistiques", "UPDATER_POPUP_NO_UPDATES_AVAILABLE": "Aucune mise à jour disponible", - "UPDATER_POPUP_AVAILABLE_UPDATE_TEXT": "Une mise à jour est disponible,\npoursuivre l'installation ?", + "MENU_CCS_NEW_PATCH_NOTICE": "Une mise à jour est disponible,\npoursuivre l'installation ?", "UPDATER_POPUP_SUCCESSFUL": "Mise à jour réussie", - "UPDATER_POPUP_RESTART_POPUP_TEXT": "La mise à jour nécessite un redémarrage", + "MENU_CCS_RESTART_CONFIRMATION_TEXT": "La mise à jour nécessite un redémarrage", "UPDATER_POPUP_CHECKING_FOR_UPDATES": "Vérification des mises à jour..." } \ No newline at end of file diff --git a/data/zonetool/h1_mod_common/localizedstrings/english.json b/data/zonetool/h1_mod_common/localizedstrings/english.json index de617e4d..d01eb2ab 100644 --- a/data/zonetool/h1_mod_common/localizedstrings/english.json +++ b/data/zonetool/h1_mod_common/localizedstrings/english.json @@ -56,9 +56,10 @@ "LUA_MENU_EDIT_STATS": "Edit Stats", "UPDATER_POPUP_NO_UPDATES_AVAILABLE": "No updates available", - "UPDATER_POPUP_AVAILABLE_UPDATE_TEXT": "An update is available, proceed with installation?", + "MENU_CCS_NEW_PATCH_NOTICE": "An update is available, proceed with installation?", + "MENU_DOWNLOAD_AUTOUPDATE_PATCH": " ", "UPDATER_POPUP_SUCCESSFUL": "Update successful", - "UPDATER_POPUP_RESTART_POPUP_TEXT": "Update requires restart", + "MENU_CCS_RESTART_CONFIRMATION_TEXT": "Update requires restart", "UPDATER_POPUP_CHECKING_FOR_UPDATES": "Checking for updates...", "MPHUD_FPS": "FPS: ", diff --git a/data/zonetool/localizedstrings/french.json b/data/zonetool/localizedstrings/french.json index 0c118993..48fcaddc 100644 --- a/data/zonetool/localizedstrings/french.json +++ b/data/zonetool/localizedstrings/french.json @@ -22,9 +22,9 @@ "MENU_NO_DONT_ASK": "Non, ne plus me le demander", "UPDATER_POPUP_NO_UPDATES_AVAILABLE": "Aucune mise à jour disponible", - "UPDATER_POPUP_AVAILABLE_UPDATE_TEXT": "Une mise à jour est disponible,\npoursuivre l'installation ?", + "MENU_CCS_NEW_PATCH_NOTICE": "Une mise à jour est disponible,\npoursuivre l'installation ?", "UPDATER_POPUP_SUCCESSFUL": "Mise à jour réussie", - "UPDATER_POPUP_RESTART_POPUP_TEXT": "La mise à jour nécessite un redémarrage", + "MENU_CCS_RESTART_CONFIRMATION_TEXT": "La mise à jour nécessite un redémarrage", "UPDATER_POPUP_CHECKING_FOR_UPDATES": "Vérification des mises à jour...", "MPHUD_FPS": "IPS: ", diff --git a/data/zonetool/localizedstrings/russian.json b/data/zonetool/localizedstrings/russian.json index ca22528e..6e4dea4c 100644 --- a/data/zonetool/localizedstrings/russian.json +++ b/data/zonetool/localizedstrings/russian.json @@ -24,9 +24,9 @@ "MENU_NO_DONT_ASK": "Нет, больше не спрашивать", "UPDATER_POPUP_NO_UPDATES_AVAILABLE": "У вас установлены все последние обновления", - "UPDATER_POPUP_AVAILABLE_UPDATE_TEXT": "Доступно обновление клиента игры,\nначать установку сейчас?", + "MENU_CCS_NEW_PATCH_NOTICE": "Доступно обновление клиента игры,\nначать установку сейчас?", "UPDATER_POPUP_SUCCESSFUL": "Обновление завершено", - "UPDATER_POPUP_RESTART_POPUP_TEXT": "Для применения изменений необходим перезапуск игры", + "MENU_CCS_RESTART_CONFIRMATION_TEXT": "Для применения изменений необходим перезапуск игры", "UPDATER_POPUP_CHECKING_FOR_UPDATES": "Проверка наличия обновлений...", "MPHUD_FPS": "К/С: ", diff --git a/src/client/resources/ui_scripts/updater.lua b/src/client/resources/ui_scripts/updater.lua index ac1b556a..2cb0761b 100644 --- a/src/client/resources/ui_scripts/updater.lua +++ b/src/client/resources/ui_scripts/updater.lua @@ -28,7 +28,7 @@ function startupdatecheck(popup, autoclose) LUI.yesnopopup({ title = Engine.Localize("@MENU_NOTICE"), - text = Engine.Localize("UPDATER_POPUP_AVAILABLE_UPDATE_TEXT"), + text = Engine.Localize("@MENU_CCS_NEW_PATCH_NOTICE") .. " " .. Engine.Localize("@MENU_DOWNLOAD_AUTOUPDATE_PATCH"), callback = function(result) if (result) then startupdatedownload(popup, autoclose) @@ -75,7 +75,7 @@ function startupdatedownload(popup, autoclose) if (updater.isrestartrequired()) then LUI.confirmationpopup({ title = Engine.Localize("@MENU_CCS_RESTART_CONFIRMATION_TITLE"), - text = Engine.Localize("UPDATER_POPUP_RESTART_POPUP_TEXT"), + text = Engine.Localize("@MENU_CCS_RESTART_CONFIRMATION_TEXT"), buttontext = Engine.Localize("@MENU_CCS_RESTART_BUTTON_LABEL"), callback = function() updater.relaunch()