From 0be070f340cac1ca234f0dbc80bd6120eefe8d84 Mon Sep 17 00:00:00 2001
From: "Dustin L. Howett (MSFT)" <duhowett@microsoft.com>
Date: Wed, 25 Mar 2020 14:06:59 -0700
Subject: [PATCH] Prepare for automated localization (#5119)

This pull request includes a localization config file that identifies
the modules we need to localize. It also moves us back to the
`Resources\LANGUAGE\Resources.resw` resource layout, but using wildcards
so that the build system can pick up any number of languages.
---
 build/config/LocConfig.xml                        | 15 +++++++++++++++
 .../CascadiaPackage/CascadiaPackage.wapproj       |  2 +-
 .../Resources.resw}                               |  0
 .../Resources.resw}                               |  0
 .../TerminalApp/lib/TerminalAppLib.vcxproj        |  2 +-
 .../Resources.resw}                               |  0
 .../TerminalConnection/TerminalConnection.vcxproj |  2 +-
 .../Resources.resw}                               |  0
 .../TerminalControl/TerminalControl.vcxproj       |  2 +-
 .../TerminalControl.vcxproj.filters               |  2 +-
 .../Resources.resw}                               |  0
 .../WindowsTerminalUniversal.vcxproj              |  2 +-
 .../WindowsTerminalUniversal.vcxproj.filters      |  5 +----
 13 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 build/config/LocConfig.xml
 rename src/cascadia/CascadiaPackage/Resources/{Resources.language-en.resw => en-US/Resources.resw} (100%)
 rename src/cascadia/TerminalApp/Resources/{Resources.language-en.resw => en-US/Resources.resw} (100%)
 rename src/cascadia/TerminalConnection/Resources/{Resources.language-en.resw => en-US/Resources.resw} (100%)
 rename src/cascadia/TerminalControl/Resources/{Resources.language-en.resw => en-US/Resources.resw} (100%)
 rename src/cascadia/WindowsTerminalUniversal/Resources/{Resources.language-en.resw => en-US/Resources.resw} (100%)

diff --git a/build/config/LocConfig.xml b/build/config/LocConfig.xml
new file mode 100644
index 000000000..8b00008db
--- /dev/null
+++ b/build/config/LocConfig.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Modules>
+  <Module name="Microsoft.WindowsTerminal" tdbuildteamid="7105">
+    <File location="TerminalApp"
+      path="%BUILD_SOURCESDIRECTORY%\src\cascadia\TerminalApp\Resources\en-US\Resources.resw" />
+    <File location="TerminalControl"
+      path="%BUILD_SOURCESDIRECTORY%\src\cascadia\TerminalControl\Resources\en-US\Resources.resw" />
+    <File location="TerminalConnection"
+      path="%BUILD_SOURCESDIRECTORY%\src\cascadia\TerminalConnection\Resources\en-US\Resources.resw" />
+    <File location="WindowsTerminalUniversal"
+      path="%BUILD_SOURCESDIRECTORY%\src\cascadia\WindowsTerminalUniversal\Resources\en-US\Resources.resw" />
+    <File location="CascadiaPackage"
+      path="%BUILD_SOURCESDIRECTORY%\src\cascadia\CascadiaPackage\Resources\en-US\Resources.resw" />
+  </Module>
+</Modules>
diff --git a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
index e909dc7d1..97a6d26fb 100644
--- a/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
+++ b/src/cascadia/CascadiaPackage/CascadiaPackage.wapproj
@@ -43,7 +43,7 @@
     <!-- Resources -->
     <!-- This resw only defines things that are used in this package's AppxManifest,
          so it's not in the common resource items. -->
-    <PRIResource Include="Resources\Resources.language-en.resw" />
+    <PRIResource Include="Resources\*\Resources.resw" />
     <PRIResource Include="Resources\Resources.resw" />
   </ItemGroup>
   <PropertyGroup Condition="'$(WindowsTerminalReleaseBuild)'!='true'">
diff --git a/src/cascadia/CascadiaPackage/Resources/Resources.language-en.resw b/src/cascadia/CascadiaPackage/Resources/en-US/Resources.resw
similarity index 100%
rename from src/cascadia/CascadiaPackage/Resources/Resources.language-en.resw
rename to src/cascadia/CascadiaPackage/Resources/en-US/Resources.resw
diff --git a/src/cascadia/TerminalApp/Resources/Resources.language-en.resw b/src/cascadia/TerminalApp/Resources/en-US/Resources.resw
similarity index 100%
rename from src/cascadia/TerminalApp/Resources/Resources.language-en.resw
rename to src/cascadia/TerminalApp/Resources/en-US/Resources.resw
diff --git a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
index 7725d9cdb..789a2c26c 100644
--- a/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj
@@ -216,7 +216,7 @@
   </ItemGroup>
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
-    <PRIResource Include="../Resources/Resources.language-en.resw" />
+    <PRIResource Include="..\Resources\*\Resources.resw" />
     <None Include="../packages.config" />
   </ItemGroup>
   <!-- ========================= Project References ======================== -->
diff --git a/src/cascadia/TerminalConnection/Resources/Resources.language-en.resw b/src/cascadia/TerminalConnection/Resources/en-US/Resources.resw
similarity index 100%
rename from src/cascadia/TerminalConnection/Resources/Resources.language-en.resw
rename to src/cascadia/TerminalConnection/Resources/en-US/Resources.resw
diff --git a/src/cascadia/TerminalConnection/TerminalConnection.vcxproj b/src/cascadia/TerminalConnection/TerminalConnection.vcxproj
index 41c1e7cc1..cb98eb8f7 100644
--- a/src/cascadia/TerminalConnection/TerminalConnection.vcxproj
+++ b/src/cascadia/TerminalConnection/TerminalConnection.vcxproj
@@ -59,7 +59,7 @@
     <Midl Include="TelnetConnection.idl" />
   </ItemGroup>
   <ItemGroup>
-    <PRIResource Include="Resources/Resources.language-en.resw" />
+    <PRIResource Include="Resources\*\Resources.resw" />
     <None Include="packages.config" />
   </ItemGroup>
   <!-- ========================= Project References ======================== -->
diff --git a/src/cascadia/TerminalControl/Resources/Resources.language-en.resw b/src/cascadia/TerminalControl/Resources/en-US/Resources.resw
similarity index 100%
rename from src/cascadia/TerminalControl/Resources/Resources.language-en.resw
rename to src/cascadia/TerminalControl/Resources/en-US/Resources.resw
diff --git a/src/cascadia/TerminalControl/TerminalControl.vcxproj b/src/cascadia/TerminalControl/TerminalControl.vcxproj
index 99fffe077..d1691bd26 100644
--- a/src/cascadia/TerminalControl/TerminalControl.vcxproj
+++ b/src/cascadia/TerminalControl/TerminalControl.vcxproj
@@ -85,7 +85,7 @@
     <None Include="TerminalControl.def" />
   </ItemGroup>
   <ItemGroup>
-    <PRIResource Include="Resources/Resources.language-en.resw" />
+    <PRIResource Include="Resources\*\Resources.resw" />
   </ItemGroup>
   <!-- ========================= Project References ======================== -->
   <ItemGroup>
diff --git a/src/cascadia/TerminalControl/TerminalControl.vcxproj.filters b/src/cascadia/TerminalControl/TerminalControl.vcxproj.filters
index d90f6304c..750374d2c 100644
--- a/src/cascadia/TerminalControl/TerminalControl.vcxproj.filters
+++ b/src/cascadia/TerminalControl/TerminalControl.vcxproj.filters
@@ -45,7 +45,7 @@
     <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
   </ItemGroup>
   <ItemGroup>
-    <PRIResource Include="Resources/Resources.language-en.resw">
+    <PRIResource Include="Resources\*\Resources.resw">
       <Filter>Resources</Filter>
     </PRIResource>
   </ItemGroup>
diff --git a/src/cascadia/WindowsTerminalUniversal/Resources/Resources.language-en.resw b/src/cascadia/WindowsTerminalUniversal/Resources/en-US/Resources.resw
similarity index 100%
rename from src/cascadia/WindowsTerminalUniversal/Resources/Resources.language-en.resw
rename to src/cascadia/WindowsTerminalUniversal/Resources/en-US/Resources.resw
diff --git a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj
index 3ae1e552d..ce0f73429 100644
--- a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj
+++ b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj
@@ -123,7 +123,7 @@
     <!-- Resources -->
     <!-- This resw only defines things that are used in this package's AppxManifest,
          so it's not in the common resource items. -->
-    <PRIResource Include="Resources\Resources.language-en.resw" />
+    <PRIResource Include="Resources\*\Resources.resw" />
     <PRIResource Include="Resources\Resources.resw" />
     <PRIResource Include="Resources\Resources.devicefamily-core.resw" />
   </ItemGroup>
diff --git a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters
index b1eee92ac..eacb86e82 100644
--- a/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters
+++ b/src/cascadia/WindowsTerminalUniversal/WindowsTerminalUniversal.vcxproj.filters
@@ -18,15 +18,12 @@
     <Filter Include="Resources">
       <UniqueIdentifier>{4718a03b-f768-4d96-9106-096573a315a3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Resources\en-US">
-      <UniqueIdentifier>{943541d5-c1da-435d-9f61-85d1b118f041}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="Resources.devicefamily-core.resw">
       <Filter>Resources</Filter>
     </PRIResource>
-    <PRIResource Include="Resources.language-en.resw">
+    <PRIResource Include="Resources\*\Resources.resw">
       <Filter>Resources</Filter>
     </PRIResource>
     <PRIResource Include="Resources.resw">