Skip to content

Commit c941445

Browse files
BelmoMustaBelmoMusta
authored
Merge branch 'nager:main' into main
2 parents a226efe + 6df40bb commit c941445

8 files changed

+38
-24
lines changed

‎README.md

+12
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,18 @@ What variants of holidays are supported by `Nager.Date`
247247
| Optional | Majority of people take a day off |
248248
| Observance | Optional festivity, no paid day off |
249249

250+
## Release and Support Lifecycle
251+
252+
Here you can see how long the product will be supported and when the End of Life (EOL) is planned.
253+
254+
| Product | Release Date | Supported | End of life |
255+
| -------------------------------- | ----------------------------------------- | --------- | ----------- |
256+
| WebApi v3 | 2021-05-18 | Yes | - |
257+
| WebApi v2 | 2019-02-10 | No | 2024-12-01 |
258+
| WebApi v1 | 2017-02-06 | No | 2024-06-24 |
259+
| Nuget Package v2 | 2024-03-07 | Yes | - |
260+
| Nuget Package v1 | 2014-08-15 | No | 2024-03-07 |
261+
250262
## Data precision
251263

252264
There is no generally valid designation for the next administrative level of countries.

‎src/Nager.Date.ArchitectureTest/Nager.Date.ArchitectureTest.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
14-
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
15-
<PackageReference Include="TngTech.ArchUnitNET.MSTestV2" Version="0.11.0" />
13+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
14+
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
15+
<PackageReference Include="TngTech.ArchUnitNET.MSTestV2" Version="0.11.1" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Nager.Date.UnitTest/Countries/GermanyTest.cs

+7-5
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,22 @@ public void TestGermanyCorpusChristi2026()
4343
Assert.AreEqual(expectedDate, corpusChristi);
4444
}
4545

46-
[TestMethod]
47-
public void TestGermanyLiberationDay2020()
46+
[DataTestMethod]
47+
[DataRow(2019, 2021, 2020)]
48+
[DataRow(2024, 2026, 2025)]
49+
public void TestGermanyLiberationDay(int startYear, int endYear, int expectedYear)
4850
{
4951
var publicHolidays = HolidaySystem.GetHolidays(
50-
new DateTime(2019, 5, 8),
51-
new DateTime(2021, 5, 8),
52+
new DateTime(startYear, 5, 8),
53+
new DateTime(endYear, 5, 8),
5254
CountryCode.DE);
5355

5456
var liberationDays = publicHolidays.Where(x => x.LocalName == "Tag der Befreiung").ToList();
5557
var liberationDay = liberationDays.FirstOrDefault();
5658

5759
Assert.AreEqual(1, liberationDays.Count);
5860
Assert.IsNotNull(liberationDay);
59-
Assert.AreEqual(new DateTime(2020, 5, 8), liberationDay.Date);
61+
Assert.AreEqual(new DateTime(expectedYear, 5, 8), liberationDay.Date);
6062
Assert.IsNotNull(liberationDay.SubdivisionCodes);
6163
Assert.AreEqual(1, liberationDay.SubdivisionCodes.Length);
6264
Assert.AreEqual("DE-BE", liberationDay.SubdivisionCodes[0]);

‎src/Nager.Date.UnitTest/Nager.Date.UnitTest.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
14-
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
13+
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
14+
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/Nager.Date/HolidayProviders/DominicanRepublicHolidayProvider.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -31,56 +31,56 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
3131
{
3232
Date = new DateTime(year, 1, 1),
3333
EnglishName = "New Year's Day",
34-
LocalName = "New Year's Day",
34+
LocalName = "Día de Año Nuevo",
3535
HolidayTypes = HolidayTypes.Public
3636
},
3737
new HolidaySpecification
3838
{
3939
Date = new DateTime(year, 1, 6),
4040
EnglishName = "Day of Kings",
41-
LocalName = "Dia de Reyes",
41+
LocalName = "Día de Reyes",
4242
HolidayTypes = HolidayTypes.Public
4343
},
4444
new HolidaySpecification
4545
{
4646
Date = new DateTime(year, 1, 21),
4747
EnglishName = "Our Lady of Altagracia",
48-
LocalName = "Our Lady of Altagracia",
48+
LocalName = "Día de Nuestra Señora de la Altagracia",
4949
HolidayTypes = HolidayTypes.Public
5050
},
5151
new HolidaySpecification
5252
{
5353
Date = new DateTime(year, 1, 26),
5454
EnglishName = "Duarte's Birthday",
55-
LocalName = "Duarte's Birthday",
55+
LocalName = "Día del Natalicio de Juan Pablo Duarte",
5656
HolidayTypes = HolidayTypes.Public
5757
},
5858
new HolidaySpecification
5959
{
6060
Date = new DateTime(year, 2, 27),
6161
EnglishName = "Independence Day",
62-
LocalName = "Independence Day",
62+
LocalName = "Día de la Independencia de la República Dominicana",
6363
HolidayTypes = HolidayTypes.Public
6464
},
6565
new HolidaySpecification
6666
{
6767
Date = new DateTime(year, 5, 1),
6868
EnglishName = "Labour Day",
69-
LocalName = "Labour Day",
69+
LocalName = "Día del Trabajador",
7070
HolidayTypes = HolidayTypes.Public
7171
},
7272
new HolidaySpecification
7373
{
7474
Date = new DateTime(year, 5, 28),
7575
EnglishName = "Mother's Day",
76-
LocalName = "Mother's Day",
76+
LocalName = "Día de las Madres",
7777
HolidayTypes = HolidayTypes.Public
7878
},
7979
new HolidaySpecification
8080
{
8181
Date = new DateTime(year, 8, 16),
8282
EnglishName = "Restoration Day",
83-
LocalName = "Restoration Day",
83+
LocalName = "Día de la Restauración Dominicana",
8484
HolidayTypes = HolidayTypes.Public
8585
},
8686
new HolidaySpecification
@@ -94,14 +94,14 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
9494
{
9595
Date = new DateTime(year, 11, 6),
9696
EnglishName = "Constitution Day",
97-
LocalName = "Constitution Day",
97+
LocalName = "Día de la Constitución",
9898
HolidayTypes = HolidayTypes.Public
9999
},
100100
new HolidaySpecification
101101
{
102102
Date = new DateTime(year, 12, 25),
103103
EnglishName = "Christmas Day",
104-
LocalName = "Christmas Day",
104+
LocalName = "Navidad",
105105
HolidayTypes = HolidayTypes.Public
106106
},
107107
this._catholicProvider.GoodFriday("Good Friday", year),

‎src/Nager.Date/HolidayProviders/ElSalvadorHolidayProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
3333
{
3434
Date = new DateTime(year, 5, 1),
3535
EnglishName = "Labor Day",
36-
LocalName = "Día del trabajo",
36+
LocalName = "Día del Trabajo",
3737
HolidayTypes = HolidayTypes.Public
3838
},
3939
new HolidaySpecification

‎src/Nager.Date/HolidayProviders/GermanyHolidayProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ private HolidaySpecification ReformationDay(int year)
282282

283283
private HolidaySpecification? LiberationDay(int year)
284284
{
285-
if (year == 2020)
285+
if (year == 2020 || year == 2025)
286286
{
287287
return new HolidaySpecification
288288
{

‎src/Nager.Date/HolidayProviders/PuertoRicoHolidayProvider.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@ protected override IEnumerable<HolidaySpecification> GetHolidaySpecifications(in
148148
{
149149
Date = secondMondayInOctober,
150150
EnglishName = "Columbus Day",
151-
LocalName = "Día de la Raza Descubrimiento de América",
151+
LocalName = "Día de la Raza / Descubrimiento de América",
152152
HolidayTypes = HolidayTypes.Public
153153
},
154154
new HolidaySpecification
155155
{
156156
Date = new DateTime(year, 11, 11),
157157
EnglishName = "Veterans Day",
158-
LocalName = "Día del Veterano Día del Armisticio",
158+
LocalName = "Día del Veterano / Día del Armisticio",
159159
HolidayTypes = HolidayTypes.Public,
160160
ObservedRuleSet = observedRuleSet
161161
},

0 commit comments

Comments
 (0)