winget-cli

commit fb4bf346ad59a7222ebe3c82cc5573e8494c3eef
parent f395a39aacdf2ab0a194eda6cbc5c964bcdde651
Author: Kaleb Luedtke <jluedtk@jci.com>
Date:   Fri, 13 Jan 2023 01:13:54 -0600

Standardize winget capitalization in winget.resw (#2846)

Add placeholder to string for clarification which admin setting has been modified
Diffstat:
M
src/AppInstallerCLICore/Workflows/SettingsFlow.cpp
 | 
12
++++++------
M
src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
 | 
12
+++++++-----

2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/AppInstallerCLICore/Workflows/SettingsFlow.cpp b/src/AppInstallerCLICore/Workflows/SettingsFlow.cpp
@@ -43,29 +43,29 @@ namespace AppInstaller::CLI::Workflow
 
     void EnableAdminSetting(Execution::Context& context)
     {
-        auto adminSettingString = LocIndString{ context.Args.GetArg(Execution::Args::Type::AdminSettingEnable) };
+        auto adminSettingString = context.Args.GetArg(Execution::Args::Type::AdminSettingEnable);
         AdminSetting adminSetting = Settings::StringToAdminSetting(adminSettingString);
         if (Settings::EnableAdminSetting(adminSetting))
         {
-            context.Reporter.Info() << Resource::String::AdminSettingEnabled;
+            context.Reporter.Info() << Resource::String::AdminSettingEnabled(AdminSettingToString(adminSetting));
         }
         else
         {
-            context.Reporter.Error() << Resource::String::EnableAdminSettingFailed(adminSettingString);
+            context.Reporter.Error() << Resource::String::EnableAdminSettingFailed(AdminSettingToString(adminSetting));
         }
     }
 
     void DisableAdminSetting(Execution::Context& context)
     {
-        auto adminSettingString = LocIndString{ context.Args.GetArg(Execution::Args::Type::AdminSettingDisable) };
+        auto adminSettingString = context.Args.GetArg(Execution::Args::Type::AdminSettingDisable);
         AdminSetting adminSetting = Settings::StringToAdminSetting(adminSettingString);
         if (Settings::DisableAdminSetting(adminSetting))
         {
-            context.Reporter.Info() << Resource::String::AdminSettingDisabled;
+            context.Reporter.Info() << Resource::String::AdminSettingDisabled(AdminSettingToString(adminSetting));
         }
         else
         {
-            context.Reporter.Error() << Resource::String::DisableAdminSettingFailed(adminSettingString);
+            context.Reporter.Error() << Resource::String::DisableAdminSettingFailed(AdminSettingToString(adminSetting));
         }
     }
 
diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
@@ -206,7 +206,7 @@
     <comment>{Locked="winget settings","{0}"}. Error message displayed when the user uses an experimental feature that is disabled. {0} is a placeholder replaced by the experimental feature name.</comment>
   </data>
   <data name="FeaturesCommandLongDescription" xml:space="preserve">
-    <value>Shows the status of experimental features. Experimental features can be turn on via 'winget settings'.</value>
+    <value>Shows the status of experimental features. Experimental features can be turned on via 'winget settings'.</value>
     <comment>{Locked="winget settings"}</comment>
   </data>
   <data name="FeaturesCommandShortDescription" xml:space="preserve">
@@ -722,7 +722,7 @@ They can be configured through the settings file 'winget settings'.</value>
     <value>The path to the manifest to be validated</value>
   </data>
   <data name="VerboseLogsArgumentDescription" xml:space="preserve">
-    <value>Enables verbose logging for WinGet</value>
+    <value>Enables verbose logging for winget</value>
   </data>
   <data name="VerifyFileSignedMsix" xml:space="preserve">
     <value>Please verify that the input file is a valid, signed MSIX.</value>
@@ -1229,10 +1229,12 @@ Do you agree to the terms?</value>
     <comment>{Locked="{0}"} Error message displayed when the user provides too many admin setting arguments. {0} is a placeholder replaced by the admin setting arguments (e.g. 'enable|disable').</comment>
   </data>
   <data name="AdminSettingEnabled" xml:space="preserve">
-    <value>Admin setting enabled.</value>
+    <value>Enabled admin setting '{0}'.</value>
+    <comment>{Locked="{0}"} Message displayed when the user enables an admin setting. {0} is a placeholder replaced by the setting name.</comment>
   </data>
   <data name="AdminSettingDisabled" xml:space="preserve">
-    <value>Admin setting disabled.</value>
+    <value>Disabled admin setting '{0}'.</value>
+    <comment>{Locked="{0}"} Message displayed when the user disables an admin setting. {0} is a placeholder replaced by the setting name.</comment>
   </data>
   <data name="InstallFlowReturnCodePackageInUse" xml:space="preserve">
     <value>Application is currently running. Exit the application then try again.</value>
@@ -1438,7 +1440,7 @@ Please specify one of them using the --source option to proceed.</value>
     <value>Purging install directory...</value>
   </data>
   <data name="UnableToPurgeInstallDirectory" xml:space="preserve">
-    <value>Cannot purge install directory, as it was not created by WinGet</value>
+    <value>Cannot purge install directory, as it was not created by winget</value>
   </data>
   <data name="RelatedLink" xml:space="preserve">
     <value>Related Link</value>