Skip to content

Commit f318a9c

Browse files
jonko0493jonko0493
authored
Cleanup RESX (#562)
1 parent 3274e6c commit f318a9c

File tree

167 files changed

+6947
-9636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+6947
-9636
lines changed

‎src/SerialLoops.Lib/Build.cs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static bool BuildIterative(Project project, ConfigUser configUser, ILogge
2424
{
2525
bool result = DoBuild(project.IterativeDirectory, project, configUser, log, tracker);
2626
CopyToArchivesToIterativeOriginal(Path.Combine(project.IterativeDirectory, "rom", "data"),
27-
Path.Combine(project.IterativeDirectory, "original", "archives"), log, tracker);
27+
Path.Combine(project.IterativeDirectory, "original", "archives"), project, log, tracker);
2828
ReplicateProjectSettingsAndBanner(Path.Combine(project.IterativeDirectory, "rom"),
2929
Path.Combine(project.BaseDirectory, "rom"), project.Name, log, tracker);
3030
if (result)
@@ -38,7 +38,7 @@ public static bool BuildBase(Project project, ConfigUser configUser, ILogger log
3838
{
3939
bool result = DoBuild(project.BaseDirectory, project, configUser, log, tracker);
4040
CopyToArchivesToIterativeOriginal(Path.Combine(project.BaseDirectory, "rom", "data"),
41-
Path.Combine(project.IterativeDirectory, "original", "archives"), log, tracker);
41+
Path.Combine(project.IterativeDirectory, "original", "archives"), project, log, tracker);
4242
ReplicateProjectSettingsAndBanner(Path.Combine(project.BaseDirectory, "rom"),
4343
Path.Combine(project.IterativeDirectory, "rom"), project.Name, log, tracker);
4444
if (result)
@@ -52,7 +52,7 @@ private static void CleanIterative(Project project, ILogger log, IProgressTracke
5252
{
5353
string[] preservedFiles = [];
5454
string[] cleanableFiles = Directory.GetFiles(Path.Combine(project.IterativeDirectory, "assets"), "*", SearchOption.AllDirectories);
55-
tracker.Focus("Cleaning Iterative Directory", cleanableFiles.Length);
55+
tracker.Focus("BuildCleaningIterativeDirectory", cleanableFiles.Length);
5656
foreach (string file in cleanableFiles)
5757
{
5858
if (!preservedFiles.Contains(Path.GetFileName(file)))
@@ -79,22 +79,22 @@ private static bool DoBuild(string directory, Project project, ConfigUser config
7979
commandsIncSb.AppendLine(command.GetMacro());
8080
}
8181

82-
tracker.Focus("Loading Archives (dat.bin)", 3);
82+
tracker.Focus(project.Localize("ProjectLoadLoadingDatBin"), 3);
8383
var dat = ArchiveFile<DataFile>.FromFile(Path.Combine(directory, "original", "archives", "dat.bin"), log);
8484
tracker.Finished++;
85-
tracker.CurrentlyLoading = "Loading Archives (evt.bin)";
85+
tracker.CurrentlyLoading = project.Localize("ProjectLoadLoadingEvtBin");
8686
var evt = ArchiveFile<EventFile>.FromFile(Path.Combine(directory, "original", "archives", "evt.bin"), log);
8787
tracker.Finished++;
88-
tracker.CurrentlyLoading = "Loading Archives (grp.bin)";
88+
tracker.CurrentlyLoading = project.Localize("ProjectLoadLoadingGrpBin");
8989
var grp = ArchiveFile<GraphicsFile>.FromFile(Path.Combine(directory, "original", "archives", "grp.bin"), log);
9090

9191
if (dat is null || evt is null || grp is null)
9292
{
93-
log.LogError("One or more archives is null.");
93+
log.LogError(project.Localize("ErrorArchivesNull"));
9494
return false;
9595
}
9696

97-
tracker.Focus("Writing Includes", 4);
97+
tracker.Focus(project.Localize("BuildWritingIncludesProgressMessage"), 4);
9898
try
9999
{
100100
File.WriteAllText(Path.Combine(directory, "COMMANDS.INC"), commandsIncSb.ToString());
@@ -104,14 +104,14 @@ private static bool DoBuild(string directory, Project project, ConfigUser config
104104
}
105105
catch (IOException exc)
106106
{
107-
log.LogException("Failed to write include files to disk.", exc);
107+
log.LogException(project.Localize("ErrorFailedWritingIncludeFiles"), exc);
108108
return false;
109109
}
110110
tracker.Finished += 4;
111111

112112
// Replace files
113113
string[] files = Directory.GetFiles(Path.Combine(directory, "assets"), "*.*", SearchOption.AllDirectories);
114-
tracker.Focus("Replacing Files", files.Length);
114+
tracker.Focus(project.Localize("BuildReplacingFilesProgressMessage"), files.Length);
115115
foreach (string file in files)
116116
{
117117
if (int.TryParse(Path.GetFileNameWithoutExtension(file).Split('_')[0], NumberStyles.HexNumber, new CultureInfo("en-US"), out int index) || Path.GetFileName(file).StartsWith("new", StringComparison.OrdinalIgnoreCase))
@@ -160,7 +160,7 @@ private static bool DoBuild(string directory, Project project, ConfigUser config
160160
}
161161
else
162162
{
163-
log.LogError(string.Format(project.Localize("Unsure what to do with file '{0}'"), Path.GetFileName(file)));
163+
log.LogError(string.Format(project.Localize("BuildUnsureWhatToDoWithFileMessage"), Path.GetFileName(file)));
164164
return false;
165165
}
166166
}
@@ -173,7 +173,7 @@ private static bool DoBuild(string directory, Project project, ConfigUser config
173173
}
174174

175175
// Save files to disk
176-
tracker.Focus("Writing Replaced Archives", 3);
176+
tracker.Focus("BuildWritingReplacedArchivesProgressMessage", 3);
177177
if (!IO.WriteBinaryFile(Path.Combine(directory, "rom", "data", "dat.bin"), dat?.GetBytes(), log))
178178
{
179179
return false;
@@ -190,36 +190,36 @@ private static bool DoBuild(string directory, Project project, ConfigUser config
190190

191191
// Save project file to disk
192192
string ndsProjectFile = Path.Combine(directory, "rom", $"{project.Name}.json");
193-
tracker.Focus("Writing NitroPacker Project File", 1);
193+
tracker.Focus(project.Localize("BuildWritingNPProjectFile"), 1);
194194
try
195195
{
196196
project.Settings.File.Serialize(ndsProjectFile);
197197
}
198198
catch (IOException exc)
199199
{
200-
log.LogException("Failed to write NitroPacker NDS project file to disk", exc);
200+
log.LogException(project.Localize("ErrorFailedWritingNPProjectFile"), exc);
201201
return false;
202202
}
203203
tracker.Finished++;
204204

205-
tracker.Focus("Packing ROM", 1);
205+
tracker.Focus(project.Localize("BuildPackingRomProgressMessage"), 1);
206206
try
207207
{
208208
NdsProjectFile.Pack(Path.Combine(project.MainDirectory, $"{project.Name}.nds"), ndsProjectFile);
209209
}
210210
catch (Exception exc)
211211
{
212-
log.LogException("NitroPacker failed to pack ROM with exception", exc);
212+
log.LogException(project.Localize("BuildNitroPackerFailedPacking"), exc);
213213
return false;
214214
}
215215
tracker.Finished++;
216216

217217
return true;
218218
}
219219

220-
private static void CopyToArchivesToIterativeOriginal(string newDataDir, string iterativeOriginalDir, ILogger log, IProgressTracker tracker)
220+
private static void CopyToArchivesToIterativeOriginal(string newDataDir, string iterativeOriginalDir, Project project, ILogger log, IProgressTracker tracker)
221221
{
222-
tracker.Focus("Copying Archives to Iterative Originals", 4);
222+
tracker.Focus(project.Localize("BuildCopyingArchivesMessage"), 4);
223223
try
224224
{
225225
File.Copy(Path.Combine(newDataDir, "dat.bin"), Path.Combine(iterativeOriginalDir, "dat.bin"), overwrite: true);
@@ -233,7 +233,7 @@ private static void CopyToArchivesToIterativeOriginal(string newDataDir, string
233233
}
234234
catch (IOException exc)
235235
{
236-
log.LogException($"Failed to copy newly built archives to the iterative originals directory", exc);
236+
log.LogException(project.Localize("ErrorFailedCopyingArchivesToIterativeDir"), exc);
237237
}
238238
}
239239

@@ -273,7 +273,7 @@ private static void ReplaceSingleGraphicsFile(ArchiveFile<GraphicsFile> grp, str
273273
}
274274
catch (Exception ex)
275275
{
276-
log.LogException(string.Format(localize("Failed replacing graphics file {0} with file '{1}'"), index, filePath), ex);
276+
log.LogException(string.Format(localize("ErrorFailedReplacingGraphicsFile"), index, filePath), ex);
277277
}
278278
}
279279

@@ -290,7 +290,7 @@ private static void ReplaceSingleScreenGraphicsFile(ArchiveFile<GraphicsFile> gr
290290
}
291291
catch (Exception ex)
292292
{
293-
log.LogException(string.Format(localize("Failed replacing graphics file {0} with file '{1}'"), index, filePath), ex);
293+
log.LogException(string.Format(localize("ErrorFailedReplacingGraphicsFile"), index, filePath), ex);
294294
}
295295
}
296296

@@ -309,7 +309,7 @@ private static void ReplaceSingleLayoutGraphicsFile(ArchiveFile<GraphicsFile> gr
309309
}
310310
catch (Exception ex)
311311
{
312-
log.LogException(string.Format(localize("Failed replacing graphics file {0} with file '{1}'"), index, filePath), ex);
312+
log.LogException(string.Format(localize("ErrorFailedReplacingGraphicsFile"), index, filePath), ex);
313313
}
314314
}
315315

@@ -320,7 +320,7 @@ private static bool ReplaceSingleSourceFile(ArchiveFile<EventFile> archive, stri
320320
(string objFile, string binFile) = CompileSourceFile(filePath, llvm, workingDirectory, localize, log);
321321
if (!File.Exists(binFile))
322322
{
323-
log.LogError(string.Format(localize("Compiled file {0} does not exist!"), binFile));
323+
log.LogError(string.Format(localize("BuildErrorCompiledFileNotExist"), binFile));
324324
return false;
325325
}
326326
ReplaceSingleFile(archive, binFile, index, localize, log);
@@ -330,7 +330,7 @@ private static bool ReplaceSingleSourceFile(ArchiveFile<EventFile> archive, stri
330330
}
331331
catch (Exception ex)
332332
{
333-
log.LogException(string.Format(localize("Failed replacing source file {0} in evt.bin with file '{1}'"), index, filePath), ex);
333+
log.LogException(string.Format(localize("ErrorFailedReplacingEvtSourceFile"), index, filePath), ex);
334334
return false;
335335
}
336336
}
@@ -341,7 +341,7 @@ private static bool ReplaceSingleSourceFile(ArchiveFile<DataFile> archive, strin
341341
(string objFile, string binFile) = CompileSourceFile(filePath, llvm, workingDirectory, localize, log);
342342
if (!File.Exists(binFile))
343343
{
344-
log.LogError(string.Format(localize("Compiled file {0} does not exist!"), binFile));
344+
log.LogError(string.Format(localize("BuildErrorCompiledFileNotExist"), binFile));
345345
return false;
346346
}
347347
ReplaceSingleFile(archive, binFile, index, localize, log);
@@ -351,7 +351,7 @@ private static bool ReplaceSingleSourceFile(ArchiveFile<DataFile> archive, strin
351351
}
352352
catch (Exception ex)
353353
{
354-
log.LogException(string.Format(localize("Failed replacing source file {0} in dat.bin with file '{1}'"), index, filePath), ex);
354+
log.LogException(string.Format(localize("ErrorFailedReplacingDatFile"), index, filePath), ex);
355355
return false;
356356
}
357357
}
@@ -426,7 +426,7 @@ private static void ReplaceSingleFile(ArchiveFile<EventFile> archive, string fil
426426
}
427427
catch (Exception ex)
428428
{
429-
log.LogException(string.Format(localize("Failed replacing file {0} in evt.bin with file '{1}'"), index, filePath), ex);
429+
log.LogException(string.Format(localize("ErrorFailedReplacingEvtFile"), index, filePath), ex);
430430
}
431431
}
432432
private static void ReplaceSingleFile(ArchiveFile<DataFile> archive, string filePath, int index, Func<string, string> localize, ILogger log)
@@ -440,7 +440,7 @@ private static void ReplaceSingleFile(ArchiveFile<DataFile> archive, string file
440440
}
441441
catch (Exception ex)
442442
{
443-
log.LogException(string.Format(localize("Failed replacing source file {0} in dat.bin with file '{1}'"), index, filePath), ex);
443+
log.LogException(string.Format(localize("ErrorFailedReplacingDatFile"), index, filePath), ex);
444444
}
445445
}
446446
private static void ReplaceSingleBinaryFile(ArchiveFile<GraphicsFile> archive, string filePath, int index, Func<string, string> localize, ILogger log)
@@ -459,7 +459,7 @@ private static void ReplaceSingleBinaryFile(ArchiveFile<GraphicsFile> archive, s
459459
}
460460
catch (Exception ex)
461461
{
462-
log.LogException(string.Format(localize("Failed replacing animation file {0} in grp.bin with file '{1}'"), index, filePath), ex);
462+
log.LogException(string.Format(localize("ErrorFailedReplacingAnimationFile"), index, filePath), ex);
463463
}
464464
}
465465
}

‎src/SerialLoops.Lib/ConfigUser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ internal void InitializeScriptTemplates(Func<string, string> localize, ILogger l
121121
}
122122
catch (Exception ex)
123123
{
124-
log.LogException(string.Format(localize("Failed to deserialize script template file '{0}'"), scriptTemplateFile), ex);
124+
log.LogException(string.Format(localize("ErrorFailedDeserializingScriptTemplate"), scriptTemplateFile), ex);
125125
}
126126
}
127127
ScriptTemplates = new(templates);

‎src/SerialLoops.Lib/Factories/ConfigFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public ConfigUser LoadConfig(Func<string, string> localize, ILogger log)
8383
}
8484
catch (JsonException exc)
8585
{
86-
log.LogException(localize("Exception occurred while parsing config.json!"), exc);
86+
log.LogException(localize("ErrorParsingConfigJson"), exc);
8787
ConfigUser defaultConfigUser = GetDefault(sysConfig, log);
8888
defaultConfigUser.ValidateConfig(localize, log);
8989
IO.WriteStringFile(configJson, JsonSerializer.Serialize(defaultConfigUser), log);

‎src/SerialLoops.Lib/Flags.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,35 @@ public static string GetFlagNickname(int flag, Project project)
2323
TopicItem topic = (TopicItem)project.Items.FirstOrDefault(i => i.Type == ItemDescription.ItemType.Topic && ((TopicItem)i).TopicEntry.Id == flag + 1);
2424
if (topic is not null)
2525
{
26-
return string.Format(project.Localize("{0} Obtained (F{1:D2})"), topic.DisplayName, flag);
26+
return string.Format(project.Localize("FlagTopicObtained"), topic.DisplayName, flag);
2727
}
2828

2929
TopicItem readTopic = (TopicItem)project.Items.FirstOrDefault(i => i.Type == ItemDescription.ItemType.Topic &&
3030
((((TopicItem)i).TopicEntry.Type == TopicType.Main && ((TopicItem)i).HiddenMainTopic is not null && ((TopicItem)i).TopicEntry.Id + 3463 == flag + 1) ||
3131
(((TopicItem)i).TopicEntry.Type != TopicType.Main && ((TopicItem)i).TopicEntry.Id + 3451 == flag + 1)));
3232
if (readTopic is not null)
3333
{
34-
return string.Format(project.Localize("{0} Watched in Extras (F{1:D2})"), readTopic.DisplayName, flag);
34+
return string.Format(project.Localize("FlagTopicSceneWatchedInExtras"), readTopic.DisplayName, flag);
3535
}
3636

3737
BackgroundMusicItem bgm = (BackgroundMusicItem)project.Items.FirstOrDefault(i => i.Type == ItemDescription.ItemType.BGM && ((BackgroundMusicItem)i).Flag == flag + 1);
3838
if (bgm is not null)
3939
{
40-
return string.Format(project.Localize("Listened to {0} (F{1:D2})"), bgm.DisplayName, flag);
40+
return string.Format(project.Localize("FlagListenedToBgm"), bgm.DisplayName, flag);
4141
}
4242

4343
BackgroundItem bg = (BackgroundItem)project.Items.FirstOrDefault(i => i.Type == ItemDescription.ItemType.Background && ((BackgroundItem)i).Flag == flag + 1);
4444
if (bg is not null && flag + 1 > 0)
4545
{
46-
return string.Format(project.Localize("{0} ({1}) Seen (F{2:D2})"), bg.CgName, bg.DisplayName, flag);
46+
return string.Format(project.Localize("FlagCgSeen"), bg.CgName, bg.DisplayName, flag);
4747
}
4848

4949
GroupSelectionItem groupSelection = (GroupSelectionItem)project.Items.FirstOrDefault(i => i.Type == ItemDescription.ItemType.Group_Selection &&
5050
((GroupSelectionItem)i).Selection.Activities.Any(a => a?.Routes.Any(r => r?.Flag == flag + 1) ?? false));
5151
if (groupSelection is not null)
5252
{
5353
ScenarioRoute route = groupSelection.Selection.Activities.First(a => a?.Routes.Any(r => r.Flag == flag + 1) ?? false).Routes.First(r => r.Flag == flag + 1);
54-
return string.Format(project.Localize("Route \"{0}\" Completed (F{1:D2})"), route.Title.GetSubstitutedString(project), flag);
54+
return string.Format(project.Localize("FlagsRouteCompletedDescription"), route.Title.GetSubstitutedString(project), flag);
5555
}
5656

5757
ScriptItem script = (ScriptItem)project.Items.FirstOrDefault(i => i.Type == ItemDescription.ItemType.Script && ((ScriptItem)i).StartReadFlag > 0 &&
@@ -64,7 +64,7 @@ public static string GetFlagNickname(int flag, Project project)
6464
Tutorial tutorial = project.TutorialFile.Tutorials.FirstOrDefault(t => t.Id != 0 && t.Id == flag + 1);
6565
if (tutorial is not null)
6666
{
67-
return string.Format(project.Localize("Tutorial {0} Completed (F{1:D2})"),
67+
return string.Format(project.Localize("FlagsTutorialCompletedDescription"),
6868
((ScriptItem)project.Items.First(i =>
6969
i.Type == ItemDescription.ItemType.Script &&
7070
((ScriptItem)i).Event.Index == tutorial.AssociatedScript)).DisplayName, flag);

‎src/SerialLoops.Lib/Hacks/AsmHack.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void Revert(Project project, ILogger log)
111111
// If there's at least one success, we assume that an older version of the hack was applied and we've now rolled it back
112112
if (!oneSuccess)
113113
{
114-
log.LogError(string.Format(project.Localize("Failed to delete files for hack '{0}' -- this hack is likely applied in the ROM base and can't be disabled."), Name));
114+
log.LogError(string.Format(project.Localize("ErrorFailedDeletingHackFiles"), Name));
115115
IsApplied = true;
116116
}
117117
}

0 commit comments

Comments
 (0)