Use unlocalized name for name and adj before giving up (#353)

* Use unlocalized name for name and adj before giving up

* Warnings

* LocBlockCanBeConstructedWithOnlyEnglishLoc test

Author: IhateTrains

ImperatorToCK3.UnitTests/Mappers/Localization/LocalizationMapperTests.cs

@@ -36,7 +36,7 @@ public void LocalisationsCanBeLoadedAndMatched() {
 		public void UnquotedLocIsIgnored() {
 			var reader = new BufferedReader(
 				"l_english:\n" +
-				" key1:0 unqotedValue"
+				" key1:0 unquotedValue"
 			);
 			var locMapper = new LocalizationMapper();
 			locMapper.ScrapeStream(reader, "english");
@@ -148,5 +148,16 @@ public void LocBlockCanBeCopyConstructed() {
 			Assert.Equal("e", copyLocBlock.simp_chinese);
 			Assert.Equal("f", copyLocBlock.spanish);
 		}
+
+		[Fact]
+		public void LocBlockCanBeConstructedWithOnlyEnglishLoc() {
+			var block = new LocBlock("Rule Britannia");
+			const string expectedLoc = "Rule Britannia";
+			Assert.Equal(expectedLoc, block.english);
+			Assert.Equal(expectedLoc, block.german);
+			Assert.Equal(expectedLoc, block.russian);
+			Assert.Equal(expectedLoc, block.simp_chinese);
+			Assert.Equal(expectedLoc, block.spanish);
+		}
 	}
 }

ImperatorToCK3/CK3/Titles/Title.cs

@@ -184,6 +184,15 @@ public void InitializeFromTag(
 					nameSet = true;
 				}
 			}
+			if (!nameSet) {
+				// use unlocalized name if not empty
+				var name = ImperatorCountry.Name;
+				if (!string.IsNullOrEmpty(name)) {
+					Logger.Warn($"Using unlocalized Imperator name {name} as name for {Name}!");
+					Localizations[Name] = new LocBlock(name);
+					nameSet = true;
+				}
+			}
 			// giving up
 			if (!nameSet) {
 				Logger.Warn($"{Name} needs help with localization! {ImperatorCountry.Name}?");
@@ -409,12 +418,8 @@ public void SetHolderId(string id, Date date) {
 
 		public List<RulerTerm> RulerTerms { get; private set; } = new();
 		public int? DevelopmentLevel {
-			get {
-				return history.DevelopmentLevel;
-			}
-			set {
-				history.DevelopmentLevel = value;
-			}
+			get => history.DevelopmentLevel;
+			set => history.DevelopmentLevel = value;
 		}
 
 		public Dictionary<string, LocBlock> Localizations { get; set; } = new();
@@ -429,15 +434,14 @@ private void TrySetAdjectiveLoc(LocalizationMapper localizationMapper, Dictionar
 
 			var adjSet = false;
 
-			if (ImperatorCountry.Tag == "PRY" || ImperatorCountry.Tag == "SEL" || ImperatorCountry.Tag == "MRY") { // these tags use customizable loc for adj
-				LocBlock? validatedAdj = null;
-				if (ImperatorCountry.Name == "PRY_DYN") {
-					validatedAdj = localizationMapper.GetLocBlockForKey("get_pry_adj_fallback");
-				} else if (ImperatorCountry.Name == "SEL_DYN") {
-					validatedAdj = localizationMapper.GetLocBlockForKey("get_sel_adj_fallback");
-				} else if (ImperatorCountry.Name == "MRY_DYN") {
-					validatedAdj = localizationMapper.GetLocBlockForKey("get_mry_adj_fallback");
-				}
+			if (ImperatorCountry.Tag is "PRY" or "SEL" or "MRY") {
+				// these tags use customizable loc for adj
+				LocBlock? validatedAdj = ImperatorCountry.Name switch {
+					"PRY_DYN" => localizationMapper.GetLocBlockForKey("get_pry_adj_fallback"),
+					"SEL_DYN" => localizationMapper.GetLocBlockForKey("get_sel_adj_fallback"),
+					"MRY_DYN" => localizationMapper.GetLocBlockForKey("get_mry_adj_fallback"),
+					_ => null
+				};
 
 				if (validatedAdj is not null) {
 					Localizations[Name + "_adj"] = validatedAdj;
@@ -451,13 +455,22 @@ private void TrySetAdjectiveLoc(LocalizationMapper localizationMapper, Dictionar
 					adjSet = true;
 				}
 			}
-			if (!adjSet) { // final fallback
+			if (!adjSet) {
 				var adjLocalizationMatch = localizationMapper.GetLocBlockForKey(ImperatorCountry.Tag);
 				if (adjLocalizationMatch is not null) {
 					Localizations[Name + "_adj"] = adjLocalizationMatch;
 					adjSet = true;
 				}
 			}
+			if (!adjSet) {
+				// use unlocalized name if not empty
+				var name = ImperatorCountry.Name;
+				if (!string.IsNullOrEmpty(name)) {
+					Logger.Warn($"Using unlocalized Imperator name {name} as adjective for {Name}!");
+					Localizations[Name + "_adj"] = new LocBlock(name);
+					adjSet = true;
+				}
+			}
 			// giving up
 			if (!adjSet) {
 				Logger.Warn($"{Name} needs help with localization for adjective! {ImperatorCountry.Name}_adj?");

ImperatorToCK3/Imperator/Countries/CountryName.cs

@@ -19,18 +19,21 @@ public object Clone() {
 
 		public LocBlock? GetNameLocBlock(LocalizationMapper localizationMapper, Dictionary<ulong, Country> imperatorCountries) {
 			var directNameLocMatch = localizationMapper.GetLocBlockForKey(Name);
-			if (directNameLocMatch is not null && Name == "CIVILWAR_FACTION_NAME") {
-				// special case for revolts
-				if (BaseName is not null) {
-					var baseAdjLoc = BaseName.GetAdjectiveLocBlock(localizationMapper, imperatorCountries);
-					if (baseAdjLoc is not null) {
-						directNameLocMatch.ModifyForEveryLanguage(baseAdjLoc, (ref string orig, string modifying) =>
-							orig = orig.Replace("$ADJ$", modifying)
-						);
-						return directNameLocMatch;
-					}
-				}
+			if (directNameLocMatch is null || Name != "CIVILWAR_FACTION_NAME") {
+				return directNameLocMatch;
+			}
+
+			// special case for revolts
+			if (BaseName is null) {
+				return directNameLocMatch;
+			}
+			var baseAdjLoc = BaseName.GetAdjectiveLocBlock(localizationMapper, imperatorCountries);
+			if (baseAdjLoc is null) {
+				return directNameLocMatch;
 			}
+			directNameLocMatch.ModifyForEveryLanguage(baseAdjLoc, (ref string orig, string modifying) =>
+				orig = orig.Replace("$ADJ$", modifying)
+			);
 			return directNameLocMatch;
 		}
 		public LocBlock? GetAdjectiveLocBlock(LocalizationMapper localizationMapper, Dictionary<ulong, Country> imperatorCountries) {

ImperatorToCK3/Mappers/Localization/LocBlock.cs

@@ -8,6 +8,11 @@ public class LocBlock {
         public string spanish = "";
 
 		public LocBlock() { }
+
+		public LocBlock(string englishLoc) {
+			english = englishLoc;
+			FillMissingLocsWithEnglish();
+		}
 		public LocBlock(LocBlock otherLocBlock) {
 			english = otherLocBlock.english;
 			french = otherLocBlock.french;