From f1838835545f1c9e3d51be18ee4a7825c9068847 Mon Sep 17 00:00:00 2001 From: juunini Date: Sat, 24 Feb 2024 21:53:46 +0900 Subject: [PATCH 1/7] i18n, web: add web config i18n --- src/i18n/en.go | 6 ++++ src/i18n/i18n.go | 38 ++++++++++++++++---------- src/i18n/ko.go | 6 ++++ src/web/listen.go | 7 +++++ src/web/public/partials/webConfig.html | 10 +++---- 5 files changed, 48 insertions(+), 19 deletions(-) diff --git a/src/i18n/en.go b/src/i18n/en.go index 800ec14..313bc5a 100644 --- a/src/i18n/en.go +++ b/src/i18n/en.go @@ -34,4 +34,10 @@ func en() { return message } UnknownCommand = "Unknown command" + + WebConfig = "Web Config" + EnableWebServer = "Enable Web Server" + EnableWebServerDisablePrompt = "Do you want to disable web server? You need to modify .env file to enable it again." + WebServerPort = "Web Server Port" + WebServerPortTooltip = "Set the port of web server. It is recommended to use a number above 60000." } diff --git a/src/i18n/i18n.go b/src/i18n/i18n.go index 2ae67c3..3bd97dc 100644 --- a/src/i18n/i18n.go +++ b/src/i18n/i18n.go @@ -15,17 +15,27 @@ func SetLanguage(language string) { } } -var BotRunningStart string -var FailedToConnectRconServer string -var FailedToSaveCommand string -var FailedToDoExitCommand string -var FailedToShutdownCommand string -var FailedToBroadcastCommand string -var FailedToKickCommand string -var FailedToBanCommand string -var FailedToShowPlayerCommand string -var FailedToStartServerCommand string -var SuccessToStartServerCommand string -var WrongParameters string -var Help func(commandPrefix string, isAdmin bool) string -var UnknownCommand string +var ( + BotRunningStart string + FailedToConnectRconServer string + FailedToSaveCommand string + FailedToDoExitCommand string + FailedToShutdownCommand string + FailedToBroadcastCommand string + FailedToKickCommand string + FailedToBanCommand string + FailedToShowPlayerCommand string + FailedToStartServerCommand string + SuccessToStartServerCommand string + WrongParameters string + UnknownCommand string + Help func(commandPrefix string, isAdmin bool) string +) + +var ( + WebConfig string + EnableWebServer string + EnableWebServerDisablePrompt string + WebServerPort string + WebServerPortTooltip string +) diff --git a/src/i18n/ko.go b/src/i18n/ko.go index 204f3c7..4e9f487 100644 --- a/src/i18n/ko.go +++ b/src/i18n/ko.go @@ -34,4 +34,10 @@ func ko() { return message } UnknownCommand = "알 수 없는 명령어입니다." + + WebConfig = "웹 설정" + EnableWebServer = "웹 서버 사용" + EnableWebServerDisablePrompt = "웹 서버를 사용하지 않으시겠습니까? 이후 다시 설정하시려면 .env 파일을 수정하셔야 합니다." + WebServerPort = "웹 서버 포트" + WebServerPortTooltip = "웹 서버의 포트를 설정합니다. 되도록 60000 이상의 숫자를 사용하시길 권장합니다." } diff --git a/src/web/listen.go b/src/web/listen.go index 37b06ad..ec11a06 100644 --- a/src/web/listen.go +++ b/src/web/listen.go @@ -51,6 +51,13 @@ func Listen(port int) error { "DISCORD_DASHBOARD_PALWORLD_CONFIG_MESSAGE_ID": config.DISCORD_DASHBOARD_PALWORLD_CONFIG_MESSAGE_ID, "DISCORD_DASHBOARD_BOT_CONFIG_MESSAGE_ID": config.DISCORD_DASHBOARD_BOT_CONFIG_MESSAGE_ID, }, + "i18n": fiber.Map{ + "WebConfig": i18n.WebConfig, + "EnableWebServer": i18n.EnableWebServer, + "EnableWebServerDisablePrompt": i18n.EnableWebServerDisablePrompt, + "WebServerPort": i18n.WebServerPort, + "WebServerPortTooltip": i18n.WebServerPortTooltip, + }, }) }) diff --git a/src/web/public/partials/webConfig.html b/src/web/public/partials/webConfig.html index 283c200..dfe534a 100644 --- a/src/web/public/partials/webConfig.html +++ b/src/web/public/partials/webConfig.html @@ -1,17 +1,17 @@
-
Web Config
+
{{.i18n.WebConfig}}
From f8dce1d946c97ecca0302875926a26c23f966ed3 Mon Sep 17 00:00:00 2001 From: juunini Date: Sat, 24 Feb 2024 21:59:40 +0900 Subject: [PATCH 2/7] i18n, web: add buttons i18n --- src/i18n/en.go | 4 ++++ src/i18n/i18n.go | 4 ++++ src/i18n/ko.go | 4 ++++ src/web/listen.go | 4 ++++ src/web/public/components/switch.js | 6 ++++-- src/web/public/partials/discordBotConfig.html | 2 +- src/web/public/partials/discordChannelConfig.html | 2 +- src/web/public/partials/discordCommandAliases.html | 2 +- src/web/public/partials/language.html | 2 +- src/web/public/partials/palworldConfig.html | 2 +- src/web/public/partials/webConfig.html | 6 ++++-- 11 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/i18n/en.go b/src/i18n/en.go index 313bc5a..2d15442 100644 --- a/src/i18n/en.go +++ b/src/i18n/en.go @@ -40,4 +40,8 @@ func en() { EnableWebServerDisablePrompt = "Do you want to disable web server? You need to modify .env file to enable it again." WebServerPort = "Web Server Port" WebServerPortTooltip = "Set the port of web server. It is recommended to use a number above 60000." + + Close = "Close" + Confirm = "Confirm" + Save = "Save" } diff --git a/src/i18n/i18n.go b/src/i18n/i18n.go index 3bd97dc..f85f84b 100644 --- a/src/i18n/i18n.go +++ b/src/i18n/i18n.go @@ -38,4 +38,8 @@ var ( EnableWebServerDisablePrompt string WebServerPort string WebServerPortTooltip string + + Close string + Confirm string + Save string ) diff --git a/src/i18n/ko.go b/src/i18n/ko.go index 4e9f487..ce7c1c9 100644 --- a/src/i18n/ko.go +++ b/src/i18n/ko.go @@ -40,4 +40,8 @@ func ko() { EnableWebServerDisablePrompt = "웹 서버를 사용하지 않으시겠습니까? 이후 다시 설정하시려면 .env 파일을 수정하셔야 합니다." WebServerPort = "웹 서버 포트" WebServerPortTooltip = "웹 서버의 포트를 설정합니다. 되도록 60000 이상의 숫자를 사용하시길 권장합니다." + + Close = "닫기" + Confirm = "확인" + Save = "저장" } diff --git a/src/web/listen.go b/src/web/listen.go index ec11a06..3bcbdb9 100644 --- a/src/web/listen.go +++ b/src/web/listen.go @@ -57,6 +57,10 @@ func Listen(port int) error { "EnableWebServerDisablePrompt": i18n.EnableWebServerDisablePrompt, "WebServerPort": i18n.WebServerPort, "WebServerPortTooltip": i18n.WebServerPortTooltip, + + "Close": i18n.Close, + "Confirm": i18n.Confirm, + "Save": i18n.Save, }, }) }) diff --git a/src/web/public/components/switch.js b/src/web/public/components/switch.js index 76a610a..9033de4 100644 --- a/src/web/public/components/switch.js +++ b/src/web/public/components/switch.js @@ -14,6 +14,8 @@ class Switch extends HTMLElement { turnOffPrompt = ''; modalOpenButton = document.createElement('button'); + close = 'Close'; + confirm = 'Confirm'; constructor() { super(); } @@ -122,12 +124,12 @@ class Switch extends HTMLElement { modalClose.type = 'button'; modalClose.className = 'btn btn-secondary'; modalClose.setAttribute('data-bs-dismiss', 'modal'); - modalClose.textContent = 'Close'; + modalClose.textContent = this.getAttribute('close') || 'Close'; const modalConfirm = document.createElement('button'); modalConfirm.type = 'button'; modalConfirm.className = 'btn btn-primary'; - modalConfirm.textContent = 'Confirm'; + modalConfirm.textContent = this.getAttribute('confirm') || 'Confirm'; modalConfirm.addEventListener('click', () => { this.checked = false; this.checkbox.checked = false; diff --git a/src/web/public/partials/discordBotConfig.html b/src/web/public/partials/discordBotConfig.html index b9fadb8..5e6e845 100644 --- a/src/web/public/partials/discordBotConfig.html +++ b/src/web/public/partials/discordBotConfig.html @@ -37,5 +37,5 @@
- +
diff --git a/src/web/public/partials/discordChannelConfig.html b/src/web/public/partials/discordChannelConfig.html index 4980adc..68e0fc8 100644 --- a/src/web/public/partials/discordChannelConfig.html +++ b/src/web/public/partials/discordChannelConfig.html @@ -39,5 +39,5 @@
- +
diff --git a/src/web/public/partials/discordCommandAliases.html b/src/web/public/partials/discordCommandAliases.html index b117cee..6023c8b 100644 --- a/src/web/public/partials/discordCommandAliases.html +++ b/src/web/public/partials/discordCommandAliases.html @@ -53,5 +53,5 @@
- +
diff --git a/src/web/public/partials/language.html b/src/web/public/partials/language.html index 4b8b2a6..487bda5 100644 --- a/src/web/public/partials/language.html +++ b/src/web/public/partials/language.html @@ -11,5 +11,5 @@
- +
diff --git a/src/web/public/partials/palworldConfig.html b/src/web/public/partials/palworldConfig.html index ec7731a..b2c4160 100644 --- a/src/web/public/partials/palworldConfig.html +++ b/src/web/public/partials/palworldConfig.html @@ -44,5 +44,5 @@
- +
diff --git a/src/web/public/partials/webConfig.html b/src/web/public/partials/webConfig.html index dfe534a..3e816d2 100644 --- a/src/web/public/partials/webConfig.html +++ b/src/web/public/partials/webConfig.html @@ -4,7 +4,9 @@
- +
From 205640a528bcf32ee827d200900cf4bc39df7ec7 Mon Sep 17 00:00:00 2001 From: juunini Date: Sat, 24 Feb 2024 22:04:20 +0900 Subject: [PATCH 3/7] i18n, web: apply languages section --- src/i18n/en.go | 3 +++ src/i18n/i18n.go | 7 +++++-- src/i18n/ko.go | 3 +++ src/web/listen.go | 7 +++++-- src/web/public/partials/language.html | 12 ++++++++---- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/i18n/en.go b/src/i18n/en.go index 2d15442..0ebc191 100644 --- a/src/i18n/en.go +++ b/src/i18n/en.go @@ -41,6 +41,9 @@ func en() { WebServerPort = "Web Server Port" WebServerPortTooltip = "Set the port of web server. It is recommended to use a number above 60000." + Language = "Language" + SelectLanguage = "Select Language" + Close = "Close" Confirm = "Confirm" Save = "Save" diff --git a/src/i18n/i18n.go b/src/i18n/i18n.go index f85f84b..0cea182 100644 --- a/src/i18n/i18n.go +++ b/src/i18n/i18n.go @@ -1,8 +1,8 @@ package i18n var Languages = []map[string]string{ - {"CODE": "ko", "NAME": "한국어"}, - {"CODE": "en", "NAME": "English"}, + {"code": "ko", "name": "한국어"}, + {"code": "en", "name": "English"}, } func SetLanguage(language string) { @@ -39,6 +39,9 @@ var ( WebServerPort string WebServerPortTooltip string + Language string + SelectLanguage string + Close string Confirm string Save string diff --git a/src/i18n/ko.go b/src/i18n/ko.go index ce7c1c9..7ebaca8 100644 --- a/src/i18n/ko.go +++ b/src/i18n/ko.go @@ -41,6 +41,9 @@ func ko() { WebServerPort = "웹 서버 포트" WebServerPortTooltip = "웹 서버의 포트를 설정합니다. 되도록 60000 이상의 숫자를 사용하시길 권장합니다." + Language = "언어" + SelectLanguage = "언어 선택" + Close = "닫기" Confirm = "확인" Save = "저장" diff --git a/src/web/listen.go b/src/web/listen.go index 3bcbdb9..68ae6fa 100644 --- a/src/web/listen.go +++ b/src/web/listen.go @@ -29,8 +29,7 @@ func Listen(port int) error { "WEB_SERVER_ENABLED": config.WEB_SERVER_ENABLED, "WEB_SERVER_PORT": config.WEB_SERVER_PORT, - "LANGUAGE": config.LANGUAGE, - "LANGUAGES": i18n.Languages, + "LANGUAGE": config.LANGUAGE, "DISCORD_BOT_ENABLED": config.DISCORD_BOT_ENABLED, "DISCORD_BOT_TOKEN": config.DISCORD_BOT_TOKEN, @@ -58,6 +57,10 @@ func Listen(port int) error { "WebServerPort": i18n.WebServerPort, "WebServerPortTooltip": i18n.WebServerPortTooltip, + "Language": i18n.Language, + "Languages": i18n.Languages, + "SelectLanguage": i18n.SelectLanguage, + "Close": i18n.Close, "Confirm": i18n.Confirm, "Save": i18n.Save, diff --git a/src/web/public/partials/language.html b/src/web/public/partials/language.html index 487bda5..bd5a09a 100644 --- a/src/web/public/partials/language.html +++ b/src/web/public/partials/language.html @@ -1,10 +1,14 @@
-
Language
+
{{.i18n.Language}}
- + {{range .i18n.Languages}} + {{end}}
From f8a89fdd82313c0118eebe774332a7bc43ce490d Mon Sep 17 00:00:00 2001 From: juunini Date: Sat, 24 Feb 2024 22:17:56 +0900 Subject: [PATCH 4/7] i18n, web: apply discord bot config i18n --- src/i18n/en.go | 11 ++++++++++ src/i18n/i18n.go | 11 ++++++++++ src/i18n/ko.go | 11 ++++++++++ src/web/listen.go | 11 ++++++++++ src/web/public/components/input.js | 9 ++++++++ src/web/public/partials/discordBotConfig.html | 21 ++++++++++--------- 6 files changed, 64 insertions(+), 10 deletions(-) diff --git a/src/i18n/en.go b/src/i18n/en.go index 0ebc191..d116b67 100644 --- a/src/i18n/en.go +++ b/src/i18n/en.go @@ -44,6 +44,17 @@ func en() { Language = "Language" SelectLanguage = "Select Language" + DiscordBotConfig = "Discord Bot Config" + EnableDiscordBot = "Enable Discord Bot" + DiscordBotToken = "Discord Bot Token" + DiscordBotTokenTooltip = "Enter the token of the Discord bot. You can find out how to get the token by clicking the ? button you are currently hovering over." + DiscordAdminUsernames = "Discord Admin Usernames" + DiscordAdminUsernamesTooltip = "Enter the nicknames of Discord admins. If there are multiple, separate them with a comma." + DiscordCommandCaseSensitive = "Discord Command Case Sensitive" + DiscordCommandCaseSensitiveTooltip = "Set whether to distinguish the case of Discord commands." + DiscordCommandPrefix = "Discord Bot Call Command" + DiscordCommandPrefixTooltip = "Set the command to call the Discord bot." + Close = "Close" Confirm = "Confirm" Save = "Save" diff --git a/src/i18n/i18n.go b/src/i18n/i18n.go index 0cea182..9c6cf3e 100644 --- a/src/i18n/i18n.go +++ b/src/i18n/i18n.go @@ -42,6 +42,17 @@ var ( Language string SelectLanguage string + DiscordBotConfig string + EnableDiscordBot string + DiscordBotToken string + DiscordBotTokenTooltip string + DiscordAdminUsernames string + DiscordAdminUsernamesTooltip string + DiscordCommandCaseSensitive string + DiscordCommandCaseSensitiveTooltip string + DiscordCommandPrefix string + DiscordCommandPrefixTooltip string + Close string Confirm string Save string diff --git a/src/i18n/ko.go b/src/i18n/ko.go index 7ebaca8..9992108 100644 --- a/src/i18n/ko.go +++ b/src/i18n/ko.go @@ -44,6 +44,17 @@ func ko() { Language = "언어" SelectLanguage = "언어 선택" + DiscordBotConfig = "디스코드 봇 설정" + EnableDiscordBot = "디스코드 봇 사용" + DiscordBotToken = "디스코드 봇 토큰" + DiscordBotTokenTooltip = "디스코드 봇의 토큰을 입력하세요. 토큰을 얻는 방법은 현재 마우스를 올리고 있는 ? 버튼을 클릭하시면 확인하실 수 있습니다." + DiscordAdminUsernames = "디스코드 관리자 닉네임" + DiscordAdminUsernamesTooltip = "디스코드 관리자의 닉네임을 입력하세요. 여러명일 경우 쉼표로 구분합니다." + DiscordCommandCaseSensitive = "디스코드 커맨드 대소문자 구분" + DiscordCommandCaseSensitiveTooltip = "디스코드 커맨드의 대소문자를 구분할지 설정합니다." + DiscordCommandPrefix = "디스코드 봇 호출 명령어" + DiscordCommandPrefixTooltip = "디스코드 봇 호출 명령어를 설정합니다." + Close = "닫기" Confirm = "확인" Save = "저장" diff --git a/src/web/listen.go b/src/web/listen.go index 68ae6fa..83c0a16 100644 --- a/src/web/listen.go +++ b/src/web/listen.go @@ -61,6 +61,17 @@ func Listen(port int) error { "Languages": i18n.Languages, "SelectLanguage": i18n.SelectLanguage, + "DiscordBotConfig": i18n.DiscordBotConfig, + "EnableDiscordBot": i18n.EnableDiscordBot, + "DiscordBotToken": i18n.DiscordBotToken, + "DiscordBotTokenTooltip": i18n.DiscordBotTokenTooltip, + "DiscordAdminUsernames": i18n.DiscordAdminUsernames, + "DiscordAdminUsernamesTooltip": i18n.DiscordAdminUsernamesTooltip, + "DiscordCommandCaseSensitive": i18n.DiscordCommandCaseSensitive, + "DiscordCommandCaseSensitiveTooltip": i18n.DiscordCommandCaseSensitiveTooltip, + "DiscordCommandPrefix": i18n.DiscordCommandPrefix, + "DiscordCommandPrefixTooltip": i18n.DiscordCommandPrefixTooltip, + "Close": i18n.Close, "Confirm": i18n.Confirm, "Save": i18n.Save, diff --git a/src/web/public/components/input.js b/src/web/public/components/input.js index 050d16f..b7d522c 100644 --- a/src/web/public/components/input.js +++ b/src/web/public/components/input.js @@ -10,6 +10,7 @@ class Input extends HTMLElement { input = document.createElement('input'); label = document.createElement('label'); tooltip = document.createElement('button'); + tooltipClickHref = ''; value = false; constructor() { super(); } @@ -73,6 +74,14 @@ class Input extends HTMLElement { this.tooltip.setAttribute('title', this.getAttribute('tooltip')); this.tooltip.style.border = 'none'; this.tooltip.style.borderRadius = '50%'; + + if (!this.getAttribute('tooltip-click-href')) { + return; + } + + this.tooltip.addEventListener('click', () => { + window.open(this.getAttribute('tooltip-click-href'), '_blank'); + }) } } diff --git a/src/web/public/partials/discordBotConfig.html b/src/web/public/partials/discordBotConfig.html index 5e6e845..cb7393b 100644 --- a/src/web/public/partials/discordBotConfig.html +++ b/src/web/public/partials/discordBotConfig.html @@ -1,37 +1,38 @@ -
Discord Bot Config
+
{{.i18n.DiscordBotConfig}}
From 3b9795c7edb368e1c767a37eb93487ff9977b64c Mon Sep 17 00:00:00 2001 From: juunini Date: Sat, 24 Feb 2024 22:30:49 +0900 Subject: [PATCH 5/7] i18n, web: apply palworld config i18n --- src/i18n/en.go | 13 +++++++++++ src/i18n/i18n.go | 13 +++++++++++ src/i18n/ko.go | 13 +++++++++++ src/web/listen.go | 13 +++++++++++ src/web/public/partials/palworldConfig.html | 24 ++++++++++----------- 5 files changed, 64 insertions(+), 12 deletions(-) diff --git a/src/i18n/en.go b/src/i18n/en.go index d116b67..7ae6acf 100644 --- a/src/i18n/en.go +++ b/src/i18n/en.go @@ -55,6 +55,19 @@ func en() { DiscordCommandPrefix = "Discord Bot Call Command" DiscordCommandPrefixTooltip = "Set the command to call the Discord bot." + PalworldConfig = "Palworld Config" + EnablePalworldRcon = "Enable Palworld RCON (Please set RCONEnable value in PalWorldSettings.ini to true in advance.)" + PalworldRconHost = "Palworld RCON Host" + PalworldRconHostTooltip = "Enter the address of the server where the Palworld server is running." + PalworldRconPort = "Palworld RCON Port" + PalworldRconPortTooltip = "Enter the port of the server where the Palworld server is running." + PalworldAdminPassword = "Palworld Admin Password" + PalworldAdminPasswordTooltip = "Enter the password of the Palworld server." + PalworldServerFilePath = "Palworld Server File Path" + PalworldServerFilePathTooltip = "Enter the path of the Palworld server file." + PalworldServerExecuteFlags = "Palworld Server Execute Flags" + PalworldServerExecuteFlagsTooltip = "Enter the flags of the Palworld server." + Close = "Close" Confirm = "Confirm" Save = "Save" diff --git a/src/i18n/i18n.go b/src/i18n/i18n.go index 9c6cf3e..92e35f4 100644 --- a/src/i18n/i18n.go +++ b/src/i18n/i18n.go @@ -53,6 +53,19 @@ var ( DiscordCommandPrefix string DiscordCommandPrefixTooltip string + PalworldConfig string + EnablePalworldRcon string + PalworldRconHost string + PalworldRconHostTooltip string + PalworldRconPort string + PalworldRconPortTooltip string + PalworldAdminPassword string + PalworldAdminPasswordTooltip string + PalworldServerFilePath string + PalworldServerFilePathTooltip string + PalworldServerExecuteFlags string + PalworldServerExecuteFlagsTooltip string + Close string Confirm string Save string diff --git a/src/i18n/ko.go b/src/i18n/ko.go index 9992108..1593cf8 100644 --- a/src/i18n/ko.go +++ b/src/i18n/ko.go @@ -55,6 +55,19 @@ func ko() { DiscordCommandPrefix = "디스코드 봇 호출 명령어" DiscordCommandPrefixTooltip = "디스코드 봇 호출 명령어를 설정합니다." + PalworldConfig = "팰월드 설정" + EnablePalworldRcon = "팰월드 RCON 호출 기능을 사용합니다. (PalWorldSettings.ini의 RCONEnable 값을 미리 true로 설정해주세요.)" + PalworldRconHost = "팰월드 RCON 호스트" + PalworldRconHostTooltip = "팰월드 서버가 실행된 서버의 주소를 입력하세요." + PalworldRconPort = "팰월드 RCON 포트" + PalworldRconPortTooltip = "PalWorldSettings.ini 파일에 설정된 RCONPort 값을 입력하세요. (포트포워딩이나 리버스 프록시를 이용해 변경하셨으면 해당 포트를 입력하세요.)" + PalworldAdminPassword = "팰월드 관리자 비밀번호" + PalworldAdminPasswordTooltip = "PalWorldSettings.ini 파일에 설정된 AdminPassword 값을 입력하세요." + PalworldServerFilePath = "팰월드 서버 파일 경로" + PalworldServerFilePathTooltip = "팰월드 서버가 실행된 파일의 경로를 입력하세요." + PalworldServerExecuteFlags = "팰월드 서버 실행 플래그" + PalworldServerExecuteFlagsTooltip = "팰월드 서버가 실행될 때 사용할 플래그를 입력하세요." + Close = "닫기" Confirm = "확인" Save = "저장" diff --git a/src/web/listen.go b/src/web/listen.go index 83c0a16..3085820 100644 --- a/src/web/listen.go +++ b/src/web/listen.go @@ -72,6 +72,19 @@ func Listen(port int) error { "DiscordCommandPrefix": i18n.DiscordCommandPrefix, "DiscordCommandPrefixTooltip": i18n.DiscordCommandPrefixTooltip, + "PalworldConfig": i18n.PalworldConfig, + "EnablePalworldRcon": i18n.EnablePalworldRcon, + "PalworldRconHost": i18n.PalworldRconHost, + "PalworldRconHostTooltip": i18n.PalworldRconHostTooltip, + "PalworldRconPort": i18n.PalworldRconPort, + "PalworldRconPortTooltip": i18n.PalworldRconPortTooltip, + "PalworldAdminPassword": i18n.PalworldAdminPassword, + "PalworldAdminPasswordTooltip": i18n.PalworldAdminPasswordTooltip, + "PalworldServerFilePath": i18n.PalworldServerFilePath, + "PalworldServerFilePathTooltip": i18n.PalworldServerFilePathTooltip, + "PalworldServerExecuteFlags": i18n.PalworldServerExecuteFlags, + "PalworldServerExecuteFlagsTooltip": i18n.PalworldServerExecuteFlagsTooltip, + "Close": i18n.Close, "Confirm": i18n.Confirm, "Save": i18n.Save, diff --git a/src/web/public/partials/palworldConfig.html b/src/web/public/partials/palworldConfig.html index b2c4160..9b245b9 100644 --- a/src/web/public/partials/palworldConfig.html +++ b/src/web/public/partials/palworldConfig.html @@ -1,44 +1,44 @@
-
Palworld config
+
{{.i18n.PalworldConfig}}
From 4ad7547fcd49fb9cd6baccea7953c05b037eeed2 Mon Sep 17 00:00:00 2001 From: juunini Date: Sat, 24 Feb 2024 22:41:03 +0900 Subject: [PATCH 6/7] i18n, web: apply discord channel config i18n --- src/i18n/en.go | 12 ++++++++++ src/i18n/i18n.go | 12 ++++++++++ src/i18n/ko.go | 12 ++++++++++ src/web/listen.go | 12 ++++++++++ .../public/partials/discordChannelConfig.html | 24 ++++++++++--------- 5 files changed, 61 insertions(+), 11 deletions(-) diff --git a/src/i18n/en.go b/src/i18n/en.go index 7ae6acf..d24d40b 100644 --- a/src/i18n/en.go +++ b/src/i18n/en.go @@ -68,6 +68,18 @@ func en() { PalworldServerExecuteFlags = "Palworld Server Execute Flags" PalworldServerExecuteFlagsTooltip = "Enter the flags of the Palworld server." + DiscordChannelConfig = "Discord Channel Config" + DiscordDashboardChannelID = "Discord Dashboard Channel ID" + DiscordDashboardChannelIDTooltip = "Enter the channel ID for using the dashboard function. If not entered, the function is not used. You can find out how to check the channel ID by clicking the ? button you are currently hovering over." + DiscordLogChannelID = "Discord Log Channel ID" + DiscordLogChannelIDTooltip = "Enter the channel ID to check the user's connection/disconnection record. If not entered, the function is not used. You can find out how to check the channel ID by clicking the ? button you are currently hovering over." + DiscordDashboardOnlinePlayersMessageID = "Discord Dashboard Online Players Message ID" + DiscordDashboardOnlinePlayersMessageIDTooltip = "Automatically set value. If not necessary, do not modify." + DiscordDashboardPalworldConfigMessageID = "Discord Dashboard Palworld Config Message ID" + DiscordDashboardPalworldConfigMessageIDTooltip = "Automatically set value. If not necessary, do not modify." + DiscordDashboardBotConfigMessageID = "Discord Dashboard Bot Config Message ID" + DiscordDashboardBotConfigMessageIDTooltip = "Automatically set value. If not necessary, do not modify." + Close = "Close" Confirm = "Confirm" Save = "Save" diff --git a/src/i18n/i18n.go b/src/i18n/i18n.go index 92e35f4..471d28e 100644 --- a/src/i18n/i18n.go +++ b/src/i18n/i18n.go @@ -66,6 +66,18 @@ var ( PalworldServerExecuteFlags string PalworldServerExecuteFlagsTooltip string + DiscordChannelConfig string + DiscordDashboardChannelID string + DiscordDashboardChannelIDTooltip string + DiscordLogChannelID string + DiscordLogChannelIDTooltip string + DiscordDashboardOnlinePlayersMessageID string + DiscordDashboardOnlinePlayersMessageIDTooltip string + DiscordDashboardPalworldConfigMessageID string + DiscordDashboardPalworldConfigMessageIDTooltip string + DiscordDashboardBotConfigMessageID string + DiscordDashboardBotConfigMessageIDTooltip string + Close string Confirm string Save string diff --git a/src/i18n/ko.go b/src/i18n/ko.go index 1593cf8..75e50f7 100644 --- a/src/i18n/ko.go +++ b/src/i18n/ko.go @@ -68,6 +68,18 @@ func ko() { PalworldServerExecuteFlags = "팰월드 서버 실행 플래그" PalworldServerExecuteFlagsTooltip = "팰월드 서버가 실행될 때 사용할 플래그를 입력하세요." + DiscordChannelConfig = "디스코드 채널 설정" + DiscordDashboardChannelID = "대시보드 채널 ID" + DiscordDashboardChannelIDTooltip = "대시보드 기능을 이용하기 위한 채널 ID를 입력하세요. 입력하지 않으면 해당 기능을 사용하지 않습니다. 채널 ID를 확인하는 방법은 현재 마우스를 올리고 있는 ? 버튼을 클릭하시면 확인하실 수 있습니다." + DiscordLogChannelID = "로그 채널 ID" + DiscordLogChannelIDTooltip = "유저의 접속/종료 기록을 확인하기 위한 채널 ID를 입력하세요. 입력하지 않으면 해당 기능을 사용하지 않습니다. 채널 ID를 확인하는 방법은 현재 마우스를 올리고 있는 ? 버튼을 클릭하시면 확인하실 수 있습니다." + DiscordDashboardOnlinePlayersMessageID = "온라인 상태 대시보드 Message ID" + DiscordDashboardOnlinePlayersMessageIDTooltip = "자동으로 설정되는 값입니다. 필요한 경우가 아니라면 수정하지 마세요." + DiscordDashboardPalworldConfigMessageID = "팰월드 설정 대시보드 Message ID" + DiscordDashboardPalworldConfigMessageIDTooltip = "자동으로 설정되는 값입니다. 필요한 경우가 아니라면 수정하지 마세요." + DiscordDashboardBotConfigMessageID = "봇 설정 대시보드 Message ID" + DiscordDashboardBotConfigMessageIDTooltip = "자동으로 설정되는 값입니다. 필요한 경우가 아니라면 수정하지 마세요." + Close = "닫기" Confirm = "확인" Save = "저장" diff --git a/src/web/listen.go b/src/web/listen.go index 3085820..2a86d87 100644 --- a/src/web/listen.go +++ b/src/web/listen.go @@ -85,6 +85,18 @@ func Listen(port int) error { "PalworldServerExecuteFlags": i18n.PalworldServerExecuteFlags, "PalworldServerExecuteFlagsTooltip": i18n.PalworldServerExecuteFlagsTooltip, + "DiscordChannelConfig": i18n.DiscordChannelConfig, + "DiscordDashboardChannelID": i18n.DiscordDashboardChannelID, + "DiscordDashboardChannelIDTooltip": i18n.DiscordDashboardChannelIDTooltip, + "DiscordLogChannelID": i18n.DiscordLogChannelID, + "DiscordLogChannelIDTooltip": i18n.DiscordLogChannelIDTooltip, + "DiscordDashboardOnlinePlayersMessageID": i18n.DiscordDashboardOnlinePlayersMessageID, + "DiscordDashboardOnlinePlayersMessageIDTooltip": i18n.DiscordDashboardOnlinePlayersMessageIDTooltip, + "DiscordDashboardPalworldConfigMessageID": i18n.DiscordDashboardPalworldConfigMessageID, + "DiscordDashboardPalworldConfigMessageIDTooltip": i18n.DiscordDashboardPalworldConfigMessageIDTooltip, + "DiscordDashboardBotConfigMessageID": i18n.DiscordDashboardBotConfigMessageID, + "DiscordDashboardBotConfigMessageIDTooltip": i18n.DiscordDashboardBotConfigMessageIDTooltip, + "Close": i18n.Close, "Confirm": i18n.Confirm, "Save": i18n.Save, diff --git a/src/web/public/partials/discordChannelConfig.html b/src/web/public/partials/discordChannelConfig.html index 68e0fc8..286ba05 100644 --- a/src/web/public/partials/discordChannelConfig.html +++ b/src/web/public/partials/discordChannelConfig.html @@ -1,39 +1,41 @@
-
Discord Channel Config
+
{{.i18n.DiscordChannelConfig}}
From 1a19efe01a9349cd926203b699799e3178a5454c Mon Sep 17 00:00:00 2001 From: juunini Date: Sat, 24 Feb 2024 22:49:10 +0900 Subject: [PATCH 7/7] i18n, web: apply command aliases i18n --- src/i18n/en.go | 9 +++++++++ src/i18n/i18n.go | 9 +++++++++ src/i18n/ko.go | 9 +++++++++ src/web/listen.go | 9 +++++++++ .../public/partials/discordCommandAliases.html | 16 ++++++++-------- 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/i18n/en.go b/src/i18n/en.go index d24d40b..6cbaa44 100644 --- a/src/i18n/en.go +++ b/src/i18n/en.go @@ -80,6 +80,15 @@ func en() { DiscordDashboardBotConfigMessageID = "Discord Dashboard Bot Config Message ID" DiscordDashboardBotConfigMessageIDTooltip = "Automatically set value. If not necessary, do not modify." + DiscordCommandAliases = "Discord Command Aliases" + DiscordCommandAliasKickTooltip = "Kick command customizing" + DiscordCommandAliasBanTooltip = "Ban command customizing" + DiscordCommandAliasBroadcastTooltip = "Broadcast all users command customizing" + DiscordCommandAliasShutdownTooltip = "Shutdown after few seconds command customizing" + DiscordCommandAliasDoExitTooltip = "Server force shutdown command customizing" + DiscordCommandAliasSaveTooltip = "Save command customizing" + DiscordCommandAliasStartServerTooltip = "StartServer command customizing" + Close = "Close" Confirm = "Confirm" Save = "Save" diff --git a/src/i18n/i18n.go b/src/i18n/i18n.go index 471d28e..07ba2e8 100644 --- a/src/i18n/i18n.go +++ b/src/i18n/i18n.go @@ -78,6 +78,15 @@ var ( DiscordDashboardBotConfigMessageID string DiscordDashboardBotConfigMessageIDTooltip string + DiscordCommandAliases string + DiscordCommandAliasKickTooltip string + DiscordCommandAliasBanTooltip string + DiscordCommandAliasBroadcastTooltip string + DiscordCommandAliasShutdownTooltip string + DiscordCommandAliasDoExitTooltip string + DiscordCommandAliasSaveTooltip string + DiscordCommandAliasStartServerTooltip string + Close string Confirm string Save string diff --git a/src/i18n/ko.go b/src/i18n/ko.go index 75e50f7..0d06d54 100644 --- a/src/i18n/ko.go +++ b/src/i18n/ko.go @@ -80,6 +80,15 @@ func ko() { DiscordDashboardBotConfigMessageID = "봇 설정 대시보드 Message ID" DiscordDashboardBotConfigMessageIDTooltip = "자동으로 설정되는 값입니다. 필요한 경우가 아니라면 수정하지 마세요." + DiscordCommandAliases = "디스코드 커맨드 커스터마이징" + DiscordCommandAliasKickTooltip = "유저를 1회 강퇴하는 커맨드를 커스텀 합니다." + DiscordCommandAliasBanTooltip = "유저를 차단하는 커맨드를 커스텀 합니다." + DiscordCommandAliasBroadcastTooltip = "모든 유저에게 메시지를 전송하는 커맨드를 커스텀 합니다. (영어만 가능)" + DiscordCommandAliasShutdownTooltip = "서버를 일정 시간 후 종료하는 커맨드를 커스텀 합니다." + DiscordCommandAliasDoExitTooltip = "서버를 강제 종료하는 커맨드를 커스텀 합니다." + DiscordCommandAliasSaveTooltip = "서버를 저장하는 커맨드를 커스텀 합니다." + DiscordCommandAliasStartServerTooltip = "서버를 실행하는 커맨드를 커스텀 합니다." + Close = "닫기" Confirm = "확인" Save = "저장" diff --git a/src/web/listen.go b/src/web/listen.go index 2a86d87..2b8836e 100644 --- a/src/web/listen.go +++ b/src/web/listen.go @@ -97,6 +97,15 @@ func Listen(port int) error { "DiscordDashboardBotConfigMessageID": i18n.DiscordDashboardBotConfigMessageID, "DiscordDashboardBotConfigMessageIDTooltip": i18n.DiscordDashboardBotConfigMessageIDTooltip, + "DiscordCommandAliases": i18n.DiscordCommandAliases, + "DiscordCommandAliasKickTooltip": i18n.DiscordCommandAliasKickTooltip, + "DiscordCommandAliasBanTooltip": i18n.DiscordCommandAliasBanTooltip, + "DiscordCommandAliasBroadcastTooltip": i18n.DiscordCommandAliasBroadcastTooltip, + "DiscordCommandAliasShutdownTooltip": i18n.DiscordCommandAliasShutdownTooltip, + "DiscordCommandAliasDoExitTooltip": i18n.DiscordCommandAliasDoExitTooltip, + "DiscordCommandAliasSaveTooltip": i18n.DiscordCommandAliasSaveTooltip, + "DiscordCommandAliasStartServerTooltip": i18n.DiscordCommandAliasStartServerTooltip, + "Close": i18n.Close, "Confirm": i18n.Confirm, "Save": i18n.Save, diff --git a/src/web/public/partials/discordCommandAliases.html b/src/web/public/partials/discordCommandAliases.html index 6023c8b..652d637 100644 --- a/src/web/public/partials/discordCommandAliases.html +++ b/src/web/public/partials/discordCommandAliases.html @@ -1,53 +1,53 @@
-
Discord Command Aliases
+
{{.i18n.DiscordCommandAliases}}