Merge branch 'dev' into cleanup

2 files changed, 9 insertions, 15 deletions

diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index c6de9d957..a2c47cd79 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
@@ -165,13 +165,7 @@ namespace Emby.Server.Implementations.Localization
         /// Gets the localization path.
         /// </summary>
         /// <value>The localization path.</value>
-        public string LocalizationPath
-        {
-            get
-            {
-                return Path.Combine(_configurationManager.ApplicationPaths.ProgramDataPath, "localization");
-            }
-        }
+        public string LocalizationPath => Path.Combine(_configurationManager.ApplicationPaths.ProgramDataPath, "localization");
 
         public string RemoveDiacritics(string text)
         {
@@ -357,7 +351,7 @@ namespace Emby.Server.Implementations.Localization
         {
             if (string.IsNullOrEmpty(rating))
             {
-                throw new ArgumentNullException("rating");
+                throw new ArgumentNullException(nameof(rating));
             }
 
             if (_unratedValues.Contains(rating, StringComparer.OrdinalIgnoreCase))
@@ -452,7 +446,7 @@ namespace Emby.Server.Implementations.Localization
         {
             if (string.IsNullOrEmpty(culture))
             {
-                throw new ArgumentNullException("culture");
+                throw new ArgumentNullException(nameof(culture));
             }
 
             const string prefix = "Core";
@@ -465,7 +459,7 @@ namespace Emby.Server.Implementations.Localization
         {
             if (string.IsNullOrEmpty(culture))
             {
-                throw new ArgumentNullException("culture");
+                throw new ArgumentNullException(nameof(culture));
             }
 
             var dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
@@ -494,7 +488,7 @@ namespace Emby.Server.Implementations.Localization
             }
         }
 
-        private string GetResourceFilename(string culture)
+        private static string GetResourceFilename(string culture)
         {
             var parts = culture.Split('-');
 
diff --git a/Emby.Server.Implementations/Localization/TextLocalizer.cs b/Emby.Server.Implementations/Localization/TextLocalizer.cs
index 5188a959e..09445d428 100644
--- a/Emby.Server.Implementations/Localization/TextLocalizer.cs
+++ b/Emby.Server.Implementations/Localization/TextLocalizer.cs
@@ -12,13 +12,13 @@ namespace Emby.Server.Implementations.Localization
         {
             if (text == null)
             {
-                throw new ArgumentNullException("text");
+                throw new ArgumentNullException(nameof(text));
             }
 
             var chars = Normalize(text, NormalizationForm.FormD)
                 .Where(ch => CharUnicodeInfo.GetUnicodeCategory(ch) != UnicodeCategory.NonSpacingMark);
 
-            return Normalize(String.Concat(chars), NormalizationForm.FormC);
+            return Normalize(string.Concat(chars), NormalizationForm.FormC);
         }
 
         private static string Normalize(string text, NormalizationForm form, bool stripStringOnFailure = true)
@@ -32,7 +32,7 @@ namespace Emby.Server.Implementations.Localization
                 catch (ArgumentException)
                 {
                     // will throw if input contains invalid unicode chars
-                    // https://mnaoumov.wordpress.com/2014/06/14/stripping-invalid-characters-from-utf-16-strings/   
+                    // https://mnaoumov.wordpress.com/2014/06/14/stripping-invalid-characters-from-utf-16-strings/
                     text = StripInvalidUnicodeCharacters(text);
                     return Normalize(text, form, false);
                 }