Uplandustries/WebConsole-Client-v2.4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fix

Browse Source
This commit is contained in:
Carlos 2020-03-14 12:03:36 +01:00
parent 39b4ea5592
commit d1e1909e49
2 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/scripts/WebConsoleLanguage.js
View File

@ -37,7 +37,7 @@ function setLanguage(locale){
"disconnectionModalWelcomeScreenButton": "Back to welcome page", "disconnectionModalWelcomeScreenButton": "Back to welcome page",
"settingsLink": "Settings", "settingsLink": "Settings",
"settingsModalLongTitle": "WebConsole Settings", "settingsModalLongTitle": "WebConsole Settings",
"showDateSettingsSwitchLabel": "Show date and time on each console line", "showDateSettingsSwitchLabel": "Show time on each console line",
"readLogFileSwitchLabel": "Retrieve full log file from server after login", "readLogFileSwitchLabel": "Retrieve full log file from server after login",
"settingsModalCloseButton": "Done", "settingsModalCloseButton": "Done",
"players_online": "Players Online", "players_online": "Players Online",
@ -75,7 +75,7 @@ function setLanguage(locale){
"disconnectionModalWelcomeScreenButton": "Volver a pagina de inicio", "disconnectionModalWelcomeScreenButton": "Volver a pagina de inicio",
"settingsLink": "Configuración", "settingsLink": "Configuración",
"settingsModalLongTitle": "Configuración de WebConsole", "settingsModalLongTitle": "Configuración de WebConsole",
"showDateSettingsSwitchLabel": "Mostrar fecha y hora en cada linea de consola", "showDateSettingsSwitchLabel": "Mostrar hora en cada linea de consola",
"readLogFileSwitchLabel": "Leer log completo al iniciar sesión", "readLogFileSwitchLabel": "Leer log completo al iniciar sesión",
"settingsModalCloseButton": "Hecho", "settingsModalCloseButton": "Hecho",
"players_online": "Jugadores en línea", "players_online": "Jugadores en línea",
@ -113,7 +113,7 @@ function setLanguage(locale){
"disconnectionModalWelcomeScreenButton": "Вернуться на страницу приветствия", "disconnectionModalWelcomeScreenButton": "Вернуться на страницу приветствия",
"settingsLink": "настройки", "settingsLink": "настройки",
"settingsModalLongTitle": "настройки WebConsole", "settingsModalLongTitle": "настройки WebConsole",
"showDateSettingsSwitchLabel": "Показать дату и время в каждой строке консоли", "showDateSettingsSwitchLabel": "Показать время в каждой строке консоли",
"readLogFileSwitchLabel": "Получить полный файл журнала с сервера после входа в систему", "readLogFileSwitchLabel": "Получить полный файл журнала с сервера после входа в систему",
"settingsModalCloseButton": "Выполнено", "settingsModalCloseButton": "Выполнено",
"players_online": "Игроки", "players_online": "Игроки",
@ -151,7 +151,7 @@ function setLanguage(locale){
"disconnectionModalWelcomeScreenButton": "Voltar à página de boas-vindas", "disconnectionModalWelcomeScreenButton": "Voltar à página de boas-vindas",
"settingsLink": "Configurações", "settingsLink": "Configurações",
"settingsModalLongTitle": "Configurações do WebConsole", "settingsModalLongTitle": "Configurações do WebConsole",
"showDateSettingsSwitchLabel": "Mostrar data e hora em cada linha do console", "showDateSettingsSwitchLabel": "Mostrar hora em cada linha do console",
"readLogFileSwitchLabel": "Recuperar arquivo de log completo do servidor após o login", "readLogFileSwitchLabel": "Recuperar arquivo de log completo do servidor após o login",
"settingsModalCloseButton": "Feito", "settingsModalCloseButton": "Feito",
"players_online": "Jogadores online", "players_online": "Jogadores online",
@ -189,7 +189,7 @@ function setLanguage(locale){
"disconnectionModalWelcomeScreenButton": "返回欢迎页面", "disconnectionModalWelcomeScreenButton": "返回欢迎页面",
"settingsLink": "设定值", "settingsLink": "设定值",
"settingsModalLongTitle": "WebConsole 设定值", "settingsModalLongTitle": "WebConsole 设定值",
"showDateSettingsSwitchLabel": "在每个控制台行上显示日期和时间", "showDateSettingsSwitchLabel": "在每个控制台行上显示时间",
"readLogFileSwitchLabel": "登录后从服务器检索完整的日志文件", "readLogFileSwitchLabel": "登录后从服务器检索完整的日志文件",
"settingsModalCloseButton": "完成", "settingsModalCloseButton": "完成",
"players_online": "在线人数", "players_online": "在线人数",
@ -227,7 +227,7 @@ function setLanguage(locale){
"disconnectionModalWelcomeScreenButton": "Retour à la page d'accueil", "disconnectionModalWelcomeScreenButton": "Retour à la page d'accueil",
"settingsLink": "Réglages", "settingsLink": "Réglages",
"settingsModalLongTitle": "Réglages de WebConsole", "settingsModalLongTitle": "Réglages de WebConsole",
"showDateSettingsSwitchLabel": "Afficher la date et l'heure sur chaque ligne de console", "showDateSettingsSwitchLabel": "Afficher l'heure sur chaque ligne de console",
"readLogFileSwitchLabel": "Récupérer le fichier journal complet du serveur après la connexion", "readLogFileSwitchLabel": "Récupérer le fichier journal complet du serveur après la connexion",
"settingsModalCloseButton": "Terminé", "settingsModalCloseButton": "Terminé",
"players_online": "Joueurs en ligne", "players_online": "Joueurs en ligne",
@ -265,7 +265,7 @@ function setLanguage(locale){
"disconnectionModalWelcomeScreenButton": "Zpět na úvodní stránku", "disconnectionModalWelcomeScreenButton": "Zpět na úvodní stránku",
"settingsLink": "Nastavení", "settingsLink": "Nastavení",
"settingsModalLongTitle": "Nastavení WebConsole", "settingsModalLongTitle": "Nastavení WebConsole",
"showDateSettingsSwitchLabel": "Zobrazit datum a čas na každé řádce konzoly", "showDateSettingsSwitchLabel": "Zobrazit čas v každém řádku konzoly",
"readLogFileSwitchLabel": "Po přihlášení načtěte úplný soubor protokolu ze serveru", "readLogFileSwitchLabel": "Po přihlášení načtěte úplný soubor protokolu ze serveru",
"settingsModalCloseButton": "Hotovo", "settingsModalCloseButton": "Hotovo",
"players_online": "Počet hráčů online", "players_online": "Počet hráčů online",

7
src/com/mesacarlos/webconsole/websocket/command/ReadLogFileCommand.java
View File

@ -21,7 +21,12 @@ public class ReadLogFileCommand implements WSCommand{
try { try {
lines = Files.readAllLines(Paths.get("logs/latest.log"), StandardCharsets.UTF_8); lines = Files.readAllLines(Paths.get("logs/latest.log"), StandardCharsets.UTF_8);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); try {
lines = Files.readAllLines(Paths.get("logs/latest.log"), StandardCharsets.ISO_8859_1);
}catch(IOException ex) {
ex.printStackTrace();
}
} }
if(lines == null) { if(lines == null) {