winget-cli

commit 646d8793b6e63865f9de8832a809c8891d64e6a0
parent c255b68a652c59370a2ee9348a9ef36aa18ea1d3
Author: Muhammad Danish <mdanishkhdev@gmail.com>
Date:   Wed, 27 Sep 2023 02:23:02 +0500

Fix localized strings output (#3673)


Diffstat:
M
src/AppInstallerCLICore/Workflows/DependencyNodeProcessor.cpp
 | 
14
+++++++-------
M
src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
 | 
4
++--

2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/AppInstallerCLICore/Workflows/DependencyNodeProcessor.cpp b/src/AppInstallerCLICore/Workflows/DependencyNodeProcessor.cpp
@@ -25,14 +25,14 @@ namespace AppInstaller::CLI::Workflow
 
         if (matches.empty())
         {
-            error << Resource::String::DependenciesFlowNoMatches;
+            error << Resource::String::DependenciesFlowNoMatches << std::endl;
             return DependencyNodeProcessorResult::Error;
         }
 
         if (matches.size() > 1)
         {
             auto dependencyNodeId = Utility::LocIndString{ Utility::Normalize(dependencyNode.Id()) };
-            error << Resource::String::DependenciesFlowSourceTooManyMatches(dependencyNodeId);
+            error << Resource::String::DependenciesFlowSourceTooManyMatches(dependencyNodeId) << std::endl;
             AICLI_LOG(CLI, Error, << "Too many matches for package " << dependencyNode.Id());
             return DependencyNodeProcessorResult::Error;
         }
@@ -60,17 +60,17 @@ namespace AppInstaller::CLI::Workflow
             // as we won't keep searching for dependencies for installed packages
             return DependencyNodeProcessorResult::Skipped;
         }
-        
+
         if (!m_nodePackageLatestVersion)
         {
-            error << Resource::String::DependenciesFlowPackageVersionNotFound(Utility::LocIndView{ Utility::Normalize(packageId) });
+            error << Resource::String::DependenciesFlowPackageVersionNotFound(Utility::LocIndView{ Utility::Normalize(packageId) }) << std::endl;
             AICLI_LOG(CLI, Error, << "Latest available version not found for package " << packageId);
             return DependencyNodeProcessorResult::Error;
         }
 
         if (!dependencyNode.IsVersionOk(Utility::Version(m_nodePackageLatestVersion->GetProperty(PackageVersionProperty::Version))))
         {
-            error << Resource::String::DependenciesFlowNoMinVersion(Utility::LocIndView{ Utility::Normalize(packageId) });
+            error << Resource::String::DependenciesFlowNoMinVersion(Utility::LocIndView{ Utility::Normalize(packageId) }) << std::endl;
             AICLI_LOG(CLI, Error, << "No suitable min version found for package " << packageId);
             return DependencyNodeProcessorResult::Error;
         }
@@ -80,7 +80,7 @@ namespace AppInstaller::CLI::Workflow
 
         if (m_nodeManifest.Installers.empty())
         {
-            error << Resource::String::DependenciesFlowNoInstallerFound(Utility::LocIndView{ Utility::Normalize(m_nodeManifest.Id) });
+            error << Resource::String::DependenciesFlowNoInstallerFound(Utility::LocIndView{ Utility::Normalize(m_nodeManifest.Id) }) << std::endl;
             AICLI_LOG(CLI, Error, << "Installer not found for manifest " << m_nodeManifest.Id << " with version" << m_nodeManifest.Version);
             return DependencyNodeProcessorResult::Error;
         }
@@ -98,7 +98,7 @@ namespace AppInstaller::CLI::Workflow
         {
             auto manifestId = Utility::LocIndString{ Utility::Normalize(m_nodeManifest.Id) };
             auto manifestVersion = Utility::LocIndString{ m_nodeManifest.Version };
-            error << Resource::String::DependenciesFlowNoSuitableInstallerFound(manifestId, manifestVersion);
+            error << Resource::String::DependenciesFlowNoSuitableInstallerFound(manifestId, manifestVersion) << std::endl;
             AICLI_LOG(CLI, Error, << "No suitable installer found for manifest " << m_nodeManifest.Id << " with version " << m_nodeManifest.Version);
             return DependencyNodeProcessorResult::Error;
         }
diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
@@ -1021,8 +1021,8 @@ Configuration is disabled due to Group Policy.</value>
     <comment>Dependency graph has loop</comment>
   </data>
   <data name="DependenciesFlowNoSuitableInstallerFound" xml:space="preserve">
-    <value>No suitable installer found for manifest: {0} {1}</value>
-    <comment>{Locked="{0} {1}"} Error message displayed when an attempt to get a preferred installer for a manifest fails. {0} is a placeholder replaced by the manifest identifier. {1} is a placeholder replaced by the manifest version.</comment>
+    <value>No suitable installer found for manifest: {0} version {1}</value>
+    <comment>{Locked="{0}","{1}"} Error message displayed when an attempt to get a preferred installer for a manifest fails. {0} is a placeholder replaced by the manifest identifier. {1} is a placeholder replaced by the manifest version.</comment>
   </data>
   <data name="DependenciesManagementError" xml:space="preserve">
     <value>Error processing package dependencies, do you wish to continue installation?</value>