From 6a0ebfa343057f3c28f1b8fa6d6d977eb404b540 Mon Sep 17 00:00:00 2001
From: JohanLarsson <johan_gavle1@hotmail.com>
Date: Sat, 6 Aug 2016 16:14:22 +0200
Subject: [PATCH] Respect NeutralResourcesLanguageAttribute. Fix #19

---
 Gu.Localization.sln                           |   9 +-
 Gu.Localization/Internals/Culture.cs          |  12 ++
 Gu.Localization/Internals/ResourceCultures.cs |  35 ++++-
 Gu.Wpf.Localization.Demo/App.xaml.cs          |   3 -
 .../Gu.Wpf.Localization.UiTests.csproj        |   7 +-
 ...pf.Localization.UiTests.csproj.DotSettings |   2 +
 .../Helpers/StartInfo.cs                      |  37 ++++++
 .../Helpers/UiItemExt.cs                      |  19 +++
 Gu.Wpf.Localization.UiTests/StartInfo.cs      |  27 ----
 ...Translates.cs => TranslatesDemoProject.cs} |   2 +-
 .../TranslatesWithNeutralLanguage.cs          |  48 +++++++
 .../App.config                                |   6 +
 .../App.xaml                                  |   9 ++
 .../App.xaml.cs                               |  19 +++
 ...pf.Localization.WithNeutralLanguage.csproj | 110 ++++++++++++++++
 .../MainWindow.xaml                           |  53 ++++++++
 .../MainWindow.xaml.cs                        |  12 ++
 .../Properties/AssemblyInfo.cs                |  49 +++++++
 .../Properties/Resources.Designer.cs          |  72 ++++++++++
 .../Properties/Resources.pt.resx              | 123 ++++++++++++++++++
 .../Properties/Resources.resx                 | 120 +++++++++++++++++
 .../Properties/Settings.Designer.cs           |  30 +++++
 .../Properties/Settings.settings              |   7 +
 .../LanguageSelector/LanguageSelector.cs      |  23 ++--
 24 files changed, 785 insertions(+), 49 deletions(-)
 create mode 100644 Gu.Wpf.Localization.UiTests/Gu.Wpf.Localization.UiTests.csproj.DotSettings
 create mode 100644 Gu.Wpf.Localization.UiTests/Helpers/StartInfo.cs
 create mode 100644 Gu.Wpf.Localization.UiTests/Helpers/UiItemExt.cs
 delete mode 100644 Gu.Wpf.Localization.UiTests/StartInfo.cs
 rename Gu.Wpf.Localization.UiTests/{Translates.cs => TranslatesDemoProject.cs} (99%)
 create mode 100644 Gu.Wpf.Localization.UiTests/TranslatesWithNeutralLanguage.cs
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/App.config
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/App.xaml
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/App.xaml.cs
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/Gu.Wpf.Localization.WithNeutralLanguage.csproj
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/MainWindow.xaml
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/MainWindow.xaml.cs
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/Properties/AssemblyInfo.cs
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.Designer.cs
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.pt.resx
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.resx
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/Properties/Settings.Designer.cs
 create mode 100644 Gu.Wpf.Localization.WithNeutralLanguage/Properties/Settings.settings

diff --git a/Gu.Localization.sln b/Gu.Localization.sln
index 2c61365d..68408537 100644
--- a/Gu.Localization.sln
+++ b/Gu.Localization.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{867813BE-358B-4C9E-9FA6-07168882AA9D}"
 	ProjectSection(SolutionItems) = preProject
@@ -37,6 +37,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{EFFBB24C-1
 		.paket\Readme.paket.md = .paket\Readme.paket.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gu.Wpf.Localization.WithNeutralLanguage", "Gu.Wpf.Localization.WithNeutralLanguage\Gu.Wpf.Localization.WithNeutralLanguage.csproj", "{8F238B89-C06A-4935-8EE9-1E84D297DC4E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +81,10 @@ Global
 		{24A5D9D2-60D8-47B7-8750-48E85A2218DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{24A5D9D2-60D8-47B7-8750-48E85A2218DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{24A5D9D2-60D8-47B7-8750-48E85A2218DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F238B89-C06A-4935-8EE9-1E84D297DC4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F238B89-C06A-4935-8EE9-1E84D297DC4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F238B89-C06A-4935-8EE9-1E84D297DC4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F238B89-C06A-4935-8EE9-1E84D297DC4E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -87,5 +93,6 @@ Global
 		{85009EF0-C922-4EDB-9648-495B56B30CFC} = {7C464917-49E0-40F2-BB85-EB16977B87A5}
 		{A8722CC6-E477-43B6-A1A0-B7A062FBB290} = {7C464917-49E0-40F2-BB85-EB16977B87A5}
 		{D77D4706-D218-4DC6-B117-611AF843FED9} = {7C464917-49E0-40F2-BB85-EB16977B87A5}
+		{8F238B89-C06A-4935-8EE9-1E84D297DC4E} = {7C464917-49E0-40F2-BB85-EB16977B87A5}
 	EndGlobalSection
 EndGlobal
diff --git a/Gu.Localization/Internals/Culture.cs b/Gu.Localization/Internals/Culture.cs
index e1f24135..63492cf8 100644
--- a/Gu.Localization/Internals/Culture.cs
+++ b/Gu.Localization/Internals/Culture.cs
@@ -18,6 +18,18 @@ internal static bool Exists(string name)
             return CultureNames.Contains(name);
         }
 
+        internal static bool TryGet(string name, out CultureInfo culture)
+        {
+            if (Exists(name))
+            {
+                culture = CultureInfo.GetCultureInfo(name);
+                return true;
+            }
+
+            culture = null;
+            return false;
+        }
+
         internal static bool NameEquals(CultureInfo first, CultureInfo other)
         {
             return CultureInfoComparer.ByName.Equals(first, other);
diff --git a/Gu.Localization/Internals/ResourceCultures.cs b/Gu.Localization/Internals/ResourceCultures.cs
index dced0d4d..ae516767 100644
--- a/Gu.Localization/Internals/ResourceCultures.cs
+++ b/Gu.Localization/Internals/ResourceCultures.cs
@@ -5,6 +5,8 @@
     using System.Globalization;
     using System.IO;
     using System.Linq;
+    using System.Reflection;
+    using System.Resources;
 
     /// <summary>Utility class for finding resources.</summary>
     internal static class ResourceCultures
@@ -17,7 +19,7 @@ internal static class ResourceCultures
         /// 2) Check that the folder contains resource files
         /// The result is not cached
         /// </summary>
-        /// <param name="executingDirectory">The directory to chek</param>
+        /// <param name="executingDirectory">The directory to check</param>
         /// <returns>The cultures found. If none an empty list is returned.</returns>
         internal static IReadOnlyList<CultureInfo> GetAllCultures(DirectoryInfo executingDirectory)
         {
@@ -26,8 +28,8 @@ internal static IReadOnlyList<CultureInfo> GetAllCultures(DirectoryInfo executin
                 return EmptyCultures;
             }
 
-            List<CultureInfo> cultures = null;
-            foreach (var directory in executingDirectory.EnumerateDirectories())
+            HashSet<CultureInfo> cultures = null;
+            foreach (var directory in executingDirectory.EnumerateDirectories("*", SearchOption.TopDirectoryOnly))
             {
                 var cultureName = directory.Name;
                 if (!Culture.Exists(directory.Name))
@@ -36,17 +38,38 @@ internal static IReadOnlyList<CultureInfo> GetAllCultures(DirectoryInfo executin
                 }
 
                 if (directory.EnumerateFiles("*.resources.dll", SearchOption.TopDirectoryOnly).Any())
+                {
+                    CultureInfo culture;
+                    if (Culture.TryGet(cultureName, out culture))
+                    {
+                        if (cultures == null)
+                        {
+                            cultures = new HashSet<CultureInfo>(CultureInfoComparer.ByName);
+                        }
+
+                        cultures.Add(culture);
+                    }
+                }
+            }
+
+            var entryAssembly = Assembly.GetEntryAssembly();
+            if (entryAssembly != null)
+            {
+                var neutralLanguageAttribute = (NeutralResourcesLanguageAttribute)Attribute.GetCustomAttribute(entryAssembly, typeof(NeutralResourcesLanguageAttribute));
+                var name = neutralLanguageAttribute?.CultureName;
+                CultureInfo neutralCulture;
+                if (name != null && Culture.TryGet(name, out neutralCulture))
                 {
                     if (cultures == null)
                     {
-                        cultures = new List<CultureInfo>();
+                        cultures = new HashSet<CultureInfo>(CultureInfoComparer.ByName);
                     }
 
-                    cultures.Add(CultureInfo.GetCultureInfo(cultureName));
+                    cultures.Add(neutralCulture);
                 }
             }
 
-            return cultures ?? EmptyCultures;
+            return cultures?.OrderBy(x => x.Name).ToArray() ?? EmptyCultures;
         }
 
         internal static DirectoryInfo DefaultResourceDirectory()
diff --git a/Gu.Wpf.Localization.Demo/App.xaml.cs b/Gu.Wpf.Localization.Demo/App.xaml.cs
index fb398c9b..a0e6fe52 100644
--- a/Gu.Wpf.Localization.Demo/App.xaml.cs
+++ b/Gu.Wpf.Localization.Demo/App.xaml.cs
@@ -4,9 +4,6 @@
     using System.Threading;
     using System.Windows;
 
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
     public partial class App : Application
     {
         protected override void OnStartup(StartupEventArgs e)
diff --git a/Gu.Wpf.Localization.UiTests/Gu.Wpf.Localization.UiTests.csproj b/Gu.Wpf.Localization.UiTests/Gu.Wpf.Localization.UiTests.csproj
index 84486094..c8a770a8 100644
--- a/Gu.Wpf.Localization.UiTests/Gu.Wpf.Localization.UiTests.csproj
+++ b/Gu.Wpf.Localization.UiTests/Gu.Wpf.Localization.UiTests.csproj
@@ -39,6 +39,7 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Xaml" />
+    <Reference Include="UIAutomationClient" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <Choose>
@@ -49,10 +50,12 @@
     </When>
   </Choose>
   <ItemGroup>
-    <Compile Include="StartInfo.cs" />
+    <Compile Include="Helpers\StartInfo.cs" />
+    <Compile Include="Helpers\UiItemExt.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Todo.cs" />
-    <Compile Include="Translates.cs" />
+    <Compile Include="TranslatesDemoProject.cs" />
+    <Compile Include="TranslatesWithNeutralLanguage.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="paket.references" />
diff --git a/Gu.Wpf.Localization.UiTests/Gu.Wpf.Localization.UiTests.csproj.DotSettings b/Gu.Wpf.Localization.UiTests/Gu.Wpf.Localization.UiTests.csproj.DotSettings
new file mode 100644
index 00000000..8b01856a
--- /dev/null
+++ b/Gu.Wpf.Localization.UiTests/Gu.Wpf.Localization.UiTests.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=helpers/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Gu.Wpf.Localization.UiTests/Helpers/StartInfo.cs b/Gu.Wpf.Localization.UiTests/Helpers/StartInfo.cs
new file mode 100644
index 00000000..bd1c594c
--- /dev/null
+++ b/Gu.Wpf.Localization.UiTests/Helpers/StartInfo.cs
@@ -0,0 +1,37 @@
+namespace Gu.Wpf.Localization.UiTests
+{
+    using System;
+    using System.Diagnostics;
+    using System.Globalization;
+    using System.IO;
+    using System.Reflection;
+
+    public static class StartInfo
+    {
+        public static ProcessStartInfo DemoProject { get; } = CreateStartUpInfo("Gu.Wpf.Localization.Demo", CultureInfo.GetCultureInfo("en"));
+
+        public static ProcessStartInfo WithNeutralLanguageProject { get; } = CreateStartUpInfo("Gu.Wpf.Localization.WithNeutralLanguage", CultureInfo.GetCultureInfo("en"));
+
+        private static ProcessStartInfo CreateStartUpInfo(string assemblyName, CultureInfo culture)
+        {
+            var processStartInfo = new ProcessStartInfo
+            {
+                Arguments = culture.Name,
+                FileName = GetExeFileName(assemblyName),
+                UseShellExecute = false,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true
+            };
+            return processStartInfo;
+        }
+
+        private static string GetExeFileName(string assemblyName)
+        {
+            var testAssembnly = Assembly.GetExecutingAssembly();
+            var testDirestory = Path.GetDirectoryName(new Uri(testAssembnly.CodeBase).AbsolutePath);
+            var exeDirectory = testDirestory.Replace(testAssembnly.GetName().Name, assemblyName);
+            var fileName = Path.Combine(exeDirectory, $"{assemblyName}.exe");
+            return fileName;
+        }
+    }
+}
diff --git a/Gu.Wpf.Localization.UiTests/Helpers/UiItemExt.cs b/Gu.Wpf.Localization.UiTests/Helpers/UiItemExt.cs
new file mode 100644
index 00000000..bfa5d12e
--- /dev/null
+++ b/Gu.Wpf.Localization.UiTests/Helpers/UiItemExt.cs
@@ -0,0 +1,19 @@
+namespace Gu.Wpf.Localization.UiTests
+{
+    using TestStack.White.UIItems;
+    using TestStack.White.UIItems.Finders;
+
+    public static class UiItemExt
+    {
+        public static string ItemStatus(this IUIItem item)
+        {
+            return (string)item.AutomationElement.Current.ItemStatus;
+        }
+
+        public static T GetByText<T>(this UIItemContainer container, string text)
+            where T : UIItem
+        {
+            return container.Get<T>(SearchCriteria.ByText(text));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gu.Wpf.Localization.UiTests/StartInfo.cs b/Gu.Wpf.Localization.UiTests/StartInfo.cs
deleted file mode 100644
index 16988a09..00000000
--- a/Gu.Wpf.Localization.UiTests/StartInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace Gu.Wpf.Localization.UiTests
-{
-    using System;
-    using System.Diagnostics;
-
-    using Gu.Wpf.Localization.Demo;
-
-    public static class StartInfo
-    {
-        public static ProcessStartInfo DemoProject
-        {
-            get
-            {
-                var assembly = typeof(MainWindow).Assembly;
-                var processStartInfo = new ProcessStartInfo
-                {
-                    Arguments = "en",
-                    FileName = new Uri(assembly.CodeBase, UriKind.Absolute).LocalPath,
-                    UseShellExecute = false,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true
-                };
-                return processStartInfo;
-            }
-        }
-    }
-}
diff --git a/Gu.Wpf.Localization.UiTests/Translates.cs b/Gu.Wpf.Localization.UiTests/TranslatesDemoProject.cs
similarity index 99%
rename from Gu.Wpf.Localization.UiTests/Translates.cs
rename to Gu.Wpf.Localization.UiTests/TranslatesDemoProject.cs
index 828ab99d..0533e4fe 100644
--- a/Gu.Wpf.Localization.UiTests/Translates.cs
+++ b/Gu.Wpf.Localization.UiTests/TranslatesDemoProject.cs
@@ -8,7 +8,7 @@
     using TestStack.White.UIItems;
     using TestStack.White.UIItems.WindowItems;
 
-    public class Translates
+    public class TranslatesDemoProject
     {
         private Application application;
         private Window window;
diff --git a/Gu.Wpf.Localization.UiTests/TranslatesWithNeutralLanguage.cs b/Gu.Wpf.Localization.UiTests/TranslatesWithNeutralLanguage.cs
new file mode 100644
index 00000000..92e0a427
--- /dev/null
+++ b/Gu.Wpf.Localization.UiTests/TranslatesWithNeutralLanguage.cs
@@ -0,0 +1,48 @@
+namespace Gu.Wpf.Localization.UiTests
+{
+    using NUnit.Framework;
+    using TestStack.White;
+    using TestStack.White.UIItems;
+    using TestStack.White.UIItems.WindowItems;
+
+    public class TranslatesWithNeutralLanguage
+    {
+        private Application application;
+        private Window window;
+
+        [OneTimeSetUp]
+        public void OneTimeSetUp()
+        {
+            this.application = Application.AttachOrLaunch(StartInfo.WithNeutralLanguageProject);
+            this.window = this.application.GetWindow("MainWindow");
+        }
+
+        [OneTimeTearDown]
+        public void OneTimeTearDown()
+        {
+            this.application?.Dispose();
+        }
+
+        [Test]
+        public void EffectiveCulture()
+        {
+            Assert.AreEqual("en", this.window.Get<Label>("CurrentCultureTextBlock").Text);
+            this.window.Get<RadioButton>("pt").Click();
+            Assert.AreEqual("pt", this.window.Get<Label>("CurrentCultureTextBlock").Text);
+        }
+
+        [Test]
+        public void VanillaXaml()
+        {
+            this.window.Get<RadioButton>("en").Click();
+            var groupBox = this.window.GetByText<GroupBox>("Vanilla xaml");
+            Assert.AreEqual("English", groupBox.Get<Label>("AllLanguagesTextBlock").Text);
+
+            this.window.Get<RadioButton>("pt").Click();
+            Assert.AreEqual("Português", groupBox.Get<Label>("AllLanguagesTextBlock").Text);
+
+            this.window.Get<RadioButton>("en").Click();
+            Assert.AreEqual("English", groupBox.Get<Label>("AllLanguagesTextBlock").Text);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/App.config b/Gu.Wpf.Localization.WithNeutralLanguage/App.config
new file mode 100644
index 00000000..88fa4027
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/App.xaml b/Gu.Wpf.Localization.WithNeutralLanguage/App.xaml
new file mode 100644
index 00000000..318516bd
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="Gu.Wpf.Localization.WithNeutralLanguage.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Gu.Wpf.Localization.WithNeutralLanguage"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/App.xaml.cs b/Gu.Wpf.Localization.WithNeutralLanguage/App.xaml.cs
new file mode 100644
index 00000000..41cf2508
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/App.xaml.cs
@@ -0,0 +1,19 @@
+namespace Gu.Wpf.Localization.WithNeutralLanguage
+{
+    using System.Globalization;
+    using System.Threading;
+    using System.Windows;
+
+    public partial class App : Application
+    {
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            if (e.Args.Length == 1)
+            {
+                Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo(e.Args[0]);
+            }
+
+            base.OnStartup(e);
+        }
+    }
+}
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/Gu.Wpf.Localization.WithNeutralLanguage.csproj b/Gu.Wpf.Localization.WithNeutralLanguage/Gu.Wpf.Localization.WithNeutralLanguage.csproj
new file mode 100644
index 00000000..5b782c2c
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/Gu.Wpf.Localization.WithNeutralLanguage.csproj
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8F238B89-C06A-4935-8EE9-1E84D297DC4E}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Gu.Wpf.Localization.WithNeutralLanguage</RootNamespace>
+    <AssemblyName>Gu.Wpf.Localization.WithNeutralLanguage</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.pt.resx" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Gu.Localization\Gu.Localization.csproj">
+      <Project>{ef992dc9-c8df-48c4-aa2d-4126cc6cc6d4}</Project>
+      <Name>Gu.Localization</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Gu.Wpf.Localization\Gu.Wpf.Localization.csproj">
+      <Project>{b5ba2bcc-6ca4-4422-9220-fdedd657ba0e}</Project>
+      <Name>Gu.Wpf.Localization</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/MainWindow.xaml b/Gu.Wpf.Localization.WithNeutralLanguage/MainWindow.xaml
new file mode 100644
index 00000000..b21a2849
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/MainWindow.xaml
@@ -0,0 +1,53 @@
+<Window x:Class="Gu.Wpf.Localization.WithNeutralLanguage.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:l="http://gu.se/Localization"
+        xmlns:localization="clr-namespace:Gu.Localization;assembly=Gu.Localization"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:p="clr-namespace:Gu.Wpf.Localization.WithNeutralLanguage.Properties"
+        Title="MainWindow"
+        Width="525"
+        Height="350"
+        mc:Ignorable="d">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="Current culture: " />
+                <TextBlock x:Name="CurrentCultureTextBlock" Text="{Binding Path=(localization:Translator.CurrentCulture)}" />
+            </StackPanel>
+
+            <l:LanguageSelector AutogenerateLanguages="True" />
+        </StackPanel>
+
+        <GroupBox Grid.Column="1" Header="Vanilla xaml">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <TextBlock Grid.Row="0"
+                           Grid.Column="0"
+                           Text="AllLanguages: " />
+                <TextBlock x:Name="AllLanguagesTextBlock"
+                           Grid.Row="0"
+                           Grid.Column="1"
+                           Text="{l:Static p:Resources.AllLanguages}" />
+            </Grid>
+        </GroupBox>
+    </Grid>
+</Window>
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/MainWindow.xaml.cs b/Gu.Wpf.Localization.WithNeutralLanguage/MainWindow.xaml.cs
new file mode 100644
index 00000000..3aea2e97
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/MainWindow.xaml.cs
@@ -0,0 +1,12 @@
+namespace Gu.Wpf.Localization.WithNeutralLanguage
+{
+    using System.Windows;
+
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/Properties/AssemblyInfo.cs b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..51499171
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/AssemblyInfo.cs
@@ -0,0 +1,49 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Gu.Wpf.Localization.WithNeutralLanguage")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Gu.Wpf.Localization.WithNeutralLanguage")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.MainAssembly)]
+
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.Designer.cs b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..03c3ae5c
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.Designer.cs
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Gu.Wpf.Localization.WithNeutralLanguage.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Gu.Wpf.Localization.WithNeutralLanguage.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to English.
+        /// </summary>
+        internal static string AllLanguages {
+            get {
+                return ResourceManager.GetString("AllLanguages", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.pt.resx b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.pt.resx
new file mode 100644
index 00000000..52df2ea9
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.pt.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AllLanguages" xml:space="preserve">
+    <value>Português</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.resx b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.resx
new file mode 100644
index 00000000..877f005a
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Resources.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AllLanguages" xml:space="preserve">
+    <value>English</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Settings.Designer.cs b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Settings.Designer.cs
new file mode 100644
index 00000000..b3f7ab14
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Gu.Wpf.Localization.WithNeutralLanguage.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Settings.settings b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Settings.settings
new file mode 100644
index 00000000..033d7a5e
--- /dev/null
+++ b/Gu.Wpf.Localization.WithNeutralLanguage/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/Gu.Wpf.Localization/LanguageSelector/LanguageSelector.cs b/Gu.Wpf.Localization/LanguageSelector/LanguageSelector.cs
index 32af97c6..91c22583 100644
--- a/Gu.Wpf.Localization/LanguageSelector/LanguageSelector.cs
+++ b/Gu.Wpf.Localization/LanguageSelector/LanguageSelector.cs
@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.Diagnostics;
+    using System.Globalization;
     using System.Linq;
     using System.Resources;
     using System.Windows;
@@ -28,7 +29,7 @@ public class LanguageSelector : Control, IDisposable
                 default(bool),
                 OnAutoGenerateLanguagesChanged));
 
-        private static readonly IReadOnlyDictionary<string, string> FlagNameResourceMap;
+        private static readonly IReadOnlyDictionary<CultureInfo, string> FlagNameResourceMap;
 
         private bool disposed = false;
 
@@ -38,18 +39,22 @@ static LanguageSelector()
             var assembly = typeof(LanguageSelector).Assembly;
             var names = assembly.GetManifestResourceNames();
             var match = names.Single(x => x.EndsWith(".g.resources"));
+            Debug.Assert(match != null, "match != null");
 
-            //// ReSharper disable once AssignNullToNotNullAttribute not null here
             using (var reader = new ResourceReader(assembly.GetManifestResourceStream(match)))
             {
-                var flags = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                var flags = new Dictionary<CultureInfo, string>(CultureInfoComparer.ByName);
                 var enumerator = reader.GetEnumerator();
                 while (enumerator.MoveNext())
                 {
-                    var flag = (string)enumerator.Key;
-                    Debug.Assert(flag != null, "flag == null");
-                    //// ReSharper disable once AssignNullToNotNullAttribute not null here
-                    flags.Add(System.IO.Path.GetFileNameWithoutExtension(flag), flag);
+                    var flagName = (string)enumerator.Key;
+                    Debug.Assert(flagName != null, "flag == null");
+                    var name = System.IO.Path.GetFileNameWithoutExtension(flagName);
+                    CultureInfo culture;
+                    if (Culture.TryGet(name, out culture))
+                    {
+                        flags.Add(culture, flagName);
+                    }
                 }
 
                 FlagNameResourceMap = flags;
@@ -134,14 +139,14 @@ private void SyncLanguages()
 
                 foreach (var cultureInfo in Translator.Cultures)
                 {
-                    if (this.Languages.Any(x => Gu.Localization.Culture.NameEquals(x.Culture, cultureInfo)))
+                    if (this.Languages.Any(x => Culture.NameEquals(x.Culture, cultureInfo)))
                     {
                         continue;
                     }
 
                     var language = new Language(cultureInfo);
                     string flag;
-                    if (FlagNameResourceMap.TryGetValue(cultureInfo.TwoLetterISOLanguageName, out flag))
+                    if (FlagNameResourceMap.TryGetValue(cultureInfo, out flag))
                     {
                         var key = new Uri($"pack://application:,,,/{this.GetType().Assembly.GetName().Name};component/{flag}", UriKind.Absolute);
                         language.FlagSource = key;