Update the version error message to LocalizableStrings

dotnet · Nov 7, 2023 · 34bd038 · 34bd038
1 parent 774234d
commit 34bd038
Show file tree

Hide file tree

Showing 15 changed files with 353 additions and 9 deletions.
diff --git a/src/Cli/dotnet/NugetPackageDownloader/LocalizableStrings.resx b/src/Cli/dotnet/NugetPackageDownloader/LocalizableStrings.resx
@@ -144,4 +144,19 @@
   <data name="FailedToMapSourceUnderPackageSourceMapping" xml:space="preserve">
     <value>Package Source Mapping is enabled, but no source mapped under the specified package ID: {0}. See the documentation for Package Source Mapping at https://aka.ms/nuget-package-source-mapping for more details.</value>
   </data>
+  <data name="PackageVersionDescriptionDefault" xml:space="preserve">
+    <value>A version of {0} of package {1}</value>
+  </data>
+  <data name="PackageVersionDescriptionForExactVersionMatch" xml:space="preserve">
+    <value>Version {0} of package {1}</value>
+  </data>
+  <data name="PackageVersionDescriptionForVersionWithLowerAndUpperBounds" xml:space="preserve">
+    <value>A version between {0} and {1} of package {2}</value>
+  </data>
+  <data name="PackageVersionDescriptionForVersionWithLowerBound" xml:space="preserve">
+    <value>A version higher than {0} of package {1}</value>
+  </data>
+  <data name="PackageVersionDescriptionForVersionWithUpperBound" xml:space="preserve">
+    <value>A version less than {0} of package {1}</value>
+  </data>
 </root>
diff --git a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs
@@ -463,25 +463,29 @@ private string GenerateVersionRangeErrorDescription(string packageIdentifier, Ve
             {
                 return $"{packageIdentifier}";
             }
-            else if(versionRange.HasLowerAndUpperBounds && versionRange.MinVersion == versionRange.MaxVersion)
+            else if (versionRange.HasLowerAndUpperBounds && versionRange.MinVersion == versionRange.MaxVersion)
             {
-                return $"Version {versionRange.MinVersion} of package {packageIdentifier}";
+                return string.Format(LocalizableStrings.PackageVersionDescriptionForExactVersionMatch,
+                    versionRange.MinVersion, packageIdentifier);
             }
-            else if(versionRange.HasLowerAndUpperBounds)
+            else if (versionRange.HasLowerAndUpperBounds)
             {
-                return $"A version between {versionRange.MinVersion} and {versionRange.MaxVersion} of package {packageIdentifier}";
+                return string.Format(LocalizableStrings.PackageVersionDescriptionForVersionWithLowerAndUpperBounds,
+                    versionRange.MinVersion, versionRange.MaxVersion, packageIdentifier);
             }
-            else if(versionRange.HasLowerBound)
+            else if (versionRange.HasLowerBound)
             {
-                return $"A version higher than {versionRange.MinVersion} of package {packageIdentifier}";
+                return string.Format(LocalizableStrings.PackageVersionDescriptionForVersionWithLowerBound,
+                    versionRange.MinVersion, packageIdentifier);
             }
-            else if(versionRange.HasUpperBound)
+            else if (versionRange.HasUpperBound)
             {
-                return $"A version less than {versionRange.MaxVersion} of package {packageIdentifier}";
+                return string.Format(LocalizableStrings.PackageVersionDescriptionForVersionWithUpperBound,
+                    versionRange.MaxVersion, packageIdentifier);
             }
 
             // Default message if the format doesn't match any of the expected cases
-            return $"A version of {versionRange} of package {packageIdentifier}";
+            return string.Format(LocalizableStrings.PackageVersionDescriptionDefault, versionRange, packageIdentifier);
         }
 
         private async Task<(PackageSource, IPackageSearchMetadata)> GetLatestVersionInternalAsync(

diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf
diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf
diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf
diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf
diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf
diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf
diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf
diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf
diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf