Skip to content

Commit 3b2e7e3

Browse files
tinohagertinohager
committed
Merge branch 'main' into fix/null-handling
2 parents 89e8e8d + 041bb88 commit 3b2e7e3

File tree

10 files changed

+80
-36
lines changed

10 files changed

+80
-36
lines changed

‎src/Nager.Country.Translation/CountryTranslations/CongoCountryTranslation.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class CongoCountryTranslation : ICountryTranslation
99
public TranslationInfo[] Translations => new []
1010
{
1111
new TranslationInfo(LanguageCode.AR, "جمهورية الكونغو الديمقراطية"),
12-
new TranslationInfo(LanguageCode.AZ, "Konqo - Kinşasa"),
12+
new TranslationInfo(LanguageCode.AZ, "Konqo-Kinşasa"),
1313
new TranslationInfo(LanguageCode.BE, "Конга (Кіншаса)"),
1414
new TranslationInfo(LanguageCode.BG, "Конго (Киншаса)"),
1515
new TranslationInfo(LanguageCode.BS, "Demokratska Republika Kongo"),
@@ -21,39 +21,39 @@ public class CongoCountryTranslation : ICountryTranslation
2121
new TranslationInfo(LanguageCode.EN, "Congo, the Democratic Republic of the"),
2222
new TranslationInfo(LanguageCode.ES, "Congo (República Democrática del)"),
2323
new TranslationInfo(LanguageCode.ET, "Kongo DV"),
24-
new TranslationInfo(LanguageCode.FA, "کنگو - کینشاسا"),
24+
new TranslationInfo(LanguageCode.FA, "کنگو-کینشاسا"),
2525
new TranslationInfo(LanguageCode.FI, "Kongon demokraattinen tasavalta"),
2626
new TranslationInfo(LanguageCode.FR, "Congo, République démocratique"),
27-
new TranslationInfo(LanguageCode.HE, "קונגו - קינשאסה"),
28-
new TranslationInfo(LanguageCode.HR, "Kongo - Kinshasa"),
27+
new TranslationInfo(LanguageCode.HE, "קונגו-קינשאסה"),
28+
new TranslationInfo(LanguageCode.HR, "Kongo-Kinshasa"),
2929
new TranslationInfo(LanguageCode.HU, "Kongói Demokratikus Köztársaság"),
30-
new TranslationInfo(LanguageCode.HY, "Կոնգո - Կինշասա"),
30+
new TranslationInfo(LanguageCode.HY, "Կոնգո-Կինշասա"),
3131
new TranslationInfo(LanguageCode.ID, "Republik Demokratik Kongo"),
3232
new TranslationInfo(LanguageCode.IS, "Kongó"),
3333
new TranslationInfo(LanguageCode.IT, "Repubblica Democratica del Congo"),
3434
new TranslationInfo(LanguageCode.JA, "コンゴ民主共和国"),
35-
new TranslationInfo(LanguageCode.KA, "კონგო - კინშასა"),
35+
new TranslationInfo(LanguageCode.KA, "კონგო-კინშასა"),
3636
new TranslationInfo(LanguageCode.KK, "Конго"),
3737
new TranslationInfo(LanguageCode.KO, "콩고민주공화국"),
3838
new TranslationInfo(LanguageCode.KY, "Конго-Киншаса"),
3939
new TranslationInfo(LanguageCode.LT, "Kongas-Kinšasa"),
4040
new TranslationInfo(LanguageCode.LV, "Kongo (Kinšasa)"),
41-
new TranslationInfo(LanguageCode.MK, "Конго - Киншаса"),
41+
new TranslationInfo(LanguageCode.MK, "Конго-Киншаса"),
4242
new TranslationInfo(LanguageCode.MN, "Конго-Киншаса"),
4343
new TranslationInfo(LanguageCode.NB, "Kongo"),
4444
new TranslationInfo(LanguageCode.NL, "Congo, Democratische Republiek"),
4545
new TranslationInfo(LanguageCode.NN, "Kongo"),
4646
new TranslationInfo(LanguageCode.PL, "Demokratyczna Republika Konga"),
47-
new TranslationInfo(LanguageCode.PT, "Congo - Kinshasa"),
48-
new TranslationInfo(LanguageCode.RO, "Congo - Kinshasa"),
47+
new TranslationInfo(LanguageCode.PT, "Congo-Kinshasa"),
48+
new TranslationInfo(LanguageCode.RO, "Congo-Kinshasa"),
4949
new TranslationInfo(LanguageCode.RU, "Демократическая Республика Конго"),
5050
new TranslationInfo(LanguageCode.SK, "Konžská demokratická republika"),
5151
new TranslationInfo(LanguageCode.SL, "Demokratična republika Kongo"),
52-
new TranslationInfo(LanguageCode.SR, "Конго - Киншаса"),
52+
new TranslationInfo(LanguageCode.SR, "Конго-Киншаса"),
5353
new TranslationInfo(LanguageCode.SV, "Demokratiska republiken Kongo"),
54-
new TranslationInfo(LanguageCode.TR, "Kongo - Kinşasa"),
54+
new TranslationInfo(LanguageCode.TR, "Kongo-Kinşasa"),
5555
new TranslationInfo(LanguageCode.UK, "Демократична Республіка Конго"),
56-
new TranslationInfo(LanguageCode.UZ, "Kongo – Kinshasa"),
56+
new TranslationInfo(LanguageCode.UZ, "Kongo-Kinshasa"),
5757
new TranslationInfo(LanguageCode.ZH, "刚果（金)"),
5858
};
5959
}

‎src/Nager.Country.Translation/CountryTranslations/HongKongCountryTranslation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class HongKongCountryTranslation : ICountryTranslation
2020
new TranslationInfo(LanguageCode.EL, "Χονγκ Κόνγκ"),
2121
new TranslationInfo(LanguageCode.EN, "Hong Kong"),
2222
new TranslationInfo(LanguageCode.ES, "Hong Kong"),
23-
new TranslationInfo(LanguageCode.ET, "Hongkong - Hiina erihalduspiirkond"),
23+
new TranslationInfo(LanguageCode.ET, "Hongkong-Hiina erihalduspiirkond"),
2424
new TranslationInfo(LanguageCode.FA, "هنگ‌کنگ"),
2525
new TranslationInfo(LanguageCode.FI, "Hongkong"),
2626
new TranslationInfo(LanguageCode.FR, "Hong Kong"),
@@ -47,7 +47,7 @@ public class HongKongCountryTranslation : ICountryTranslation
4747
new TranslationInfo(LanguageCode.PT, "Hong Kong, RAE da China"),
4848
new TranslationInfo(LanguageCode.RO, "R.A.S. Hong Kong a Chinei"),
4949
new TranslationInfo(LanguageCode.RU, "Гонконг"),
50-
new TranslationInfo(LanguageCode.SK, "Hongkong – OAO Číny"),
50+
new TranslationInfo(LanguageCode.SK, "Hongkong-OAO Číny"),
5151
new TranslationInfo(LanguageCode.SL, "Hongkong"),
5252
new TranslationInfo(LanguageCode.SR, "САР Хонгконг (Кина)"),
5353
new TranslationInfo(LanguageCode.SV, "Hongkong"),

‎src/Nager.Country.Translation/CountryTranslations/MacauCountryTranslation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class MacauCountryTranslation : ICountryTranslation
2020
new TranslationInfo(LanguageCode.EL, "Μακάου"),
2121
new TranslationInfo(LanguageCode.EN, "Macao"),
2222
new TranslationInfo(LanguageCode.ES, "Macao"),
23-
new TranslationInfo(LanguageCode.ET, "Aomen - Hiina erihalduspiirkond"),
23+
new TranslationInfo(LanguageCode.ET, "Aomen-Hiina erihalduspiirkond"),
2424
new TranslationInfo(LanguageCode.FA, "ماکائو"),
2525
new TranslationInfo(LanguageCode.FI, "Macao"),
2626
new TranslationInfo(LanguageCode.FR, "Macao"),
@@ -47,7 +47,7 @@ public class MacauCountryTranslation : ICountryTranslation
4747
new TranslationInfo(LanguageCode.PT, "Macau, RAE da China"),
4848
new TranslationInfo(LanguageCode.RO, "R.A.S. Macao a Chinei"),
4949
new TranslationInfo(LanguageCode.RU, "Макао"),
50-
new TranslationInfo(LanguageCode.SK, "Macao – OAO Číny"),
50+
new TranslationInfo(LanguageCode.SK, "Macao-OAO Číny"),
5151
new TranslationInfo(LanguageCode.SL, "Macao"),
5252
new TranslationInfo(LanguageCode.SR, "САР Макао (Кина)"),
5353
new TranslationInfo(LanguageCode.SV, "Macau"),

‎src/Nager.Country.Translation/CountryTranslations/PapuaNewGuineaCountryTranslation.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ public class PapuaNewGuineaCountryTranslation : ICountryTranslation
4646
new TranslationInfo(LanguageCode.PL, "Papua-Nowa Gwinea"),
4747
new TranslationInfo(LanguageCode.PT, "Papua-Nova Guiné"),
4848
new TranslationInfo(LanguageCode.RO, "Papua-Noua Guinee"),
49-
new TranslationInfo(LanguageCode.RU, "Папуа — Новая Гвинея"),
49+
new TranslationInfo(LanguageCode.RU, "Папуа-Новая Гвинея"),
5050
new TranslationInfo(LanguageCode.SK, "Papua Nová Guinea"),
5151
new TranslationInfo(LanguageCode.SL, "Papua Nova Gvineja"),
5252
new TranslationInfo(LanguageCode.SR, "Папуа Нова Гвинеја"),
5353
new TranslationInfo(LanguageCode.SV, "Papua Nya Guinea"),
5454
new TranslationInfo(LanguageCode.TR, "Papua Yeni Gine"),
5555
new TranslationInfo(LanguageCode.UK, "Папуа Нова Гвінея"),
56-
new TranslationInfo(LanguageCode.UZ, "Papua – Yangi Gvineya"),
56+
new TranslationInfo(LanguageCode.UZ, "Papua-Yangi Gvineya"),
5757
new TranslationInfo(LanguageCode.ZH, "巴布亚新几内亚"),
5858
};
5959
}

‎src/Nager.Country.Translation/CountryTranslations/RepublicOfTheCongoCountryTranslation.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public class RepublicOfTheCongoCountryTranslation : ICountryTranslation
99
public TranslationInfo[] Translations => new []
1010
{
1111
new TranslationInfo(LanguageCode.AR, "جمهورية الكونغو"),
12-
new TranslationInfo(LanguageCode.AZ, "Konqo - Brazzavil"),
13-
new TranslationInfo(LanguageCode.BE, "Конга - Бразавіль"),
12+
new TranslationInfo(LanguageCode.AZ, "Konqo-Brazzavil"),
13+
new TranslationInfo(LanguageCode.BE, "Конга-Бразавіль"),
1414
new TranslationInfo(LanguageCode.BG, "Конго (Бразавил)"),
1515
new TranslationInfo(LanguageCode.BS, "Kongo"),
1616
new TranslationInfo(LanguageCode.CA, "Congo, República del"),
@@ -21,39 +21,39 @@ public class RepublicOfTheCongoCountryTranslation : ICountryTranslation
2121
new TranslationInfo(LanguageCode.EN, "Congo"),
2222
new TranslationInfo(LanguageCode.ES, "Congo"),
2323
new TranslationInfo(LanguageCode.ET, "Kongo-Brazzaville"),
24-
new TranslationInfo(LanguageCode.FA, "کنگو - برازویل"),
24+
new TranslationInfo(LanguageCode.FA, "کنگو-برازویل"),
2525
new TranslationInfo(LanguageCode.FI, "Kongon tasavalta"),
2626
new TranslationInfo(LanguageCode.FR, "Congo, République populaire"),
27-
new TranslationInfo(LanguageCode.HE, "קונגו - ברזאויל"),
28-
new TranslationInfo(LanguageCode.HR, "Kongo - Brazzaville"),
27+
new TranslationInfo(LanguageCode.HE, "קונגו-ברזאויל"),
28+
new TranslationInfo(LanguageCode.HR, "Kongo-Brazzaville"),
2929
new TranslationInfo(LanguageCode.HU, "Kongói Köztársaság"),
30-
new TranslationInfo(LanguageCode.HY, "Կոնգո - Բրազավիլ"),
30+
new TranslationInfo(LanguageCode.HY, "Կոնգո-Բրազավիլ"),
3131
new TranslationInfo(LanguageCode.ID, "Kongo"),
3232
new TranslationInfo(LanguageCode.IS, "Kongó"),
3333
new TranslationInfo(LanguageCode.IT, "Repubblica del Congo"),
3434
new TranslationInfo(LanguageCode.JA, "コンゴ共和国"),
35-
new TranslationInfo(LanguageCode.KA, "კონგო - ბრაზავილი"),
35+
new TranslationInfo(LanguageCode.KA, "კონგო-ბრაზავილი"),
3636
new TranslationInfo(LanguageCode.KK, "Конго Республикасы"),
3737
new TranslationInfo(LanguageCode.KO, "콩고공화국"),
3838
new TranslationInfo(LanguageCode.KY, "Конго-Браззавил"),
3939
new TranslationInfo(LanguageCode.LT, "Kongas-Brazavilis"),
4040
new TranslationInfo(LanguageCode.LV, "Kongo (Brazavila)"),
41-
new TranslationInfo(LanguageCode.MK, "Конго - Бразавил"),
41+
new TranslationInfo(LanguageCode.MK, "Конго-Бразавил"),
4242
new TranslationInfo(LanguageCode.MN, "Конго Браззавиль"),
4343
new TranslationInfo(LanguageCode.NB, "Kongo-Brazzaville"),
4444
new TranslationInfo(LanguageCode.NL, "Congo, Volksrepubliek"),
4545
new TranslationInfo(LanguageCode.NN, "Kongo-Brazzaville"),
4646
new TranslationInfo(LanguageCode.PL, "Kongo"),
47-
new TranslationInfo(LanguageCode.PT, "Congo - Brazzaville"),
48-
new TranslationInfo(LanguageCode.RO, "Congo - Brazzaville"),
47+
new TranslationInfo(LanguageCode.PT, "Congo-Brazzaville"),
48+
new TranslationInfo(LanguageCode.RO, "Congo-Brazzaville"),
4949
new TranslationInfo(LanguageCode.RU, "Республика Конго"),
5050
new TranslationInfo(LanguageCode.SK, "Konžská republika"),
51-
new TranslationInfo(LanguageCode.SL, "Kongo - Brazzaville"),
52-
new TranslationInfo(LanguageCode.SR, "Конго - Бразавил"),
51+
new TranslationInfo(LanguageCode.SL, "Kongo-Brazzaville"),
52+
new TranslationInfo(LanguageCode.SR, "Конго-Бразавил"),
5353
new TranslationInfo(LanguageCode.SV, "Kongo-Brazzaville"),
54-
new TranslationInfo(LanguageCode.TR, "Kongo - Brazavil"),
54+
new TranslationInfo(LanguageCode.TR, "Kongo-Brazavil"),
5555
new TranslationInfo(LanguageCode.UK, "Республіка Конго"),
56-
new TranslationInfo(LanguageCode.UZ, "Kongo – Brazzavil"),
56+
new TranslationInfo(LanguageCode.UZ, "Kongo-Brazzavil"),
5757
new TranslationInfo(LanguageCode.ZH, "刚果（布)"),
5858
};
5959
}

‎src/Nager.Country.Translation/LanguageTranslations/GaelicLanguageTranslation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class GaelicLanguageTranslation : ILanguageTranslation
2121
new TranslationInfo(LanguageCode.BA, "Гэль Теле, Гульсум"),
2222
new TranslationInfo(LanguageCode.BE, "Гэльская, Гэльская"),
2323
new TranslationInfo(LanguageCode.BG, "Келтски, Гэльском"),
24-
new TranslationInfo(LanguageCode.BN, "স্কটস-গ্যেলিক, - গ্যেলিক"),
24+
new TranslationInfo(LanguageCode.BN, "স্কটস-গ্যেলিক,-গ্যেলিক"),
2525
new TranslationInfo(LanguageCode.BS, "Slovački, Jazbina"),
2626
new TranslationInfo(LanguageCode.CA, "Escocès Gaèlic, Gaèlic"),
2727
new TranslationInfo(LanguageCode.CS, "Skotské Gaelštině, Gaelštině"),

‎src/Nager.Country.Translation/LanguageTranslations/HaitianLanguageTranslation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public class HaitianLanguageTranslation : ILanguageTranslation
8484
new TranslationInfo(LanguageCode.SU, "Haitian, Haitian Creole"),
8585
new TranslationInfo(LanguageCode.SV, "Haitiska, Haitisk Kreol"),
8686
new TranslationInfo(LanguageCode.SW, "Haitian, Haitian Creole"),
87-
new TranslationInfo(LanguageCode.TA, "ஹைத்தியன், - ஹெய்டியன் கிரியோல்"),
87+
new TranslationInfo(LanguageCode.TA, "ஹைத்தியன்,-ஹெய்டியன் கிரியோல்"),
8888
new TranslationInfo(LanguageCode.TE, "Haitian, Haitian Creole"),
8989
new TranslationInfo(LanguageCode.TG, "Гаити, Гаитянский Креольский"),
9090
new TranslationInfo(LanguageCode.TH, "เฮเตี้ยนชาวเฮติ Creole"),

‎src/Nager.Country.Translation/Nager.Country.Translation.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net6;net8;net9</TargetFrameworks>
2424

25-
<Version>4.0.0</Version>
25+
<Version>4.1.0</Version>
2626
</PropertyGroup>
2727

2828
<ItemGroup>

‎src/Nager.Country.UnitTest/TranslationTest.cs‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,5 +127,49 @@ public void CheckAllCultureWithDefault(LanguageCode defaultLanguageCode)
127127
}
128128
}
129129
}
130+
131+
[TestMethod]
132+
public void CheckHyphenTest()
133+
{
134+
var searchValues = new string[] { "–", " - " };
135+
136+
ITranslationProvider translationProvider = new TranslationProvider();
137+
138+
foreach (var countryCode in Enum.GetValues<Alpha2Code>())
139+
{
140+
var countryTranslation = translationProvider.GetCountryTranslation(countryCode);
141+
if (countryTranslation is null)
142+
{
143+
continue;
144+
}
145+
146+
foreach (var translation in countryTranslation.Translations)
147+
{
148+
var x = searchValues.Select(searchValue => translation.Name.Contains(searchValue)).ToList();
149+
150+
if (searchValues.Where(searchValue => translation.Name.Contains(searchValue)).Any())
151+
{
152+
Assert.Fail($"Check hyphen in country:{countryCode}, {translation.Name}");
153+
}
154+
}
155+
}
156+
157+
foreach (var languageCode in Enum.GetValues<LanguageCode>())
158+
{
159+
var languageTranslation = translationProvider.GetLanguage(languageCode);
160+
if (languageTranslation is null)
161+
{
162+
continue;
163+
}
164+
165+
foreach (var translation in languageTranslation.Translations)
166+
{
167+
if (searchValues.Where(searchValue => translation.Name.Contains(searchValue)).Any())
168+
{
169+
Assert.Fail($"Check hyphen in language:{languageCode}, {translation.Name}");
170+
}
171+
}
172+
}
173+
}
130174
}
131175
}

‎src/Nager.Country/Nager.Country.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net6;net8;net9</TargetFrameworks>
2525

26-
<Version>4.0.1</Version>
26+
<Version>4.1.0</Version>
2727
</PropertyGroup>
2828

2929
<ItemGroup>

0 commit comments

Comments
 (0)