Finalizing Translations

WinDiskWriter/LocalizedStrings/en.lproj/Localizable.strings

@@ -84,6 +84,30 @@
 "ALERT_TITLE_WRITE_FILE_PROBLEM_OCCURRED" = "A problem occurred while writing the file to disk";
 
 
+"AS_LOG_TYPE_ASSERTION_ERROR" = "AssertionFailure";
+
+
+"AS_LOG_TYPE_FAILURE" = "Failure";
+
+
+"AS_LOG_TYPE_FATAL" = "Fatal";
+
+
+"AS_LOG_TYPE_LOG" = "Log";
+
+
+"AS_LOG_TYPE_SKIPPED" = "Skipped";
+
+
+"AS_LOG_TYPE_START" = "Start";
+
+
+"AS_LOG_TYPE_SUCCESS" = "Success";
+
+
+"AS_LOG_TYPE_WARNING" = "Warning";
+
+
 "AUTHORIZATION_ERROR_BAD_ADDRESS" = "The requested socket address is invalid (must be 0-1023 inclusive).";
 
 
@@ -360,6 +384,12 @@
 "LOGVIEW_ROW_CREATE_DIRECTORY_AT_APP_FOLDER_PATH" = "Create directory at Application Folder path: '%@'.";
 
 
+"LOGVIEW_ROW_FOUND_LEGACY_BOOTLOADER_FILES" = "Found Legacy Bootloader files.";
+
+
+"LOGVIEW_ROW_LEGACY_BOOTLOADER_FILES_NOT_FOUND" = "Legacy Bootloader files were not found.";
+
+
 "LOGVIEW_ROW_PARTIAL_TITLE_ERROR_MESSAGE" = "(Error message: '%@')";
 
 

WinDiskWriter/LocalizedStrings/ru.lproj/Localizable.strings

@@ -84,6 +84,30 @@
 "ALERT_TITLE_WRITE_FILE_PROBLEM_OCCURRED" = "Произошла проблема во время записи файла на диск";
 
 
+"AS_LOG_TYPE_ASSERTION_ERROR" = "Нарушение условия";
+
+
+"AS_LOG_TYPE_FAILURE" = "Ошибка";
+
+
+"AS_LOG_TYPE_FATAL" = "Фатальная ошибка";
+
+
+"AS_LOG_TYPE_LOG" = "Инфо";
+
+
+"AS_LOG_TYPE_SKIPPED" = "Пропущено";
+
+
+"AS_LOG_TYPE_START" = "Старт";
+
+
+"AS_LOG_TYPE_SUCCESS" = "Успешно";
+
+
+"AS_LOG_TYPE_WARNING" = "Предупреждение";
+
+
 "AUTHORIZATION_ERROR_BAD_ADDRESS" = "Запрошенный адрес сокета не является валидным (должен быть в диапазоне 0-1023 включительно).";
 
 
@@ -360,6 +384,12 @@
 "LOGVIEW_ROW_CREATE_DIRECTORY_AT_APP_FOLDER_PATH" = "Создание директории в директории приложения: '%@'.";
 
 
+"LOGVIEW_ROW_FOUND_LEGACY_BOOTLOADER_FILES" = "Найдены файлы загрузчика Legacy BIOS.";
+
+
+"LOGVIEW_ROW_LEGACY_BOOTLOADER_FILES_NOT_FOUND" = "Файла загрузчика Legacy BIOS не были найдены.";
+
+
 "LOGVIEW_ROW_PARTIAL_TITLE_ERROR_MESSAGE" = "(Сообщение об ошибке: '%@')";
 
 

WinDiskWriter/Views/AdvancedTextView/AdvancedTextView.h

@@ -11,8 +11,6 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NSString *ASLogType NS_TYPED_ENUM;
-
 @interface AdvancedTextView : NSScrollView
 
 @property (nonatomic, strong, readonly) VibrantTextView *textViewInstance;
@@ -23,8 +21,6 @@ typedef NSString *ASLogType NS_TYPED_ENUM;
 
 - (void)appendTimestampedLine: (NSString *)message;
 
-- (void)appendTimestampedLine: (NSString *)message
-                      logType: (ASLogType)logType;
 - (void)clear;
 
 @end

WinDiskWriter/Views/AdvancedTextView/AdvancedTextView.m

@@ -71,14 +71,6 @@ - (BOOL)allowsVibrancy {
     return YES;
 }
 
-- (void)appendTimestampedLine: (NSString *)message
-                      logType: (ASLogType)logType {
-    NSString *timeString = [dateFormatter stringFromDate: NSDate.date];
-    NSString *timestampedString = [NSString stringWithFormat:@"[(%@) %@] %@", logType, timeString, message];
-
-    [self appendLine: timestampedString];
-}
-
 - (void)appendTimestampedLine: (NSString *)message {
     NSString *timeString = [dateFormatter stringFromDate: NSDate.date];
 

WinDiskWriter/Views/LogView/LogView.h

@@ -10,17 +10,17 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NSString *ASLogType NS_TYPED_ENUM;
-
-extern ASLogType const ASLogTypeStart;
-extern ASLogType const ASLogTypeSuccess;
-extern ASLogType const ASLogTypeFailure;
-extern ASLogType const ASLogTypeSkipped;
-
-extern ASLogType const ASLogTypeLog;
-extern ASLogType const ASLogTypeWarning;
-extern ASLogType const ASLogTypeFatal;
-extern ASLogType const ASLogTypeAssertionError;
+typedef NS_ENUM(NSUInteger, ASLogType) {
+    ASLogTypeStart,
+    ASLogTypeSuccess,
+    ASLogTypeFailure,
+    ASLogTypeSkipped,
+    
+    ASLogTypeLog,
+    ASLogTypeWarning,
+    ASLogTypeFatal,
+    ASLogTypeAssertionError
+};
 
 @interface LogView : NSScrollView
 

WinDiskWriter/Views/LogView/LogView.m

@@ -10,24 +10,51 @@
 #import "NSColor+Common.h"
 #import "VibrantTableView.h"
 #import "NSMutableAttributedString+Common.h"
+#import "LocalizedStrings.h"
 #import "ContaineredTableView.h"
 #import "MiddleAlignedCell.h"
 
-ASLogType const ASLogTypeStart = @"Start";
-ASLogType const ASLogTypeSuccess = @"Success";
-ASLogType const ASLogTypeFailure = @"Failure";
-ASLogType const ASLogTypeSkipped = @"Skipped";
-
-ASLogType const ASLogTypeLog = @"Log";
-ASLogType const ASLogTypeWarning = @"Warning";
-ASLogType const ASLogTypeFatal = @"Fatal";
-ASLogType const ASLogTypeAssertionError = @"AssertionFailure";
-
+/*
+ASLogType ASLogTypeStart = @"Start";
+ASLogType ASLogTypeSuccess = @"Success";
+ASLogType ASLogTypeFailure = @"Failure";
+ASLogType ASLogTypeSkipped = @"Skipped";
+
+ASLogType ASLogTypeLog = @"Log";
+ASLogType ASLogTypeWarning = @"Warning";
+ASLogType ASLogTypeFatal = @"Fatal";
+ASLogType ASLogTypeAssertionError = @"AssertionFailure";
+*/
+
 @implementation LogView {
     NSDateFormatter *dateFormatter;
     NSTextField *dummyTextField;
 }
 
++ (NSString *)logTypeStringForKey: (ASLogType)logType {
+    switch (logType) {
+        case ASLogTypeStart:
+            return [LocalizedStrings asLogTypeStart];
+        case ASLogTypeSuccess:
+            return [LocalizedStrings asLogTypeSuccess];
+        case ASLogTypeFailure:
+            return [LocalizedStrings asLogTypeFailure];
+        case ASLogTypeSkipped:
+            return [LocalizedStrings asLogTypeSkipped];
+        case ASLogTypeLog:
+            return [LocalizedStrings asLogTypeLog];
+        case ASLogTypeWarning:
+            return [LocalizedStrings asLogTypeWarning];
+        case ASLogTypeFatal:
+            return [LocalizedStrings asLogTypeFatal];
+        case ASLogTypeAssertionError:
+            return [LocalizedStrings asLogTypeAssertionError];
+    }
+
+    // Fallback value
+    return [LocalizedStrings asLogTypeLog];
+}
+
 - (instancetype)init {
     self = [super init];
 
@@ -106,14 +133,14 @@ - (void)appendRow:(NSString *)string {
 
 - (void)appendTimestampedRow: (NSString *)string
                      logType: (ASLogType)logType {
-    NSString *timestampedString = [NSString stringWithFormat: @"[(%@) %@] %@", logType, [self timeString], string];
+    NSString *timestampedString = [NSString stringWithFormat: @"[(%@) %@] %@", [LogView logTypeStringForKey: logType], [self timeString], string];
 
     [self appendRow: timestampedString];
 }
 
 - (void)appendRow: (NSString *)string
           logType: (ASLogType)logType {
-    NSString *logTypedString = [NSString stringWithFormat: @"[%@] %@", logType, string];
+    NSString *logTypedString = [NSString stringWithFormat: @"[%@] %@", [LogView logTypeStringForKey: logType], string];
 
     [self appendRow:logTypedString];
 }

WinDiskWriter/Windows/MainWindow/MainWindow.m

@@ -866,9 +866,9 @@ - (void)writeAction {
         if (installLegacyBoot) {
             BOOL bootloaderLegacyFilesDownloaded = [self downloadLegacyBootloaderFiles];
             if (bootloaderLegacyFilesDownloaded) {
-                [self->logsView appendRow:@"Found Legacy Bootloader files." logType:ASLogTypeSuccess];
+                [self->logsView appendRow:[LocalizedStrings logviewRowFoundLegacyBootloaderFiles] logType:ASLogTypeSuccess];
             } else {
-                [self->logsView appendRow:@"Legacy Bootloader files were not found." logType:ASLogTypeFatal];
+                [self->logsView appendRow:[LocalizedStrings logviewRowLegacyBootloaderFilesNotFound] logType:ASLogTypeFatal];
 
                 WriteExitForce();
             }