Skip to content

Commit 9f14d24

Browse files
authored
Use Serbian flag for neutral cultures (sr, Sr-Cyrl, sr-Latn) (#740)
1 parent 8f03136 commit 9f14d24

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/ResXManager.Tests/View/Converters/CultureToImageSourceConverterTests.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public async Task Should_Produce_Correct_Default_Image_For_Every_Culture()
5555
[InlineData("sv", "se.gif")]
5656
[InlineData("ca-ES", "es.gif")]
5757
[InlineData("ca-ES-valencia", "es.gif")]
58+
[InlineData("sr", "rs.gif")]
59+
[InlineData("sr-Cyrl", "rs.gif")]
60+
[InlineData("sr-Latn", "rs.gif")]
5861
public void Should_Use_Region_As_Primary_Source_For_Flags(string culture, string expectedImageName)
5962
{
6063
var imageName = GetImageFileName(CultureInfo.GetCultureInfo(culture));
@@ -89,4 +92,4 @@ public void Should_Produce_Overriden_Culture_Image_If_Overriden_With_Settings(st
8992
return fileName;
9093
}
9194
}
92-
}
95+
}

src/ResXManager.View/Converters/CultureToImageSourceConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ public object ConvertBack(object? value, Type? targetType, object? parameter, Cu
110110
{
111111
throw new NotImplementedException();
112112
}
113-
}
113+
}

src/ResXManager.View/Tools/CultureCountryOverrides.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[Export]
1616
public class CultureCountryOverrides
1717
{
18-
private const string DefaultOverrides = "en=en-US,zh=zh-CN,zh-CHT=zh-CN,zh-HANT=zh-CN,fy=fy,ko=ko-KR,";
18+
private const string DefaultOverrides = "en=en-US,zh=zh-CN,zh-CHT=zh-CN,zh-HANT=zh-CN,fy=fy,ko=ko-KR,sr=rs,sr-Cyrl=rs,sr-Latn=rs,";
1919

2020
private static readonly IEqualityComparer<KeyValuePair<CultureInfo, CultureInfo>> _comparer = new DelegateEqualityComparer<KeyValuePair<CultureInfo, CultureInfo>>(item => item.Key);
2121
private static readonly IEnumerable<KeyValuePair<CultureInfo, CultureInfo>> _defaultOverrides = ReadSettings(DefaultOverrides);

0 commit comments

Comments
 (0)