Skip to content

Commit

Permalink
Added a simple definition of the list of censuses in which persons fr…
Browse files Browse the repository at this point in the history
…om the database can be found
  • Loading branch information
Serg-Norseman committed Dec 24, 2023
1 parent 5c28e09 commit fc9abbe
Show file tree
Hide file tree
Showing 31 changed files with 329 additions and 8 deletions.
33 changes: 33 additions & 0 deletions externals/censuses/Russia.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
Censuses:
- Country: Россия, Русское царство, Российское царство, Московское царство, РЦ, МЦ
Date: BET 1718 AND 1719
Name: 1-я ревизия
- Country: Россия, Российская Империя, РИ
Date: BET 1743 AND 1747
Name: 2-я ревизия
- Country: Россия, Российская Империя, РИ
Date: BET 1761 AND 1767
Name: 3-я ревизия
- Country: Россия, Российская Империя, РИ
Date: BET 1781 AND 1787
Name: 4-я ревизия
- Country: Россия, Российская Империя, РИ
Date: BET 1794 AND 1808
Name: 5-я ревизия
- Country: Россия, Российская Империя, РИ
Date: 1811
Name: 6-я ревизия
- Country: Россия, Российская Империя, РИ
Date: BET 1815 AND 1825
Name: 7-я ревизия
- Country: Россия, Российская Империя, РИ
Date: BET 1833 AND 1835
Name: 8-я ревизия
- Country: Россия, Российская Империя, РИ
Date: 1850
Name: 9-я ревизия
- Country: Россия, Российская Империя, РИ
Date: BET 1857 AND 1859
Name: 10-я ревизия
...
2 changes: 2 additions & 0 deletions locales/Belarusian.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/Chinese Simplified.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/Dutch.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/English.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/Hungarian.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Használja a születési dátumokat a személyes kiválasztási szűrőben
934=A tényérték üres vagy érvénytelen
935=Portré
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/Icelandic.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/Japanese.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=個人選択フィルターで生年月日を使用する
934=ファクト値が空か無効です
935=ポートレート
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/Kazakh (Cyrillic).lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/Portuguese.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/Serbian (Latin).lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/Spanish.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/czech.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/french.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/german.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Verwende Geburtsdaten im Filter für Personen
934=Wert ist leer oder ungültig
935=Porträt
936=Census analysis
937=The person can be found in the census `{0}`
1 change: 1 addition & 0 deletions locales/help_enu/gkhHistory.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ <h1>Change log</h1>

<p>
<b>??.??.2024 [v2.29.0 &amp; v3.5.0]</b><ul>
<li>Added a simple definition of the list of censuses in which persons from the database can be found (so far only for the Russian Empire 1718-1859).
<li>Fixed stability of setting the storage type when selecting a multimedia file.
<li>Updated Hungarian and German localizations.
<li>Restored the original mode for calculating age and lifetime, the dependence of age on the use of the Time Line plugin.
Expand Down
1 change: 1 addition & 0 deletions locales/help_rus/gkhHistory.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ <h1>История версий</h1>

<p>
<b>??.??.2024 [v2.29.0 &amp; v3.5.0]</b><ul>
<li>Добавлено простое определение перечня переписей, в которых могут быть обнаружены персоны из базы (пока только для Российской империи 1718-1859).
<li>Исправлена стабильность установки типа хранилища при выборе мультимедийного файла.
<li>Обновлены венгерская и немецкая локализации.
<li>Восстановлен оригинальный режим расчета возраста и продолжительности жизни, зависимости возраста от использования плагина "Линия времени".
Expand Down
2 changes: 2 additions & 0 deletions locales/italian.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/polish.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
2 changes: 2 additions & 0 deletions locales/russian.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Использовать даты рождения в фильтре выбора персоны
934=Значение факта пусто или некорректно
935=Портрет
936=Анализ переписей
937=Персона может быть найдена в переписи `{0}`
2 changes: 2 additions & 0 deletions locales/ukrainian.lng
Original file line number Diff line number Diff line change
Expand Up @@ -941,3 +941,5 @@
933=Use dates of birth in person selection filter
934=Fact value is empty or invalid
935=Portrait
936=Census analysis
937=The person can be found in the census `{0}`
1 change: 1 addition & 0 deletions projects/GKCore/GKCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
</Compile>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="GDModel\Providers\GEDZIP\GEDZIPProvider.cs" />
<Compile Include="GKCore\Censuses.cs" />
<Compile Include="GKCore\Design\Controls\IFilterControl.cs" />
<Compile Include="GKCore\Design\Controls\ISplitter.cs" />
<Compile Include="GKCore\Design\IForm.cs" />
Expand Down
5 changes: 4 additions & 1 deletion projects/GKCore/GKCore/Calendar/UDN.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
*/

using System;
using System.Runtime.CompilerServices;
using BSLib;

namespace GKCore.Calendar
Expand Down Expand Up @@ -204,6 +205,7 @@ public bool Equals(UDN other)
/// <param name="r">The right value to compare</param>
/// <returns>'-1' when the `l` is less than the `r`, '1' when the `l` is greater than the `r` and '0' when
/// the `l` and the `r` are equal.</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static int CompareVal(int l, int r)
{
int result = 0;
Expand Down Expand Up @@ -319,7 +321,7 @@ private static int CompareVal(int l, int r)
}

/// <summary>
/// Calculates Julian day nubmer (JDN, https://en.wikipedia.org/wiki/Julian_day) using the specified date in
/// Calculates Julian day number (JDN, https://en.wikipedia.org/wiki/Julian_day) using the specified date in
/// the specified <paramref name="calendar"/>.
/// Return value of this method ain't a usual JDN. See Returns section for more information.
/// </summary>
Expand All @@ -336,6 +338,7 @@ private static int CompareVal(int l, int r)
///
/// This method doesn't change the 27th and 28th bit ("date before" and "date after").
/// </returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static int CreateVal(UDNCalendarType calendar, int year, int month, int day)
{
int result = 0;
Expand Down
Loading

0 comments on commit fc9abbe

Please sign in to comment.