From 71291ba070aca5b66480f0150c0a57ac786edb90 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sun, 27 Nov 2022 14:05:44 +0000 Subject: [PATCH] Move all localizable strings from Aaru.Decryption project to resources. --- Aaru.Decryption.csproj | 15 +++++ Aaru.Decryption.csproj.DotSettings | 2 + DVD/Dump.cs | 30 ++++----- Localization/Localization.Designer.cs | 96 +++++++++++++++++++++++++++ Localization/Localization.resx | 48 ++++++++++++++ 5 files changed, 175 insertions(+), 16 deletions(-) create mode 100644 Aaru.Decryption.csproj.DotSettings create mode 100644 Localization/Localization.Designer.cs create mode 100644 Localization/Localization.resx diff --git a/Aaru.Decryption.csproj b/Aaru.Decryption.csproj index db1a4fb78..2eeb87214 100644 --- a/Aaru.Decryption.csproj +++ b/Aaru.Decryption.csproj @@ -48,4 +48,19 @@ + + + ResXFileCodeGenerator + Localization.Designer.cs + + + + + + True + True + Localization.resx + + + diff --git a/Aaru.Decryption.csproj.DotSettings b/Aaru.Decryption.csproj.DotSettings new file mode 100644 index 000000000..dc0dbdcef --- /dev/null +++ b/Aaru.Decryption.csproj.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/DVD/Dump.cs b/DVD/Dump.cs index 2b42dbc7b..b6878b0a2 100644 --- a/DVD/Dump.cs +++ b/DVD/Dump.cs @@ -80,7 +80,7 @@ public sealed class Dump _dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense); - AaruConsole.DebugWriteLine("SCSI Device", "REPORT ASF (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms.", + AaruConsole.DebugWriteLine("SCSI Device", Localization.REPORT_ASF_AGID_1_Sense_2_Last_Error_3_took_0_ms, duration, Agid, sense, _dev.LastError); return sense; @@ -108,7 +108,7 @@ public sealed class Dump _dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense); - AaruConsole.DebugWriteLine("SCSI Device", "REPORT ASF (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms.", + AaruConsole.DebugWriteLine("SCSI Device", Localization.REPORT_ASF_AGID_1_Sense_2_Last_Error_3_took_0_ms, duration, Agid, sense, _dev.LastError); return sense; @@ -136,9 +136,8 @@ public sealed class Dump _dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense); - AaruConsole.DebugWriteLine("SCSI Device", - "INVALIDATE AGID (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms.", duration, - Agid, sense, _dev.LastError); + AaruConsole.DebugWriteLine("SCSI Device", Localization.INVALIDATE_AGID_AGID_1_Sense_2_Last_Error_3_took_0_ms, + duration, Agid, sense, _dev.LastError); return sense; } @@ -166,8 +165,8 @@ public sealed class Dump _dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense); AaruConsole.DebugWriteLine("SCSI Device", - "REPORT AGID CSS/CPPM (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms.", - duration, Agid, sense, _dev.LastError); + Localization.REPORT_AGID_CSS_CPPM_AGID_1_Sense_2_Last_Error_3_took_0_ms, duration, + Agid, sense, _dev.LastError); return sense; } @@ -194,7 +193,7 @@ public sealed class Dump _dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense); - AaruConsole.DebugWriteLine("SCSI Device", "REPORT KEY1 (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms.", + AaruConsole.DebugWriteLine("SCSI Device", Localization.REPORT_KEY1_AGID_1_Sense_2_Last_Error_3_took_0_ms, duration, Agid, sense, _dev.LastError); return sense; @@ -222,9 +221,8 @@ public sealed class Dump _dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense); - AaruConsole.DebugWriteLine("SCSI Device", - "REPORT CHALLENGE (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms.", duration, - Agid, sense, _dev.LastError); + AaruConsole.DebugWriteLine("SCSI Device", Localization.REPORT_CHALLENGE_AGID_1_Sense_2_Last_Error_3_took_0_ms, + duration, Agid, sense, _dev.LastError); return sense; } @@ -266,7 +264,7 @@ public sealed class Dump out bool sense); AaruConsole.DebugWriteLine("SCSI Device", - "SEND CHALLENGE (AGID: {1}, Challenge {2}, Sense: {3}, Last Error: {4}) took {0} ms.", + Localization.SEND_CHALLENGE_AGID_1_Challenge_2_Sense_3_Last_Error_4_took_0_ms, duration, Agid, challengeKey, sense, _dev.LastError); return sense; @@ -304,8 +302,8 @@ public sealed class Dump out bool sense); AaruConsole.DebugWriteLine("SCSI Device", - "SEND CHALLENGE (AGID: {1}, KEY2 {2}, Sense: {3}, Last Error: {4}) took {0} ms.", - duration, Agid, key2, sense, _dev.LastError); + Localization.SEND_CHALLENGE_AGID_1_KEY2_2_Sense_3_Last_Error_4_took_0_ms, duration, + Agid, key2, sense, _dev.LastError); return sense; } @@ -475,8 +473,8 @@ public sealed class Dump _dev.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out bool sense); - AaruConsole.DebugWriteLine("SCSI Device", "GET TITLE KEY (AGID: {1}, LBA: {2}, Sense: {3}) took {0} ms.", - duration, Agid, address, sense); + AaruConsole.DebugWriteLine("SCSI Device", Localization.GET_TITLE_KEY_AGID_1_LBA_2_Sense_3_took_0_ms, duration, + Agid, address, sense); return sense; } diff --git a/Localization/Localization.Designer.cs b/Localization/Localization.Designer.cs new file mode 100644 index 000000000..90bad9bd3 --- /dev/null +++ b/Localization/Localization.Designer.cs @@ -0,0 +1,96 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Aaru.Decryption { + using System; + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [System.Diagnostics.DebuggerNonUserCodeAttribute()] + [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Localization { + + private static System.Resources.ResourceManager resourceMan; + + private static System.Globalization.CultureInfo resourceCulture; + + [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Localization() { + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Resources.ResourceManager ResourceManager { + get { + if (object.Equals(null, resourceMan)) { + System.Resources.ResourceManager temp = new System.Resources.ResourceManager("Aaru.Decryption.Localization.Localization", typeof(Localization).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + internal static System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + internal static string REPORT_ASF_AGID_1_Sense_2_Last_Error_3_took_0_ms { + get { + return ResourceManager.GetString("REPORT_ASF_AGID_1_Sense_2_Last_Error_3_took_0_ms", resourceCulture); + } + } + + internal static string INVALIDATE_AGID_AGID_1_Sense_2_Last_Error_3_took_0_ms { + get { + return ResourceManager.GetString("INVALIDATE_AGID_AGID_1_Sense_2_Last_Error_3_took_0_ms", resourceCulture); + } + } + + internal static string REPORT_AGID_CSS_CPPM_AGID_1_Sense_2_Last_Error_3_took_0_ms { + get { + return ResourceManager.GetString("REPORT_AGID_CSS_CPPM_AGID_1_Sense_2_Last_Error_3_took_0_ms", resourceCulture); + } + } + + internal static string REPORT_KEY1_AGID_1_Sense_2_Last_Error_3_took_0_ms { + get { + return ResourceManager.GetString("REPORT_KEY1_AGID_1_Sense_2_Last_Error_3_took_0_ms", resourceCulture); + } + } + + internal static string REPORT_CHALLENGE_AGID_1_Sense_2_Last_Error_3_took_0_ms { + get { + return ResourceManager.GetString("REPORT_CHALLENGE_AGID_1_Sense_2_Last_Error_3_took_0_ms", resourceCulture); + } + } + + internal static string SEND_CHALLENGE_AGID_1_Challenge_2_Sense_3_Last_Error_4_took_0_ms { + get { + return ResourceManager.GetString("SEND_CHALLENGE_AGID_1_Challenge_2_Sense_3_Last_Error_4_took_0_ms", resourceCulture); + } + } + + internal static string SEND_CHALLENGE_AGID_1_KEY2_2_Sense_3_Last_Error_4_took_0_ms { + get { + return ResourceManager.GetString("SEND_CHALLENGE_AGID_1_KEY2_2_Sense_3_Last_Error_4_took_0_ms", resourceCulture); + } + } + + internal static string GET_TITLE_KEY_AGID_1_LBA_2_Sense_3_took_0_ms { + get { + return ResourceManager.GetString("GET_TITLE_KEY_AGID_1_LBA_2_Sense_3_took_0_ms", resourceCulture); + } + } + } +} diff --git a/Localization/Localization.resx b/Localization/Localization.resx new file mode 100644 index 000000000..32dc9b77d --- /dev/null +++ b/Localization/Localization.resx @@ -0,0 +1,48 @@ + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + + + + REPORT ASF (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms. + + + INVALIDATE AGID (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms. + + + REPORT AGID CSS/CPPM (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms. + + + REPORT KEY1 (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms. + + + REPORT CHALLENGE (AGID: {1}, Sense: {2}, Last Error: {3}) took {0} ms. + + + SEND CHALLENGE (AGID: {1}, Challenge {2}, Sense: {3}, Last Error: {4}) took {0} ms. + + + SEND CHALLENGE (AGID: {1}, KEY2 {2}, Sense: {3}, Last Error: {4}) took {0} ms. + + + GET TITLE KEY (AGID: {1}, LBA: {2}, Sense: {3}) took {0} ms. + + \ No newline at end of file