From 092166de40e4fcfba1bd4783d61087c26bcb473b Mon Sep 17 00:00:00 2001
From: "Serg V. Zhdanovskih (Norseman)" <serg.zhdanovskih@yandex.ru>
Date: Wed, 15 May 2024 10:42:48 +0300
Subject: [PATCH] Added normalization of Polish feminine forms of surnames to
 masculine ones (burtek, #552)

---
 locales/help_enu/gkhHistory.html                |  1 +
 locales/help_rus/gkhHistory.html                |  1 +
 .../GKCore/GKCore/Cultures/DefaultCulture.cs    | 11 ++++++++++-
 .../GKCore/GKCore/Cultures/PolishCulture.cs     |  2 +-
 .../GKCore/GKCore/Cultures/RussianCulture.cs    |  9 ---------
 projects/GKTests/GKCore/CulturesTests.cs        | 17 ++++++++++++++++-
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index f87160cf0..83d1bc57b 100644
--- a/locales/help_enu/gkhHistory.html
+++ b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>Change log</h1>
 
     <p>
         <b>28.05.2024 [v2.30.0 &amp; v3.6.0]</b><ul>
+             <li>Added normalization of Polish feminine forms of surnames to masculine ones (burtek).
              <li>Improved saving of notes with text aligned with spaces.
              <li>Improved output of portraits from photos with DPI > 100 in GKv3.
              <li>Improved age calculation for some date combinations.
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index 9fed36e87..d838d6391 100644
--- a/locales/help_rus/gkhHistory.html
+++ b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,7 @@ <h1>История версий</h1>
 
     <p>
         <b>28.05.2024 [v2.30.0 &amp; v3.6.0]</b><ul>
+            <li>Добавлена нормализация польских женских форм фамилий в мужские (burtek).
             <li>Улучшено сохранение заметок с выравниванием текста пробелами.
             <li>Улучшен вывод портретов из фотографий с DPI > 100 в GKv3.
             <li>Улучшен расчет возраста при некоторых сочетаниях дат.
diff --git a/projects/GKCore/GKCore/Cultures/DefaultCulture.cs b/projects/GKCore/GKCore/Cultures/DefaultCulture.cs
index 3512de87f..873d51f21 100644
--- a/projects/GKCore/GKCore/Cultures/DefaultCulture.cs
+++ b/projects/GKCore/GKCore/Cultures/DefaultCulture.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -47,6 +47,15 @@ public virtual string NormalizeSurname(string sn, bool aFemale)
             return sn;
         }
 
+        public static string GetMaidenSurname(string surname)
+        {
+            if (string.IsNullOrEmpty(surname)) return string.Empty;
+
+            int p = surname.IndexOf(" (");
+            string result = ((p >= 0) ? surname.Substring(0, p) : surname);
+            return result;
+        }
+
         public virtual string GetMarriedSurname(string husbSurname)
         {
             return husbSurname;
diff --git a/projects/GKCore/GKCore/Cultures/PolishCulture.cs b/projects/GKCore/GKCore/Cultures/PolishCulture.cs
index ce4ebd392..f7305c49f 100644
--- a/projects/GKCore/GKCore/Cultures/PolishCulture.cs
+++ b/projects/GKCore/GKCore/Cultures/PolishCulture.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2017 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih, burtek.
  *
  *  This file is part of "GEDKeeper".
  *
diff --git a/projects/GKCore/GKCore/Cultures/RussianCulture.cs b/projects/GKCore/GKCore/Cultures/RussianCulture.cs
index 1d8d97301..8c31fda00 100644
--- a/projects/GKCore/GKCore/Cultures/RussianCulture.cs
+++ b/projects/GKCore/GKCore/Cultures/RussianCulture.cs
@@ -37,15 +37,6 @@ public RussianCulture()
             HasSurname = true;
         }
 
-        private static string GetMaidenSurname(string surname)
-        {
-            if (string.IsNullOrEmpty(surname)) return "";
-
-            int p = surname.IndexOf(" (");
-            string result = ((p >= 0) ? surname.Substring(0, p) : surname);
-            return result;
-        }
-
         public override string NormalizeSurname(string sn, bool aFemale)
         {
             if (string.IsNullOrEmpty(sn) || (sn[0] == '(' && sn[sn.Length - 1] == ')'))
diff --git a/projects/GKTests/GKCore/CulturesTests.cs b/projects/GKTests/GKCore/CulturesTests.cs
index f40c627c2..75542602b 100644
--- a/projects/GKTests/GKCore/CulturesTests.cs
+++ b/projects/GKTests/GKCore/CulturesTests.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -195,5 +195,20 @@ public async Task Test_RussianCulture()
 
             Assert.AreEqual("Иванова Ивана Ивановича", rusCulture.GetPossessiveName(iRec2));
         }
+
+        [Test]
+        public void Test_PolishCulture()
+        {
+            ICulture culture = new PolishCulture();
+            Assert.IsNotNull(culture);
+            Assert.IsFalse(culture.HasPatronymic);
+            Assert.IsTrue(culture.HasSurname);
+
+            Assert.AreEqual("Kowalski", culture.NormalizeSurname("Kowalska", true));
+
+            Assert.AreEqual("?", culture.NormalizeSurname(null, false));
+            Assert.AreEqual("?", culture.NormalizeSurname("", false));
+            Assert.AreEqual("?", culture.NormalizeSurname("(Kowalska)", false));
+        }
     }
 }