Added normalization of Polish feminine forms of surnames to masculine…

… ones (burtek, #552)
Serg-Norseman · May 15, 2024 · 092166d · 092166d
1 parent cbacbde
commit 092166d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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));
+        }
     }
 }