Merge pull request #9 from cloudscribe/dev

merge changes from dev

Author: joeaudette

.travis.yml

@@ -1,17 +1,15 @@
 language: csharp
 solution: cloudscribe.Web.Localization.sln
 sudo: false
-dist: trusty
+dist: xenial
 mono: none
-dotnet: 2.0.0
+dotnet: 3.0.100
 env:
   global:
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     - DOTNET_CLI_TELEMETRY_OPTOUT: 1   
 os:
   - linux
-  - osx
-osx_image: xcode8.3
 script:
   - if test "$TRAVIS_OS_NAME" == "linux"; then dotnet restore; fi
   - if test "$TRAVIS_OS_NAME" == "osx"; then dotnet restore --disable-parallel; fi

appveyor.yml

@@ -1,6 +1,6 @@
-image: Visual Studio 2017
+image: Visual Studio 2019
 environment:
-  nodejs_version: "6.9.1"
+  nodejs_version: "13.0.1"
 # Install scripts. (runs after repo cloning)
 install:
   # Get the latest stable version of Node.js or io.js

src/cloudscribe.Web.Localization/CultureSegmentRouteConstraint.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Collections.Generic;
 using System.Linq;
@@ -29,12 +30,17 @@ public bool Match(
 
 
             string requestFolder = GetStartingSegment(httpContext.Request.Path);
+
             if (!string.IsNullOrWhiteSpace(requestFolder))
             {
+                var logger = httpContext.RequestServices.GetService<ILogger<CultureSegmentRouteConstraint>>();
+
                 var cultureSettingsAccessor = httpContext.RequestServices.GetService<IOptions<RequestLocalizationOptions>>();
                 var cultureSettings = cultureSettingsAccessor.Value;
-                var found = cultureSettings.SupportedUICultures.Where(x => x.Name.Equals(requestFolder,System.StringComparison.InvariantCultureIgnoreCase) 
-                || x.TwoLetterISOLanguageName.Equals(requestFolder, System.StringComparison.InvariantCultureIgnoreCase )).Any();
+                var found = cultureSettings.SupportedUICultures.Where(x => 
+                x.Name.Equals(requestFolder,System.StringComparison.InvariantCultureIgnoreCase) 
+                || x.TwoLetterISOLanguageName.Equals(requestFolder, System.StringComparison.InvariantCultureIgnoreCase )
+                ).Any();
 
                 var isDefaultCulture = cultureSettings.DefaultRequestCulture.UICulture.Name.Equals(requestFolder, System.StringComparison.InvariantCultureIgnoreCase) 
                     || cultureSettings.DefaultRequestCulture.UICulture.TwoLetterISOLanguageName.Equals(requestFolder, System.StringComparison.InvariantCultureIgnoreCase);
@@ -44,8 +50,12 @@ public bool Match(
                 //don't match default culture because we don't want the culture segment in the url for the default culture
                 if (found && !isDefaultCulture)
                 {
+                    logger.LogDebug($"matched culture route constraint for path {httpContext.Request.Path}");
+
                     return true;
                 }
+
+                logger.LogDebug($"did not match culture route constraint for path {httpContext.Request.Path}");
             }
 
 

src/cloudscribe.Web.Localization/cloudscribe.Web.Localization.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>more flexible localization for ASP.NET Core</Description>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
     <PackageId>cloudscribe.Web.Localization</PackageId>

src/localization.WebApp/Startup.cs

@@ -129,7 +129,7 @@ IOptions<RequestLocalizationOptions> locOptions
             app.UseRequestLocalization(locOptions.Value);
 
             app.UseHttpsRedirection();
-            app.UseStaticFiles();
+            //app.UseStaticFiles();
 
             app.UseRouting();
 
@@ -148,6 +148,7 @@ IOptions<RequestLocalizationOptions> locOptions
                 endpoints.MapControllerRoute(
                     name: "default",
                     pattern: "{controller=Home}/{action=Index}/{id?}");
+
                 endpoints.MapRazorPages();
             });