Fix loc display and strings

Author: dkbennett

src/AppInstallerCLICore/Resources.h

@@ -310,8 +310,8 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(FontFaces);
         WINGET_DEFINE_RESOURCE_STRINGID(FontFamily);
         WINGET_DEFINE_RESOURCE_STRINGID(FontFamilyNameArgumentDescription);
-        WINGET_DEFINE_RESOURCE_STRINGID(FontFilesArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(FontFileNotSupported);
+        WINGET_DEFINE_RESOURCE_STRINGID(FontFilesArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(FontFilePaths);
         WINGET_DEFINE_RESOURCE_STRINGID(FontInstallCommandLongDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(FontInstallCommandShortDescription);
@@ -320,6 +320,10 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(FontListCommandShortDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(FontPackage);
         WINGET_DEFINE_RESOURCE_STRINGID(FontRollbackFailed);
+        WINGET_DEFINE_RESOURCE_STRINGID(FontStatus);
+        WINGET_DEFINE_RESOURCE_STRINGID(FontStatusCorrupt);
+        WINGET_DEFINE_RESOURCE_STRINGID(FontStatusOK);
+        WINGET_DEFINE_RESOURCE_STRINGID(FontStatusUnknown);
         WINGET_DEFINE_RESOURCE_STRINGID(FontTitle);
         WINGET_DEFINE_RESOURCE_STRINGID(FontUninstallCommandLongDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(FontUninstallCommandShortDescription);

src/AppInstallerCLICore/Workflows/FontFlow.cpp

@@ -38,13 +38,13 @@ namespace AppInstaller::CLI::Workflow
 
         struct InstalledFontFilesTableLine
         {
-            InstalledFontFilesTableLine(Utility::LocIndString title, Utility::LocIndString packageName, Utility::LocIndString winGetInstalled, std::filesystem::path filePath)
-                : Title(title), PackageName(packageName), WinGetInstalled(winGetInstalled), FilePath(filePath) {
+            InstalledFontFilesTableLine(Utility::LocIndString title, Utility::LocIndString packageName, Resource::LocString fontStatus, std::filesystem::path filePath)
+                : Title(title), PackageName(packageName), FontStatus(fontStatus), FilePath(filePath) {
             }
 
             Utility::LocIndString Title;
             Utility::LocIndString PackageName;
-            Utility::LocIndString WinGetInstalled;
+            Resource::LocString FontStatus;
             std::filesystem::path FilePath;
         };
 
@@ -81,7 +81,7 @@ namespace AppInstaller::CLI::Workflow
 
         void OutputInstalledFontFilesTable(Execution::Context& context, const std::vector<InstalledFontFilesTableLine>& lines)
         {
-            Execution::TableOutput<4> table(context.Reporter, { Resource::String::FontTitle, Resource::String::FontPackage, Resource::String::FontWinGetSupported, Resource::String::FontFilePaths });
+            Execution::TableOutput<4> table(context.Reporter, { Resource::String::FontTitle, Resource::String::FontPackage, Resource::String::FontStatus, Resource::String::FontFilePaths });
 
             bool anonymizePath = Settings::User().Get<Settings::Setting::AnonymizePathForDisplay>();
 
@@ -92,7 +92,7 @@ namespace AppInstaller::CLI::Workflow
                     AppInstaller::Runtime::ReplaceProfilePathsWithEnvironmentVariable(line.FilePath);
                 }
 
-                table.OutputLine({ line.Title, line.PackageName, line.WinGetInstalled, line.FilePath.u8string() });
+                table.OutputLine({ line.Title, line.PackageName, line.FontStatus, line.FilePath.u8string() });
             }
 
             table.Complete();
@@ -144,11 +144,24 @@ namespace AppInstaller::CLI::Workflow
             std::vector<InstalledFontFilesTableLine> lines;
             for (const auto& fontFile : fontFiles)
             {
+                Resource::LocString status;
+                switch (fontFile.Status)
+                {
+                case FontStatus::OK:
+                    status = Resource::LocString(Resource::String::FontStatusOK);
+                    break;
+                case FontStatus::Corrupt:
+                    status = Resource::LocString(Resource::String::FontStatusCorrupt);
+                    break;
+                default:
+                    status = Resource::LocString(Resource::String::FontStatusUnknown);
+                    break;
+                }
 
                 InstalledFontFilesTableLine line(
                     Utility::LocIndString(Utility::ConvertToUTF8(fontFile.Title)),
                     Utility::LocIndString(Utility::ConvertToUTF8(fontFile.PackageIdentifier.value_or(L" "))),
-                    Utility::LocIndString(Utility::ConvertToUTF8(fontFile.Status == Fonts::FontStatus::OK ? L"OK" : L"Missing")),
+                    status,
                     fontFile.FilePath.u8string());
 
                 lines.push_back(std::move(line));

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

@@ -3430,4 +3430,18 @@ Please specify one of them using the --source option to proceed.</value>
   <data name="FontUninstallCommandShortDescription" xml:space="preserve">
     <value>Uninstall a font package</value>
   </data>
+  <data name="FontStatusOK" xml:space="preserve">
+    <value>OK</value>
+    <comment>"OK" means the font is in a good healthy state</comment>
+  </data>
+  <data name="FontStatusCorrupt" xml:space="preserve">
+    <value>Corrupt</value>
+    <comment>"Corrupt" refers to an install that is in a corrupted or bad state, and needs repair.</comment>
+  </data>
+  <data name="FontStatus" xml:space="preserve">
+    <value>Status</value>
+  </data>
+  <data name="FontStatusUnknown" xml:space="preserve">
+    <value>Unknown</value>
+  </data>
 </root>