Skip to content

Commit bbd5524

Browse files
committed
Clean up the ShouldInstallAWorkloadSet message to better fit with the prior WorkloadManifestInstallationConfigurationWorkloadSets message.
Clean up the prior message as it was combinging works in a way that's challenging for translators. Allow loose manifests to be translated but not workload sets.
1 parent 5a41589 commit bbd5524

15 files changed

+141
-70
lines changed

src/Cli/dotnet/Commands/CliCommandStrings.resx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1852,7 +1852,7 @@ Your project targets multiple frameworks. Specify which framework to run using '
18521852
<comment>{Locked="--sdk-version"}</comment>
18531853
</data>
18541854
<data name="ShouldInstallAWorkloadSet" xml:space="preserve">
1855-
<value>Workloads are configured to install and update using workload versions, but none were found. Run "dotnet workload restore" to install a workload version.</value>
1855+
<value>No workload sets are installed. Run "dotnet workload restore" to install a workload set.</value>
18561856
<comment>{Locked="dotnet workload restore"}</comment>
18571857
</data>
18581858
<data name="ShutDownFailed" xml:space="preserve">
@@ -2468,8 +2468,12 @@ To display a value, specify the corresponding command-line option without provid
24682468
<data name="WorkloadManifestIdColumn" xml:space="preserve">
24692469
<value>Workload manifest ID</value>
24702470
</data>
2471-
<data name="WorkloadManifestInstallationConfiguration" xml:space="preserve">
2472-
<value>Configured to use {0} when installing new manifests.</value>
2471+
<data name="WorkloadManifestInstallationConfigurationWorkloadSets" xml:space="preserve">
2472+
<value>Configured to use workload sets when installing new manifests.</value>
2473+
<comment>{Locked="workload sets"}</comment>
2474+
</data>
2475+
<data name="WorkloadManifestInstallationConfigurationLooseManifests" xml:space="preserve">
2476+
<value>Configured to use loose manifests when installing new manifests.</value>
24732477
</data>
24742478
<data name="WorkloadManifestPathColumn" xml:space="preserve">
24752479
<value>Manifest Path</value>

src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ internal static void ShowWorkloadsInfo(ParseResult parseResult = null, WorkloadI
6868
void WriteUpdateModeAndAnyError(string indent = "")
6969
{
7070
var useWorkloadSets = InstallStateContents.FromPath(Path.Combine(WorkloadInstallType.GetInstallStateFolder(workloadInfoHelper._currentSdkFeatureBand, workloadInfoHelper.UserLocalPath), "default.json")).ShouldUseWorkloadSets();
71-
var workloadSetsString = useWorkloadSets ? "workload sets" : "loose manifests";
72-
reporter.WriteLine(indent + string.Format(CliCommandStrings.WorkloadManifestInstallationConfiguration, workloadSetsString));
71+
var configurationMessage = useWorkloadSets
72+
? CliCommandStrings.WorkloadManifestInstallationConfigurationWorkloadSets
73+
: CliCommandStrings.WorkloadManifestInstallationConfigurationLooseManifests;
74+
reporter.WriteLine(indent + configurationMessage);
7375

7476
if (!versionInfo.IsInstalled)
7577
{

src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)