Merge branch 'master' into locale

This commit is contained in:
Bond-009
2019-01-31 18:44:36 +01:00
committed by GitHub
137 changed files with 647 additions and 956 deletions

View File

@@ -62,7 +62,7 @@ namespace Emby.Server.Implementations.Localization
{
const string ratingsResource = "Emby.Server.Implementations.Ratings.";
Directory.CreateDirectory(LocalizationPath);
Directory.CreateDirectory(localizationPath);
var existingFiles = GetRatingsFiles(LocalizationPath).Select(Path.GetFileName);
@@ -292,6 +292,7 @@ namespace Emby.Server.Implementations.Localization
private async Task LoadRatings(string file)
{
Dictionary<string, ParentalRating> dict = new Dictionary<string, ParentalRating>(StringComparer.OrdinalIgnoreCase);
using (var str = File.OpenRead(file))
using (var reader = new StreamReader(str))
{