From 3345daf53307b34f1347bf478847eac58c467d17 Mon Sep 17 00:00:00 2001
From: Jon Douglas <jonathan.douglas@microsoft.com>
Date: Fri, 9 Dec 2022 14:48:28 -0600
Subject: [PATCH 1/2] Fix locale issues where suitable.

---
 .github/ISSUE_TEMPLATE/NUGETORG_ISSUE.yml            |  4 ++--
 src/NuGetGallery.Services/ServicesStrings.resx       |  4 ++--
 src/NuGetGallery/App_Code/ViewHelpers.cshtml         |  2 +-
 src/NuGetGallery/Strings.resx                        | 12 ++++++------
 .../Views/Packages/DisplayPackage.cshtml             |  6 +++---
 src/NuGetGallery/Views/Packages/ReportAbuse.cshtml   |  2 +-
 src/NuGetGallery/Views/Pages/Home.cshtml             |  4 ++--
 src/NuGetGallery/Views/Shared/Gallery/Footer.cshtml  |  2 +-
 src/NuGetGallery/Views/Shared/Gallery/Header.cshtml  |  2 +-
 .../Views/Shared/_AccountCertificates.cshtml         |  2 +-
 src/NuGetGallery/Views/Users/ApiKeys.cshtml          |  2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/NUGETORG_ISSUE.yml b/.github/ISSUE_TEMPLATE/NUGETORG_ISSUE.yml
index 6f92bc63e7..cd498091ae 100644
--- a/.github/ISSUE_TEMPLATE/NUGETORG_ISSUE.yml
+++ b/.github/ISSUE_TEMPLATE/NUGETORG_ISSUE.yml
@@ -10,9 +10,9 @@ body:
 
        The more detail you provide, the more likely it will be for us to be able to identify what is going on and how to solve it!
 
-       ### For issues connecting to NuGet.org, please refer to [this guide](https://docs.microsoft.com/en-us/nuget/nuget-org/nuget-org-faq#nuget.org-not-accessible).
+       ### For issues connecting to NuGet.org, please refer to [this guide](https://docs.microsoft.com/nuget/nuget-org/nuget-org-faq#nuget.org-not-accessible).
 
-       ### For issues regarding your NuGet.org account, please refer to [this guide](https://docs.microsoft.com/en-us/nuget/nuget-org/nuget-org-faq#nuget.org-account-management).
+       ### For issues regarding your NuGet.org account, please refer to [this guide](https://docs.microsoft.com/nuget/nuget-org/nuget-org-faq#nuget.org-account-management).
   - type: dropdown
     id: impact
     attributes:
diff --git a/src/NuGetGallery.Services/ServicesStrings.resx b/src/NuGetGallery.Services/ServicesStrings.resx
index f53495f4ac..8024f55a73 100644
--- a/src/NuGetGallery.Services/ServicesStrings.resx
+++ b/src/NuGetGallery.Services/ServicesStrings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -897,7 +897,7 @@ If you would like to update the linked Microsoft account you can do so from the
 Policy violations: {0}</value>
   </data>
   <data name="SecurityPolicy_RequirePackagePrefixReserved" xml:space="preserve">
-    <value>You have not published a package with this prefix in the past. This means other users may be able to push packages starting with the same prefix. Contact account@nuget.org to reserve the prefix. Go to https://docs.microsoft.com/en-us/nuget/reference/id-prefix-reservation to learn more about Package ID prefix reservation.</value>
+    <value>You have not published a package with this prefix in the past. This means other users may be able to push packages starting with the same prefix. Contact account@nuget.org to reserve the prefix. Go to https://docs.microsoft.com/nuget/reference/id-prefix-reservation to learn more about Package ID prefix reservation.</value>
   </data>
   <data name="SecurityPolicy_CopyrightNotCompliant" xml:space="preserve">
     <value>The package metadata contains a non-compliant copyright element.</value>
diff --git a/src/NuGetGallery/App_Code/ViewHelpers.cshtml b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
index 1a9486a8c0..e86bd2b4bf 100644
--- a/src/NuGetGallery/App_Code/ViewHelpers.cshtml
+++ b/src/NuGetGallery/App_Code/ViewHelpers.cshtml
@@ -120,7 +120,7 @@
                 <p class="error-action">Get me out of here! <a href="@url.Home()">Go home</a></p>
                 <p class="error-action">Wondering if NuGet is down? <a href="https://status.nuget.org/">Check our status</a></p>
                 <p class="error-action">Looking for a package? <a href="@url.PackageList()">Try searching</a></p>
-                <p class="error-action">Package you're looking for doesn't exist? <a href="https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package">Make one</a></p>
+                <p class="error-action">Package you're looking for doesn't exist? <a href="https://docs.microsoft.com/nuget/quickstart/create-and-publish-a-package">Make one</a></p>
                 <p class="error-action">Pretty sure we messed up? <a href="https://github.com/NuGet/NuGetGallery/issues">File a bug</a></p>
                 <p class="error-action">Can't get enough NuGet? <a href="https://twitter.com/nuget">Follow us</a></p>
             </div>
diff --git a/src/NuGetGallery/Strings.resx b/src/NuGetGallery/Strings.resx
index 4e4c4bdc0d..431115188d 100644
--- a/src/NuGetGallery/Strings.resx
+++ b/src/NuGetGallery/Strings.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -515,10 +515,10 @@ For more information, please contact '{2}'.</value>
     <value>The ID prefix of this package has been reserved for one of the owners of this package by NuGet.org.</value>
   </data>
   <data name="UploadPackage_IdNamespaceConflict" xml:space="preserve">
-    <value>This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID. Go to https://docs.microsoft.com/en-us/nuget/reference/id-prefix-reservation learn more about Package ID prefix reservation.</value>
+    <value>This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID. Go to https://docs.microsoft.com/nuget/reference/id-prefix-reservation learn more about Package ID prefix reservation.</value>
   </data>
   <data name="UploadPackage_IdNamespaceConflictHtml" xml:space="preserve">
-    <value>This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID. &lt;a href="https://docs.microsoft.com/en-us/nuget/reference/id-prefix-reservation"&gt;Learn more about Package ID prefix reservation&lt;/a&gt;.</value>
+    <value>This package ID has been reserved. Please request access to upload to this reserved namespace from the owner of the reserved prefix, or re-upload the package with a different ID. &lt;a href="https://docs.microsoft.com/nuget/reference/id-prefix-reservation"&gt;Learn more about Package ID prefix reservation&lt;/a&gt;.</value>
   </data>
   <data name="PreviewReadMe_ConversionFailed" xml:space="preserve">
     <value>Conversion of Markdown to HTML failed with '{0}'.</value>
@@ -539,10 +539,10 @@ For more information, please contact '{2}'.</value>
     <value>The Documentation URL must be a raw Markdown file hosted on GitHub.</value>
   </data>
   <data name="UploadPackage_MissingReadmeHtml" xml:space="preserve">
-    <value>&lt;strong&gt;Readme&lt;/strong&gt; missing.&lt;a href="https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices#readme"&gt; See how to include a readme file within the package&lt;/a&gt;, or add it as you upload.</value>
+    <value>&lt;strong&gt;Readme&lt;/strong&gt; missing.&lt;a href="https://learn.microsoft.com/nuget/create-packages/package-authoring-best-practices#readme"&gt; See how to include a readme file within the package&lt;/a&gt;, or add it as you upload.</value>
   </data>
   <data name="UploadPackage_MissingReadme" xml:space="preserve">
-    <value>Readme missing. Go to https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices#readme learn How to include a readme file within the package.</value>
+    <value>Readme missing. Go to https://learn.microsoft.com/nuget/create-packages/package-authoring-best-practices#readme learn How to include a readme file within the package.</value>
   </data>	
   <data name="ReservedNamespace_OwnerAdded" xml:space="preserve">
     <value>The user '{0}' is now an owner of the prefix '{1}'.</value>
@@ -909,7 +909,7 @@ If you would like to update the linked Microsoft account you can do so from the
 Policy violations: {0}</value>
   </data>
   <data name="SecurityPolicy_RequirePackagePrefixReserved" xml:space="preserve">
-    <value>You have not published a package with this prefix in the past. This means other users may be able to push packages starting with the same prefix. Contact account@nuget.org to reserve the prefix. Go to https://docs.microsoft.com/en-us/nuget/reference/id-prefix-reservation to learn more about Package ID prefix reservation.</value>
+    <value>You have not published a package with this prefix in the past. This means other users may be able to push packages starting with the same prefix. Contact account@nuget.org to reserve the prefix. Go to https://docs.microsoft.com/nuget/reference/id-prefix-reservation to learn more about Package ID prefix reservation.</value>
   </data>
   <data name="SecurityPolicy_CopyrightNotCompliant" xml:space="preserve">
     <value>The package metadata contains a non-compliant copyright element.</value>
diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
index dac0f62e2b..ae339925a9 100644
--- a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
+++ b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -110,7 +110,7 @@
                 CommandPrefix = "PM> ",
                 InstallPackageCommands = new [] { string.Format("NuGet\\Install-Package {0} -Version {1}", Model.Id, Model.Version) },
                 AlertLevel = AlertLevel.Info,
-                AlertMessage = "This command is intended to be used within the Package Manager Console in Visual Studio, as it uses the NuGet module's version of <a href='https://docs.microsoft.com/en-us/nuget/reference/ps-reference/ps-ref-install-package'>Install-Package</a>."
+                AlertMessage = "This command is intended to be used within the Package Manager Console in Visual Studio, as it uses the NuGet module's version of <a href='https://docs.microsoft.com/nuget/reference/ps-reference/ps-ref-install-package'>Install-Package</a>."
 
             },
 
@@ -126,7 +126,7 @@
                     : string.Format("<PackageReference Include=\"{0}\" Version=\"{1}\" />", Model.Id, Model.Version) },
                 AlertLevel = AlertLevel.Info,
                 AlertMessage = string.Format("For projects that support <a href=\"{0}\">PackageReference</a>, copy this XML node into the project file to reference the package.",
-                                             "https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files"),
+                                             "https://docs.microsoft.com/nuget/consume-packages/package-references-in-project-files"),
                 CopyLabel = "Copy the PackageReference XML node",
             },
 
@@ -274,7 +274,7 @@
                                     @ViewHelpers.ImageFallback(Url.Absolute("~/Content/gallery/img/reserved-indicator-25x25.png"))
                                     data-content="@Strings.ReservedNamespace_ReservedIndicatorTooltip" tabindex="0"
                                     alt="@Strings.ReservedNamespace_ReservedIndicatorTooltip"/>
-                            <a href="https://docs.microsoft.com/en-us/nuget/nuget-org/id-prefix-reservation" class="prefix-reserve-label">
+                            <a href="https://docs.microsoft.com/nuget/nuget-org/id-prefix-reservation" class="prefix-reserve-label">
                                 Prefix Reserved
                             </a>
                         </span>
diff --git a/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml b/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml
index fa137f9103..372544d789 100644
--- a/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml
+++ b/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml
@@ -85,7 +85,7 @@
                     </div>
                     <div class="reason-error-revenge-porn" tabindex="0">
                         <p>
-                            Please report this safety violation through the <a href="https://www.microsoft.com/en-us/concern/revengeporn" title="revenge porn portal">official portal</a>.
+                            Please report this safety violation through the <a href="https://www.microsoft.com/concern/revengeporn" title="revenge porn portal">official portal</a>.
                         </p>
                     </div>
                     <div id="report-abuse-form">
diff --git a/src/NuGetGallery/Views/Pages/Home.cshtml b/src/NuGetGallery/Views/Pages/Home.cshtml
index efa6fd430b..5fbe619824 100644
--- a/src/NuGetGallery/Views/Pages/Home.cshtml
+++ b/src/NuGetGallery/Views/Pages/Home.cshtml
@@ -84,7 +84,7 @@ else if (AskUserToEnable2FA)
         </div>
         <div class="row row-gap">
             <div class="col-sm-4">
-                <a href="https://docs.microsoft.com/en-us/nuget/quickstart/use-a-package"
+                <a href="https://docs.microsoft.com/nuget/quickstart/use-a-package"
                    title="Learn about how to use NuGet packages">
                     <img width="225" height="225" alt="Learn to use packages"
                          src="~/Content/gallery/img/orange-circle.svg"
@@ -108,7 +108,7 @@ else if (AskUserToEnable2FA)
                 </p>
             </div>
             <div class="col-sm-4">
-                <a href="https://docs.microsoft.com/en-us/nuget/quickstart/create-and-publish-a-package"
+                <a href="https://docs.microsoft.com/nuget/quickstart/create-and-publish-a-package"
                    title="Learn how to create a NuGet package">
                     <img width="225" height="225" alt="Learn to create packages"
                          src="~/Content/gallery/img/blue-circle.svg"
diff --git a/src/NuGetGallery/Views/Shared/Gallery/Footer.cshtml b/src/NuGetGallery/Views/Shared/Gallery/Footer.cshtml
index bb98c53a59..da6b84cad6 100644
--- a/src/NuGetGallery/Views/Shared/Gallery/Footer.cshtml
+++ b/src/NuGetGallery/Views/Shared/Gallery/Footer.cshtml
@@ -15,7 +15,7 @@
             </div>
             <div class="col-sm-4">
                 <span class="footer-heading">
-                    <a aria-label="Frequently Asked Questions" href="https://docs.microsoft.com/en-us/nuget/policies/nuget-faq">
+                    <a aria-label="Frequently Asked Questions" href="https://docs.microsoft.com/nuget/policies/nuget-faq">
                         <abbr title="Frequently Asked Questions">FAQ</abbr>
                     </a>
                 </span>
diff --git a/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml b/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
index 2c08caa7cf..e8630ee021 100644
--- a/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
+++ b/src/NuGetGallery/Views/Shared/Gallery/Header.cshtml
@@ -86,7 +86,7 @@
                         {
                             @DisplayNavigationItem("Admin", Url.Admin())
                         }
-                        @DisplayNavigationItem("Documentation", "https://docs.microsoft.com/en-us/nuget/")
+                        @DisplayNavigationItem("Documentation", "https://docs.microsoft.com/nuget/")
                         @DisplayNavigationItem("Downloads", Url.Downloads())
                         @DisplayNavigationItem("Blog", "https://blog.nuget.org/")
                     </ul>
diff --git a/src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml b/src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml
index fb219f3ed3..d2211058a5 100644
--- a/src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml
+++ b/src/NuGetGallery/Views/Shared/_AccountCertificates.cshtml
@@ -71,7 +71,7 @@
             
             <div class="row" data-bind="ifnot: $data && $data.hasCertificates && $data.hasCertificates()">
                 <div class="col-xs-12 clearfix">
-                    All your packages need to be signed by one of the registered certificates.  <a href="https://docs.microsoft.com/en-us/nuget/reference/signed-packages-reference">Learn more about package signing.</a>
+                    All your packages need to be signed by one of the registered certificates.  <a href="https://docs.microsoft.com/nuget/reference/signed-packages-reference">Learn more about package signing.</a>
                     <br /> <br />
                 </div>
             </div>
diff --git a/src/NuGetGallery/Views/Users/ApiKeys.cshtml b/src/NuGetGallery/Views/Users/ApiKeys.cshtml
index 99f0a5f9c5..21c8d611dc 100644
--- a/src/NuGetGallery/Views/Users/ApiKeys.cshtml
+++ b/src/NuGetGallery/Views/Users/ApiKeys.cshtml
@@ -32,7 +32,7 @@
                     <br />
                     <p>
                         <strong>Note:</strong> To push packages to nuget.org you must use <a href="https://www.nuget.org/downloads">nuget.exe v4.1.0 or above</a>,
-                        which implements the required <a href="https://docs.microsoft.com/en-us/nuget/api/nuget-protocols">NuGet protocols</a>.
+                        which implements the required <a href="https://docs.microsoft.com/nuget/api/nuget-protocols">NuGet protocols</a>.
                     </p>
                 </p>
 

From ef84fe11d1b4e98c34d1f4219e239f11125c09d0 Mon Sep 17 00:00:00 2001
From: Joel Verhagen <jver@microsoft.com>
Date: Tue, 10 Jan 2023 12:39:33 -0500
Subject: [PATCH 2/2] Fix UTs

---
 .../Services/PackageMetadataValidationServiceFacts.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/NuGetGallery.Facts/Services/PackageMetadataValidationServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageMetadataValidationServiceFacts.cs
index 85b2f208e0..24599eb16e 100644
--- a/tests/NuGetGallery.Facts/Services/PackageMetadataValidationServiceFacts.cs
+++ b/tests/NuGetGallery.Facts/Services/PackageMetadataValidationServiceFacts.cs
@@ -1500,8 +1500,8 @@ public async Task WarnsAboutPackagesWithoutReadmeWhenDisplayUploadWarningV2Enabl
                 Assert.Null(result.Message);
                 var warning = Assert.Single(result.Warnings);
                 Assert.IsType<UploadPackageMissingReadme>(warning);
-                Assert.StartsWith("Readme missing. Go to https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices#readme learn How to include a readme file within the package.", warning.PlainTextMessage);
-                Assert.StartsWith("<strong>Readme</strong> missing.<a href=\"https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices#readme\"> See how to include a readme file within the package</a>, or add it as you upload.", warning.RawHtmlMessage);
+                Assert.StartsWith("Readme missing. Go to https://learn.microsoft.com/nuget/create-packages/package-authoring-best-practices#readme learn How to include a readme file within the package.", warning.PlainTextMessage);
+                Assert.StartsWith("<strong>Readme</strong> missing.<a href=\"https://learn.microsoft.com/nuget/create-packages/package-authoring-best-practices#readme\"> See how to include a readme file within the package</a>, or add it as you upload.", warning.RawHtmlMessage);
             }
 
             [Fact]
@@ -1527,8 +1527,8 @@ public async Task WarnsAboutPackagesWithoutWhenEmbeddedReadmeNotEnabledAndDispla
                 Assert.Null(result.Message);
                 var warning = Assert.Single(result.Warnings);
                 Assert.IsType<UploadPackageMissingReadme>(warning);
-                Assert.StartsWith("Readme missing. Go to https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices#readme learn How to include a readme file within the package.", warning.PlainTextMessage);
-                Assert.StartsWith("<strong>Readme</strong> missing.<a href=\"https://learn.microsoft.com/en-us/nuget/create-packages/package-authoring-best-practices#readme\"> See how to include a readme file within the package</a>, or add it as you upload.", warning.RawHtmlMessage);
+                Assert.StartsWith("Readme missing. Go to https://learn.microsoft.com/nuget/create-packages/package-authoring-best-practices#readme learn How to include a readme file within the package.", warning.PlainTextMessage);
+                Assert.StartsWith("<strong>Readme</strong> missing.<a href=\"https://learn.microsoft.com/nuget/create-packages/package-authoring-best-practices#readme\"> See how to include a readme file within the package</a>, or add it as you upload.", warning.RawHtmlMessage);
             }
 
             private async Task<PackageValidationResult> ValidatePackageWithReadme(string readmePath, byte[] readmeFileData)