Skip to content

Commit 278e6f1

Browse files
mattjohnsonpintmattjohnsonpint
committed
Misc
1 parent ca003a4 commit 278e6f1

File tree

5 files changed

+23
-24
lines changed

5 files changed

+23
-24
lines changed

‎src/TimeZoneNames.DataBuilder/DataExtractor.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,7 @@ private void LoadMetaZonesFromFile(string path)
345345
private void LoadLanguages()
346346
{
347347
var languages = Directory.GetFiles(Path.Combine(_cldrPath, "common", "main"))
348-
.Select(s => Path.GetFileName(s)!)
349-
.Select(x => x.Substring(0, x.Length - 4));
348+
.Select(s => Path.GetFileName(s)[..^4]);
350349

351350
Parallel.ForEach(languages, LoadLanguage);
352351
}
@@ -534,7 +533,7 @@ private void LoadDisplayNames()
534533
list.Insert(i, jordan);
535534

536535
var timeZones = list
537-
.ToOrderedDictionary(o => o.Key, o => (string) o.Value);
536+
.ToOrderedDictionary(o => o.Key, o => o.Value);
538537

539538
_data.DisplayNames.Add(locale, timeZones);
540539
}

‎src/TimeZoneNames.DataBuilder/Program.cs‎

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

33
namespace TimeZoneNames.DataBuilder;
44

5-
class Program
5+
static class Program
66
{
77
static void Main()
88
{

‎src/TimeZoneNames/OrderedDictionary.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator() => _dictionary
3232
public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
3333
{
3434
var i = 0;
35-
foreach (DictionaryEntry entry in _dictionary)
35+
foreach (var entry in _dictionary.Cast<DictionaryEntry>())
3636
{
3737
if (i >= arrayIndex && i < array.Length)
3838
{
3939
array[i] = new KeyValuePair<TKey, TValue>((TKey) entry.Key, (TValue) entry.Value!);
4040
}
41-
41+
4242
i++;
4343
}
4444
}

‎test/TimeZoneNames.Tests/TimeZoneCountriesTests.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void Can_Get_Zones_For_CA()
131131
public void Can_List_Countries_EN()
132132
{
133133
var countries = TZNames.GetCountryNames("en-US");
134-
foreach ((var countryCode, var countryDisplayName) in countries)
134+
foreach (var (countryCode, countryDisplayName) in countries)
135135
{
136136
_output.WriteLine("{0} => {1}", countryCode, countryDisplayName);
137137
}
@@ -141,7 +141,7 @@ public void Can_List_Countries_EN()
141141
public void Can_List_Countries_FR()
142142
{
143143
var countries = TZNames.GetCountryNames("fr-CA");
144-
foreach ((var countryCode, var countryDisplayName) in countries)
144+
foreach (var (countryCode, countryDisplayName) in countries)
145145
{
146146
_output.WriteLine("{0} => {1}", countryCode, countryDisplayName);
147147
}
@@ -151,7 +151,7 @@ public void Can_List_Countries_FR()
151151
public void Can_List_Countries_JP()
152152
{
153153
var countries = TZNames.GetCountryNames("ja-JP");
154-
foreach ((var countryCode, var countryDisplayName) in countries)
154+
foreach (var (countryCode, countryDisplayName) in countries)
155155
{
156156
_output.WriteLine("{0} => {1}", countryCode, countryDisplayName);
157157
}
@@ -164,7 +164,7 @@ public void Can_Get_TimeZones_For_US_EN()
164164

165165
var zones = TZNames.GetTimeZonesForCountry("US", locale, DateTimeOffset.Now);
166166
Assert.NotEmpty(zones);
167-
foreach ((var zoneName, var zoneDisplayName) in zones)
167+
foreach (var (zoneName, zoneDisplayName) in zones)
168168
_output.WriteLine($"{zoneDisplayName,-50} {zoneName}");
169169
}
170170

@@ -173,7 +173,7 @@ public void Can_Get_TimeZones_For_RU_EN()
173173
{
174174
var zones = TZNames.GetTimeZonesForCountry("RU", "en-US", DateTimeOffset.Now);
175175
Assert.NotEmpty(zones);
176-
foreach ((var zoneName, var zoneDisplayName) in zones)
176+
foreach (var (zoneName, zoneDisplayName) in zones)
177177
_output.WriteLine($"{zoneDisplayName,-50} {zoneName}");
178178
}
179179

@@ -182,7 +182,7 @@ public void Can_Get_TimeZones_For_RU_RU()
182182
{
183183
var zones = TZNames.GetTimeZonesForCountry("RU", "ru-RU", DateTimeOffset.Now);
184184
Assert.NotEmpty(zones);
185-
foreach ((var zoneName, var zoneDisplayName) in zones)
185+
foreach (var (zoneName, zoneDisplayName) in zones)
186186
_output.WriteLine($"{zoneDisplayName,-50} {zoneName}");
187187
}
188188

@@ -191,7 +191,7 @@ public void Can_Get_TimeZones_For_RU_RU_All()
191191
{
192192
var zones = TZNames.GetTimeZonesForCountry("RU", "ru-RU");
193193
Assert.NotEmpty(zones);
194-
foreach ((var zoneName, var zoneDisplayName) in zones)
194+
foreach (var (zoneName, zoneDisplayName) in zones)
195195
_output.WriteLine($"{zoneDisplayName,-50} {zoneName}");
196196
}
197197

@@ -201,13 +201,13 @@ public void Can_Get_TimeZones_For_All_Countries_EN()
201201
var locale = "en-US";
202202

203203
var countries = TZNames.GetCountryNames(locale);
204-
foreach ((var countryCode, var countryDisplayName) in countries)
204+
foreach (var (countryCode, countryDisplayName) in countries)
205205
{
206206
_output.WriteLine("{0} : {1}", countryCode, countryDisplayName);
207207
_output.WriteLine("------------------------------------------------------------------------------");
208208
var zones = TZNames.GetTimeZonesForCountry(countryCode, locale);
209209
//Assert.NotEmpty(zones);
210-
foreach ((var zoneName, var zoneDisplayName) in zones)
210+
foreach (var (zoneName, zoneDisplayName) in zones)
211211
_output.WriteLine($"{zoneDisplayName,-50} {zoneName}");
212212

213213
_output.WriteLine("");
@@ -220,13 +220,13 @@ public void Can_Get_TimeZones_For_All_Countries_FR()
220220
var locale = "fr-FR";
221221

222222
var countries = TZNames.GetCountryNames(locale);
223-
foreach ((var countryCode, var countryDisplayName) in countries)
223+
foreach (var (countryCode, countryDisplayName) in countries)
224224
{
225225
_output.WriteLine("{0} : {1}", countryCode, countryDisplayName);
226226
_output.WriteLine("------------------------------------------------------------");
227227
var zones = TZNames.GetTimeZonesForCountry(countryCode, locale);
228228
//Assert.NotEmpty(zones);
229-
foreach ((var zoneName, var zoneDisplayName) in zones)
229+
foreach (var (zoneName, zoneDisplayName) in zones)
230230
_output.WriteLine($"{zoneDisplayName,-50} {zoneName}");
231231

232232
_output.WriteLine("");
@@ -239,13 +239,13 @@ public void Can_Get_TimeZones_For_All_Countries_RU()
239239
var locale = "ru-RU";
240240

241241
var countries = TZNames.GetCountryNames(locale);
242-
foreach ((var countryCode, var countryDisplayName) in countries)
242+
foreach (var (countryCode, countryDisplayName) in countries)
243243
{
244244
_output.WriteLine("{0} : {1}", countryCode, countryDisplayName);
245245
_output.WriteLine("------------------------------------------------------------");
246246
var zones = TZNames.GetTimeZonesForCountry(countryCode, locale);
247247
//Assert.NotEmpty(zones);
248-
foreach ((var zoneName, var zoneDisplayName) in zones)
248+
foreach (var (zoneName, zoneDisplayName) in zones)
249249
_output.WriteLine($"{zoneDisplayName,-50} {zoneName}");
250250

251251
_output.WriteLine("");
@@ -258,13 +258,13 @@ public void Can_Get_TimeZones_For_All_Countries_EN_AllZones()
258258
var locale = "en-US";
259259

260260
var countries = TZNames.GetCountryNames(locale);
261-
foreach ((var countryCode, var countryDisplayName) in countries)
261+
foreach (var (countryCode, countryDisplayName) in countries)
262262
{
263263
_output.WriteLine("{0} : {1}", countryCode, countryDisplayName);
264264
_output.WriteLine("------------------------------------------------------------");
265265
var zones = TZNames.GetTimeZonesForCountry(countryCode, locale);
266266
//Assert.NotEmpty(zones);
267-
foreach ((var zoneName, var zoneDisplayName) in zones)
267+
foreach (var (zoneName, zoneDisplayName) in zones)
268268
_output.WriteLine($"{zoneDisplayName,-50} {zoneName}");
269269

270270
_output.WriteLine("");

‎test/TimeZoneNames.Tests/TimeZoneNamesForCountriesTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void Can_Get_Names_For_BR_English()
1616
{
1717
var zones = TZNames.GetTimeZonesForCountry("BR", "en-US");
1818

19-
foreach ((var zoneName, var zoneDisplayName) in zones)
19+
foreach (var (zoneName, zoneDisplayName) in zones)
2020
{
2121
_output.WriteLine($"{zoneName} => {zoneDisplayName}");
2222
}
@@ -46,7 +46,7 @@ public void Can_Get_Names_For_BR_Portuguese()
4646
{
4747
var zones = TZNames.GetTimeZonesForCountry("BR", "pt-BR");
4848

49-
foreach ((var zoneName, var zoneDisplayName) in zones)
49+
foreach (var (zoneName, zoneDisplayName) in zones)
5050
{
5151
_output.WriteLine($"{zoneName} => {zoneDisplayName}");
5252
}
@@ -76,7 +76,7 @@ public void Can_Get_Names_For_PG_English()
7676
{
7777
var zones = TZNames.GetTimeZonesForCountry("PG", "en-US");
7878

79-
foreach ((var zoneName, var zoneDisplayName) in zones)
79+
foreach (var (zoneName, zoneDisplayName) in zones)
8080
{
8181
_output.WriteLine($"{zoneName} => {zoneDisplayName}");
8282
}

0 commit comments

Comments
 (0)