diff --git a/grouptasks_lang_log_messages.json b/grouptasks_lang_log_messages.json index 4bb6ff8..6caeffe 100644 --- a/grouptasks_lang_log_messages.json +++ b/grouptasks_lang_log_messages.json @@ -5,6 +5,10 @@ { "lang": "en", "message": "%userId% has started group task %groupTaskId% %groupTaskName%" + }, + { + "lang": "de", + "message": "%userId% hat die Gruppenaufgabe %groupTaskId% %groupTaskName% gestartet" } ] }, @@ -14,6 +18,10 @@ { "lang": "en", "message": "%userId% has reloaded group tasks config of category %category%" + }, + { + "lang": "de", + "message": "%userId% hat die Config der Category %category% neu geladen" } ] }, @@ -23,6 +31,10 @@ { "lang": "en", "message": "%groupTaskId% status set to %status%" + }, + { + "lang": "de", + "message": "%groupTaskId% Status auf %status% gesetzt" } ] }, @@ -32,6 +44,10 @@ { "lang": "en", "message": "Step %taskStepId% of %groupTaskId% was continued by %userId%" + }, + { + "lang": "de", + "message": "Schritt %taskStepId% von %groupTaskId% wurde von %userId% fortgeführt" } ] }, @@ -41,6 +57,10 @@ { "lang": "en", "message": "Step %taskStepId% of %groupTaskId% has failed and was started by %userId% to try again" + }, + { + "lang": "de", + "message": "Schritt %taskStepId% von %groupTaskId% ist fehlgeschlagen und wurde von %userId% neu gestartet" } ] }, @@ -50,6 +70,10 @@ { "lang": "en", "message": "Step %taskStepId% of %groupTaskId% status set to %status%" + }, + { + "lang": "de", + "message": "Schritt %taskStepId% von %groupTaskId% Status auf %status% gesetzt" } ] }, @@ -59,6 +83,10 @@ { "lang": "en", "message": "--------- SERVER has started ---------" + }, + { + "lang": "de", + "message": "--------- SERVER gestartet ---------" } ] } diff --git a/main b/main new file mode 100755 index 0000000..822244c Binary files /dev/null and b/main differ diff --git a/modules/logger/logger.go b/modules/logger/logger.go index baf39a0..cabb2c7 100644 --- a/modules/logger/logger.go +++ b/modules/logger/logger.go @@ -60,8 +60,6 @@ func addLog(logMessage structs.LogMessage, systemLog bool) { path = groupTasksLogsRootPath } - log.Debug().Msgf("add log", logMessage) - f, err := os.OpenFile(path+strconv.Itoa(day)+"-"+strconv.Itoa(int(month))+"-"+strconv.Itoa(year)+".json", os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644) if err != nil { @@ -80,7 +78,7 @@ func addLog(logMessage structs.LogMessage, systemLog bool) { } } -func ReadLogs(date string, systemLogs bool) []structs.LogMessageResponse { +func ReadLogs(date string, systemLogs bool, language string) []structs.LogMessageResponse { path := systemLogsRootPath if !systemLogs { @@ -115,7 +113,7 @@ func ReadLogs(date string, systemLogs bool) []structs.LogMessageResponse { languageLogMessages = grouptasksLanguageLogMessages } - logMessages = append(logMessages, getLogMessage(languageLogMessages, logMessage)) + logMessages = append(logMessages, getLogMessage(languageLogMessages, logMessage, language)) } if err := fileScanner.Err(); err != nil { @@ -126,7 +124,7 @@ func ReadLogs(date string, systemLogs bool) []structs.LogMessageResponse { return logMessages } -func getLogMessage(languageLogMessages []structs.LanguageLogMessages, logMessage structs.LogMessage) structs.LogMessageResponse { +func getLogMessage(languageLogMessages []structs.LanguageLogMessages, logMessage structs.LogMessage, language string) structs.LogMessageResponse { logMessageResponse := structs.LogMessageResponse{ Time: logMessage.Time, Type: logMessage.Type, @@ -135,7 +133,7 @@ func getLogMessage(languageLogMessages []structs.LanguageLogMessages, logMessage for _, systemLanguageLogMessage := range languageLogMessages { if logMessage.Id == systemLanguageLogMessage.Id { - logMessageResponse.Message = systemLanguageLogMessage.Languages[0].Message + logMessageResponse.Message = getLogLanguageMessage(systemLanguageLogMessage.Languages, language) return logMessageResponse } @@ -144,6 +142,22 @@ func getLogMessage(languageLogMessages []structs.LanguageLogMessages, logMessage return logMessageResponse } +func getLogLanguageMessage(languages []structs.LanguageLogMessagesLanguage, language string) string { + englishIndex := 0 + + for i, l := range languages { + if l.Lang == language { + return l.Message + } + + if l.Lang == "en" { + englishIndex = i + } + } + + return languages[englishIndex].Message +} + func GetAllLogMessagesDates(systemLogs bool) []string { path := systemLogsRootPath diff --git a/routers/router/api/v1/logger/logger.go b/routers/router/api/v1/logger/logger.go index c0da636..436994a 100644 --- a/routers/router/api/v1/logger/logger.go +++ b/routers/router/api/v1/logger/logger.go @@ -12,8 +12,9 @@ import ( func GetSystemLog(c *fiber.Ctx) error { t := c.Query("type") date := c.Query("date") + lang := c.Query("lang") - if t == "" || date == "" { + if t == "" || date == "" || lang == "" { return c.SendStatus(fiber.StatusBadRequest) } @@ -42,7 +43,7 @@ func GetSystemLog(c *fiber.Ctx) error { Logs []structs.LogMessageResponse Dates []string }{ - Logs: logger.ReadLogs(date, false), + Logs: logger.ReadLogs(date, false, lang), Dates: logger.GetAllLogMessagesDates(false), }) } @@ -52,7 +53,7 @@ func GetSystemLog(c *fiber.Ctx) error { Logs []structs.LogMessageResponse Dates []string }{ - Logs: logger.ReadLogs(date, true), + Logs: logger.ReadLogs(date, true, lang), Dates: logger.GetAllLogMessagesDates(true), }) } diff --git a/system_lang_log_messages.json b/system_lang_log_messages.json index f3cb594..6c2e7b8 100644 --- a/system_lang_log_messages.json +++ b/system_lang_log_messages.json @@ -5,6 +5,10 @@ { "lang": "en", "message": "%userId% has come online" + }, + { + "lang": "de", + "message": "%userId% ist online gegangen" } ] }, @@ -14,6 +18,10 @@ { "lang": "en", "message": "%userId% has created the role %roleId%" + }, + { + "lang": "de", + "message": "%userId% hat die Rolle %roleId% erstellt" } ] }, @@ -23,6 +31,10 @@ { "lang": "en", "message": "%userId% has updated the role %roleId% with the following changes: %changes%" + }, + { + "lang": "de", + "message": "%userId% hat die Rolle %roleId% mit den folgenden Änderungen bearbeitet: %changes%" } ] }, @@ -32,6 +44,10 @@ { "lang": "en", "message": "%userId% has changed the sorting order of role %roleId% to %sortingOrder%" + }, + { + "lang": "de", + "message": "%userId% hat die Sortierung der Rolle %roleId% zu %sortingOrder% geändert" } ] }, @@ -41,6 +57,10 @@ { "lang": "en", "message": "%userId% has deleted the role %roleId%" + }, + { + "lang": "de", + "message": "%userId% hat die Rolle %roleId% gelöscht" } ] }, @@ -50,6 +70,10 @@ { "lang": "en", "message": "%userId% has assigned the role %roleId% to %targetUserId%" + }, + { + "lang": "de", + "message": "%userId% hat die Rolle %roleId% dem Benutzer %targetUserId% zugewiesen" } ] }, @@ -59,6 +83,10 @@ { "lang": "en", "message": "%userId% has created the user %targetUserId% with the assigned role %roleId%" + }, + { + "lang": "de", + "message": "%userId% hat den Benutzer %targetUserId% mit der zugewiesenen Rolle %roleId% erstellt" } ] }, @@ -68,6 +96,10 @@ { "lang": "en", "message": "%userId% has deleted the user %targetUserId%" + }, + { + "lang": "de", + "message": "%userId% hat den Benutzer %targetUserId% gelöscht" } ] }, @@ -77,6 +109,10 @@ { "lang": "en", "message": "--------- SERVER has started ---------" + }, + { + "lang": "de", + "message": "--------- SERVER gestartet ---------" } ] }, @@ -86,6 +122,10 @@ { "lang": "en", "message": "%userId% has changed the deactivation status of %targetUserId% to %deactivated%" + }, + { + "lang": "de", + "message": "%userId% hat den Deaktivierungsstatus von dem Benutzer %targetUserId% zu %deactivated% aktualisiert" } ] }, @@ -95,6 +135,10 @@ { "lang": "en", "message": "Scanner %scannerId% is now used by %userId%" + }, + { + "lang": "en", + "message": "Scanner %scannerId% ist nun in Verwendung von %userId%" } ] }, @@ -104,6 +148,10 @@ { "lang": "en", "message": "Scanner %scannerId% is not longer used" + }, + { + "lang": "de", + "message": "Scanner %scannerId% ist nicht länger in Verwendung" } ] }, @@ -113,6 +161,10 @@ { "lang": "en", "message": "%userId% has changed his password" + }, + { + "lang": "de", + "message": "%userId% hat sein Passwort geändert" } ] }, @@ -122,6 +174,10 @@ { "lang": "en", "message": "%userId% has updated his account with the following changes: %changes%" + }, + { + "lang": "de", + "message": "%userId% hat seinen Account mit folgenden Veränderungen aktualisiert: %changes%" } ] }, @@ -131,6 +187,10 @@ { "lang": "en", "message": "Scanner %scannerId% %scannerName% was registered" + }, + { + "lang": "de", + "message": "Scanner %scannerId% %scannerName% wurde registriert" } ] }, @@ -140,6 +200,10 @@ { "lang": "en", "message": "Scanner %scannerId% has scanned %scanResult%" + }, + { + "lang": "de", + "message": "Scanner %scannerId% hat %scanResult% gescannt" } ] }, @@ -149,6 +213,10 @@ { "lang": "en", "message": "Scanner %scannerId% was deleted" + }, + { + "lang": "de", + "message": "Scanner %scannerId% wurde gelöscht" } ] }, @@ -158,6 +226,10 @@ { "lang": "en", "message": "%userId% has viewed %logType% logs of the date %logDate%" + }, + { + "lang": "de", + "message": "%userId% hat sich die Logs %logType% vom %logDate% angesehen" } ] }, @@ -167,6 +239,10 @@ { "lang": "en", "message": "%userId% has gone offline" + }, + { + "lang": "de", + "message": "%userId% ist offline gegangen" } ] }, @@ -176,6 +252,10 @@ { "lang": "en", "message": "%userId% has logged in" + }, + { + "lang": "de", + "message": "%userId% hat sich eingeloggt" } ] }, @@ -185,6 +265,10 @@ { "lang": "en", "message": "%userId% has logged out" + }, + { + "lang": "de", + "message": "%userId% hat sich abgemeldet" } ] }, @@ -194,6 +278,10 @@ { "lang": "en", "message": "%userId% has changed his avatar" + }, + { + "lang": "de", + "message": "%userId% hat sein Profilbild aktualisiert" } ] }, @@ -203,6 +291,10 @@ { "lang": "en", "message": "%userId% has logged out one of his account sessions" + }, + { + "lang": "de", + "message": "%userId% hat eine seiner Sitzungen ausgeloggt" } ] }