From 3add9f92642cef4d34291da001b1fd2d2f762381 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 24 Oct 2025 18:17:35 +0100 Subject: [PATCH] Localize strings in convert. --- .../Localization/Localization.Designer.cs | 6 + Aaru.Archives/Localization/Localization.resx | 3 + Aaru.Localization/UI.Designer.cs | 72 ++++++++ Aaru.Localization/UI.es.resx | 36 ++++ Aaru.Localization/UI.resx | 36 ++++ Aaru/Commands/Image/Convert.cs | 154 +++++++----------- 6 files changed, 213 insertions(+), 94 deletions(-) diff --git a/Aaru.Archives/Localization/Localization.Designer.cs b/Aaru.Archives/Localization/Localization.Designer.cs index 04288ce2e..8f641d38a 100644 --- a/Aaru.Archives/Localization/Localization.Designer.cs +++ b/Aaru.Archives/Localization/Localization.Designer.cs @@ -698,5 +698,11 @@ namespace Aaru.Archives { return ResourceManager.GetString("Archive_contains_0_files", resourceCulture); } } + + internal static string Converting_negative_sector_0_of_1 { + get { + return ResourceManager.GetString("Converting_negative_sector_0_of_1", resourceCulture); + } + } } } diff --git a/Aaru.Archives/Localization/Localization.resx b/Aaru.Archives/Localization/Localization.resx index c8cbb1d25..8f332c02f 100644 --- a/Aaru.Archives/Localization/Localization.resx +++ b/Aaru.Archives/Localization/Localization.resx @@ -350,4 +350,7 @@ [slateblue1]Archive contains [green]{0}[/] files[/] + + [slateblue1]Converting sector -[lime]{0}[/] of -[violet]{1}[/][/] + \ No newline at end of file diff --git a/Aaru.Localization/UI.Designer.cs b/Aaru.Localization/UI.Designer.cs index bf686cc7b..19e62064a 100644 --- a/Aaru.Localization/UI.Designer.cs +++ b/Aaru.Localization/UI.Designer.cs @@ -6147,5 +6147,77 @@ namespace Aaru.Localization { return ResourceManager.GetString("Error_connecting_to_host", resourceCulture); } } + + public static string Converting_negative_sector_0_of_1 { + get { + return ResourceManager.GetString("Converting_negative_sector_0_of_1", resourceCulture); + } + } + + public static string Error_0_reading_negative_sector_1_continuing { + get { + return ResourceManager.GetString("Error_0_reading_negative_sector_1_continuing", resourceCulture); + } + } + + public static string Error_0_reading_negative_sector_1_not_continuing { + get { + return ResourceManager.GetString("Error_0_reading_negative_sector_1_not_continuing", resourceCulture); + } + } + + public static string Error_0_writing_negative_sector_1_continuing { + get { + return ResourceManager.GetString("Error_0_writing_negative_sector_1_continuing", resourceCulture); + } + } + + public static string Error_0_writing_negative_sector_1_not_continuing { + get { + return ResourceManager.GetString("Error_0_writing_negative_sector_1_not_continuing", resourceCulture); + } + } + + public static string Converting_tag_1_for_negative_sector_0 { + get { + return ResourceManager.GetString("Converting_tag_1_for_negative_sector_0", resourceCulture); + } + } + + public static string Converting_overflow_sector_0_of_1 { + get { + return ResourceManager.GetString("Converting_overflow_sector_0_of_1", resourceCulture); + } + } + + public static string Error_0_reading_overflow_sector_1_continuing { + get { + return ResourceManager.GetString("Error_0_reading_overflow_sector_1_continuing", resourceCulture); + } + } + + public static string Error_0_reading_overflow_sector_1_not_continuing { + get { + return ResourceManager.GetString("Error_0_reading_overflow_sector_1_not_continuing", resourceCulture); + } + } + + public static string Error_0_writing_overflow_sector_1_continuing { + get { + return ResourceManager.GetString("Error_0_writing_overflow_sector_1_continuing", resourceCulture); + } + } + + public static string Error_0_writing_overflow_sector_1_not_continuing { + get { + return ResourceManager.GetString("Error_0_writing_overflow_sector_1_not_continuing", resourceCulture); + } + } + + public static string Converting_tag_1_for_overflow_sector_0 { + get { + return ResourceManager.GetString("Converting_tag_1_for_overflow_sector_0", resourceCulture); + } + } } } diff --git a/Aaru.Localization/UI.es.resx b/Aaru.Localization/UI.es.resx index f8e838a0d..ab2b0d4ce 100644 --- a/Aaru.Localization/UI.es.resx +++ b/Aaru.Localization/UI.es.resx @@ -3074,4 +3074,40 @@ Probadores: Ejecutándose en arquitectura {0} + + [slateblue1]Convirtiendo sector [lime]-{0}[/] of [violet]-{1}[/][/] + + + [slateblue1]Convirtiendo sector de sobrecarga [lime]{0}[/] de [violet]{1}[/][/] + + + [slateblue1]Convirtiendo etiqueta [orange3]{1}[/] del sector [lime]-{0}[/][/] + + + [slateblue1]Convirtiendo etiqueta [orange3]{1}[/] del sector de sobrecarga [lime]{0}[/][/] + + + [olive]Error [orange3]{0}[/] leyendo sector [lime]-{1}[/], se continuará...[/] + + + [red]Error [orange3]{0}[/] leyendo sector [lime]-{1}[/], no se continuará...[/] + + + [olive]Error [orange3]{0}[/] leyendo sector de sobrecarga [lime]{1}[/], se continuará...[/] + + + [red]Error [orange3]{0}[/] leyendo sector de sobrecarga [lime]{1}[/], no se continuará...[/] + + + [olive]Error [orange3]{0}[/] escribiendo sector [lime]-{1}[/], se continuará...[/] + + + [red]Error [orange3]{0}[/] escribiendo sector [lime]-{1}[/], no se continuará...[/] + + + [olive]Error [orange3]{0}[/] escribiendo sector de sobrecarga [lime]{1}[/], se continuará...[/] + + + [red]Error [orange3]{0}[/] escribiendo sector de sobrecarga [lime]{1}[/], no se continuará...[/] + \ No newline at end of file diff --git a/Aaru.Localization/UI.resx b/Aaru.Localization/UI.resx index 441568839..7266fbaf6 100644 --- a/Aaru.Localization/UI.resx +++ b/Aaru.Localization/UI.resx @@ -3150,4 +3150,40 @@ Do you want to continue? [red]Error connecting to host.[/] + + [slateblue1]Converting sector [lime]-{0}[/] of [violet]-{1}[/][/] + + + [olive]Error [orange3]{0}[/] reading sector [lime]-{1}[/], continuing...[/] + + + [red]Error [orange3]{0}[/] reading sector [lime]-{1}[/], not continuing...[/] + + + [olive]Error [orange3]{0}[/] writing sector [lime]-{1}[/], continuing...[/] + + + [red]Error [orange3]{0}[/] writing sector [lime]-{1}[/], not continuing...[/] + + + [slateblue1]Converting tag [orange3]{1}[/] for sector [lime]-{0}[/][/] + + + [slateblue1]Converting overflow sector [lime]{0}[/] of [violet]{1}[/][/] + + + [olive]Error [orange3]{0}[/] reading overflow sector [lime]{1}[/], continuing...[/] + + + [red]Error [orange3]{0}[/] reading overflow sector [lime]{1}[/], not continuing...[/] + + + [olive]Error [orange3]{0}[/] writing overflow sector [lime]{1}[/], continuing...[/] + + + [red]Error [orange3]{0}[/] writing overflow sector [lime]{1}[/], not continuing...[/] + + + [slateblue1]Converting tag [orange3]{1}[/] for overflow sector [lime]{0}[/][/] + \ No newline at end of file diff --git a/Aaru/Commands/Image/Convert.cs b/Aaru/Commands/Image/Convert.cs index c5fa5562f..93a66f076 100644 --- a/Aaru/Commands/Image/Convert.cs +++ b/Aaru/Commands/Image/Convert.cs @@ -2016,7 +2016,7 @@ sealed class ConvertImageCommand : Command byte[] sector; mediaTask.Description = - string.Format("Converting sector -{0} of -{1}", i, nominalNegativeSectors); + string.Format(UI.Converting_negative_sector_0_of_1, i, nominalNegativeSectors); bool result; SectorStatus sectorStatus; @@ -2033,17 +2033,13 @@ sealed class ConvertImageCommand : Command if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] reading sector [lime]-{1}[/], continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_negative_sector_1_continuing, errno, i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] reading sector [lime]-{1}[/], not continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_negative_sector_1_not_continuing, + errno, + i); return; } @@ -2061,17 +2057,13 @@ sealed class ConvertImageCommand : Command if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] reading sector [lime]-{1}[/], continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_negative_sector_1_continuing, errno, i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] reading sector [lime]-{1}[/], not continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_negative_sector_1_not_continuing, + errno, + i); return; } @@ -2082,17 +2074,15 @@ sealed class ConvertImageCommand : Command { if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] writing sector [lime]-{1}[/], continuing...[/]", - outputMedia.ErrorMessage, - i); + AaruLogging.Error(UI.Error_0_writing_negative_sector_1_continuing, + outputMedia.ErrorMessage, + i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] writing sector [lime]-{1}[/], not continuing...[/]", - outputMedia.ErrorMessage, - i); + AaruLogging.Error(UI.Error_0_writing_negative_sector_1_not_continuing, + outputMedia.ErrorMessage, + i); errno = ErrorNumber.WriteError; @@ -2130,11 +2120,7 @@ sealed class ConvertImageCommand : Command for(uint i = 1; i <= nominalNegativeSectors; i++) { - tagsTask.Description = - string - .Format("[slateblue1]Converting tag [orange3]{1}[/] for sector [lime]-{0}[/][/]", - i, - tag); + tagsTask.Description = string.Format(UI.Converting_tag_1_for_negative_sector_0, i, tag); bool result; @@ -2148,17 +2134,13 @@ sealed class ConvertImageCommand : Command if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] reading sector [lime]-{1}[/], continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_negative_sector_1_continuing, errno, i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] reading sector [lime]-{1}[/], not continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_negative_sector_1_not_continuing, + errno, + i); return; } @@ -2168,17 +2150,15 @@ sealed class ConvertImageCommand : Command { if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] writing sector [lime]-{1}[/], continuing...[/]", - outputMedia.ErrorMessage, - i); + AaruLogging.Error(UI.Error_0_writing_negative_sector_1_continuing, + outputMedia.ErrorMessage, + i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] writing sector [lime]-{1}[/], not continuing...[/]", - outputMedia.ErrorMessage, - i); + AaruLogging.Error(UI.Error_0_writing_negative_sector_1_not_continuing, + outputMedia.ErrorMessage, + i); errno = ErrorNumber.WriteError; @@ -2220,7 +2200,7 @@ sealed class ConvertImageCommand : Command byte[] sector; mediaTask.Description = - string.Format("Converting overflow sector {0} of {1}", i, nominalOverflowSectors); + string.Format(UI.Converting_overflow_sector_0_of_1, i, nominalOverflowSectors); bool result; SectorStatus sectorStatus; @@ -2233,27 +2213,25 @@ sealed class ConvertImageCommand : Command out sectorStatus); if(errno == ErrorNumber.NoError) + { result = outputMedia.WriteSectorLong(sector, inputFormat.Info.Sectors + i, false, sectorStatus); + } else { result = true; if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] reading overflow sector [lime]{1}[/], continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_overflow_sector_1_continuing, errno, i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] reading overflow sector [lime]{1}[/], not continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_overflow_sector_1_not_continuing, + errno, + i); return; } @@ -2267,27 +2245,25 @@ sealed class ConvertImageCommand : Command out sectorStatus); if(errno == ErrorNumber.NoError) + { result = outputMedia.WriteSector(sector, inputFormat.Info.Sectors + i, false, sectorStatus); + } else { result = true; if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] reading overflow sector [lime]{1}[/], continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_overflow_sector_1_continuing, errno, i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] reading overflow sector [lime]{1}[/], not continuing...", - errno, - i); + AaruLogging.Error(UI.Error_0_reading_overflow_sector_1_not_continuing, + errno, + i); return; } @@ -2298,17 +2274,15 @@ sealed class ConvertImageCommand : Command { if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] writing overflow sector [lime]{1}[/], continuing...[/]", - outputMedia.ErrorMessage, - i); + AaruLogging.Error(UI.Error_0_writing_overflow_sector_1_continuing, + outputMedia.ErrorMessage, + i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] writing overflow sector [lime]{1}[/], not continuing...[/]", - outputMedia.ErrorMessage, - i); + AaruLogging.Error(UI.Error_0_writing_overflow_sector_1_not_continuing, + outputMedia.ErrorMessage, + i); errno = ErrorNumber.WriteError; @@ -2346,11 +2320,7 @@ sealed class ConvertImageCommand : Command for(uint i = 1; i <= nominalOverflowSectors; i++) { - tagsTask.Description = - string - .Format("[slateblue1]Converting tag [orange3]{1}[/] for overflow sector [lime]{0}[/][/]", - i, - tag); + tagsTask.Description = string.Format(UI.Converting_tag_1_for_overflow_sector_0, i, tag); bool result; @@ -2360,27 +2330,27 @@ sealed class ConvertImageCommand : Command out byte[] sector); if(errno == ErrorNumber.NoError) + { result = outputMedia.WriteSectorTag(sector, inputFormat.Info.Sectors + i, false, tag); + } else { result = true; if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] reading overflow sector [lime]{1}[/], continuing...", - errno, - inputFormat.Info.Sectors + i); + AaruLogging.Error(UI.Error_0_reading_overflow_sector_1_continuing, + errno, + inputFormat.Info.Sectors + i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] reading overflow sector [lime]{1}[/], not continuing...", - errno, - inputFormat.Info.Sectors + i); + AaruLogging.Error(UI.Error_0_reading_overflow_sector_1_not_continuing, + errno, + inputFormat.Info.Sectors + i); return; } @@ -2390,17 +2360,15 @@ sealed class ConvertImageCommand : Command { if(settings.Force) { - AaruLogging - .Error("[olive]Error [orange3]{0}[/] writing overflow sector [lime]{1}[/], continuing...[/]", - outputMedia.ErrorMessage, - inputFormat.Info.Sectors + i); + AaruLogging.Error(UI.Error_0_writing_overflow_sector_1_continuing, + outputMedia.ErrorMessage, + inputFormat.Info.Sectors + i); } else { - AaruLogging - .Error("[red]Error [orange3]{0}[/] writing overflow sector [lime]{1}[/], not continuing...[/]", - outputMedia.ErrorMessage, - inputFormat.Info.Sectors + i); + AaruLogging.Error(UI.Error_0_writing_overflow_sector_1_not_continuing, + outputMedia.ErrorMessage, + inputFormat.Info.Sectors + i); errno = ErrorNumber.WriteError; @@ -2543,6 +2511,4 @@ sealed class ConvertImageCommand : Command [CommandOption("--ignore-overflow-sectors")] public bool IgnoreOverflowSectors { get; init; } } - -#endregion } \ No newline at end of file