[#246] [r] AcceptBrowserLanguage to AcceptHeaderLanguage

Author: i4004

src/Simplify.Web.Tests/Modules/LanguageManagerTests.cs

@@ -84,11 +84,11 @@ public void SetCookieLanguage_CorrectLanguage_CorrectCookieCreated()
 	}
 
 	[Test]
-	public void Constructor_HaveBrowserLanguageAndSettingIsEnabledCase1_LanguageSetFromHeader()
+	public void Constructor_HaveHeaderLanguageAndSettingIsEnabledCase1_LanguageSetFromHeader()
 	{
 		// Assign
 
-		_settings.SetupGet(x => x.AcceptBrowserLanguage).Returns(true);
+		_settings.SetupGet(x => x.AcceptHeaderLanguage).Returns(true);
 		var header = new HeaderDictionary(new Dictionary<string, StringValues>());
 		header.Append("Accept-Language", "ru-RU");
 		_context.SetupGet(x => x.Request.Headers).Returns(header);
@@ -101,11 +101,11 @@ public void Constructor_HaveBrowserLanguageAndSettingIsEnabledCase1_LanguageSetF
 	}
 
 	[Test]
-	public void Constructor_HaveBrowserLanguageAndSettingIsEnabledCase2_LanguageSetFromHeader()
+	public void Constructor_HaveHeaderLanguageAndSettingIsEnabledCase2_LanguageSetFromHeader()
 	{
 		// Assign
 
-		_settings.SetupGet(x => x.AcceptBrowserLanguage).Returns(true);
+		_settings.SetupGet(x => x.AcceptHeaderLanguage).Returns(true);
 		var header = new HeaderDictionary(new Dictionary<string, StringValues>());
 		header.Append("Accept-Language", "ru-RU;q=0.5");
 		_context.SetupGet(x => x.Request.Headers).Returns(header);
@@ -118,15 +118,15 @@ public void Constructor_HaveBrowserLanguageAndSettingIsEnabledCase2_LanguageSetF
 	}
 
 	[Test]
-	public void Constructor_HaveBrowserLanguageAndCookieLanguage_LanguageSetFromCookie()
+	public void Constructor_HaveHeaderLanguageAndCookieLanguage_LanguageSetFromCookie()
 	{
 		// Assign
 
 		var cookieCollection = new Mock<IRequestCookieCollection>();
 		cookieCollection.SetupGet(x => x[It.Is<string>(s => s == LanguageManager.CookieLanguageFieldName)]).Returns("fr");
 		_context.SetupGet(x => x.Request.Cookies).Returns(cookieCollection.Object);
 
-		_settings.SetupGet(x => x.AcceptBrowserLanguage).Returns(true);
+		_settings.SetupGet(x => x.AcceptHeaderLanguage).Returns(true);
 		var header = new HeaderDictionary(new Dictionary<string, StringValues>());
 		header.Append("Accept-Language", "ru-RU");
 		_context.SetupGet(x => x.Request.Headers).Returns(header);
@@ -143,7 +143,7 @@ public void Constructor_NoBrowserLanguage_DefaultLanguageSet()
 	{
 		// Assign
 
-		_settings.SetupGet(x => x.AcceptBrowserLanguage).Returns(true);
+		_settings.SetupGet(x => x.AcceptHeaderLanguage).Returns(true);
 		var header = new HeaderDictionary(new Dictionary<string, StringValues>());
 		_context.SetupGet(x => x.Request.Headers).Returns(header);
 

src/Simplify.Web/Modules/LanguageManager.cs

@@ -30,7 +30,7 @@ public LanguageManager(ISimplifyWebSettings settings, HttpContext context)
 		if (TrySetLanguageFromCookie(context))
 			return;
 
-		if (!settings.AcceptBrowserLanguage || (settings.AcceptBrowserLanguage && !TrySetLanguageFromRequestHeader(context)))
+		if (!settings.AcceptHeaderLanguage || (settings.AcceptHeaderLanguage && !TrySetLanguageFromRequestHeader(context)))
 			if (!SetCurrentLanguage(settings.DefaultLanguage))
 				Language = "iv";
 	}

src/Simplify.Web/Settings/ISimplifyWebSettings.cs

@@ -13,12 +13,12 @@ public interface ISimplifyWebSettings
 	string DefaultLanguage { get; }
 
 	/// <summary>
-	/// Gets a value indicating whether browser language should be accepted
+	/// Gets a value indicating whether HTTP header language should be accepted
 	/// </summary>
 	/// <value>
-	/// <c>true</c> if  browser language should be accepted; otherwise, <c>false</c>.
+	/// <c>true</c> if HTTP header language should be accepted; otherwise, <c>false</c>.
 	/// </value>
-	bool AcceptBrowserLanguage { get; }
+	bool AcceptHeaderLanguage { get; }
 
 	/// <summary>
 	/// Default templates directory path, for example: Templates, default value is "Templates"

src/Simplify.Web/Settings/SimplifyWebSettings.cs

@@ -38,12 +38,12 @@ public SimplifyWebSettings(IConfiguration configuration)
 	public string DefaultLanguage { get; private set; } = "en";
 
 	/// <summary>
-	/// Gets a value indicating whether browser language should be accepted
+	/// Gets a value indicating whether HTTP header language should be accepted
 	/// </summary>
 	/// <value>
-	/// <c>true</c> if  browser language should be accepted; otherwise, <c>false</c>.
+	/// <c>true</c> if HTTP header language should be accepted; otherwise, <c>false</c>.
 	/// </value>
-	public bool AcceptBrowserLanguage { get; private set; }
+	public bool AcceptHeaderLanguage { get; private set; }
 
 	/// <summary>
 	/// Default templates directory path, for example: Templates, default value is "Templates"
@@ -166,13 +166,13 @@ private void LoadLanguageManagerSettings(IConfiguration config)
 		if (!string.IsNullOrEmpty(defaultLanguage))
 			DefaultLanguage = defaultLanguage;
 
-		var acceptBrowserLanguage = config[nameof(AcceptBrowserLanguage)];
+		var acceptHeaderLanguage = config[nameof(AcceptHeaderLanguage)];
 
-		if (string.IsNullOrEmpty(acceptBrowserLanguage))
+		if (string.IsNullOrEmpty(acceptHeaderLanguage))
 			return;
 
-		if (bool.TryParse(acceptBrowserLanguage, out var buffer))
-			AcceptBrowserLanguage = buffer;
+		if (bool.TryParse(acceptHeaderLanguage, out var buffer))
+			AcceptHeaderLanguage = buffer;
 	}
 
 	private void LoadTemplatesSettings(IConfiguration config)