From 0fdfdb627774cfe3c053a658ab80b84f4f96260d Mon Sep 17 00:00:00 2001
From: papeh <hasso_pape@sil.org>
Date: Wed, 18 Oct 2023 10:21:15 -0500
Subject: [PATCH] fix l10n.proj (#1291)

* Point to the correct Palaso.en.xlf
* Update NuGet package name
* Remove extra generated lines before each run to prevent infinite linear growth
---
 .github/workflows/l10n-packaging.yml |  2 +-
 .github/workflows/l10n-source.yml    |  4 ++--
 l10n/README.md                       |  8 ++++----
 l10n/crowdin.yml                     |  3 ++-
 l10n/l10n.proj                       | 18 +++++++++++++++---
 l10n/l10ns.nuspec                    |  2 +-
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/l10n-packaging.yml b/.github/workflows/l10n-packaging.yml
index 6e89947da..8559fecbe 100644
--- a/.github/workflows/l10n-packaging.yml
+++ b/.github/workflows/l10n-packaging.yml
@@ -40,7 +40,7 @@ jobs:
 
     - name: Download localizations
       working-directory: ./l10n
-      run: crowdin download --all -T ${{ secrets.CROWDIN_PAT }} -i ${{ secrets.CROWDIN_PROJECT_ID }}
+      run: crowdin download --all -T ${{ secrets.CROWDIN_PAT }}
 
     - name: Restore packages
       run: msbuild l10n/l10n.proj /t:restore /p:Configuration=Release /p:Platform="Any CPU"
diff --git a/.github/workflows/l10n-source.yml b/.github/workflows/l10n-source.yml
index f9ad8502d..f72b07512 100644
--- a/.github/workflows/l10n-source.yml
+++ b/.github/workflows/l10n-source.yml
@@ -43,7 +43,7 @@ jobs:
 
     - name: Download Palaso.en.xlf source file # new strings will be merged into the existing file
       working-directory: ./l10n
-      run: crowdin download sources -T ${{ secrets.CROWDIN_PAT }} -i ${{ secrets.CROWDIN_PROJECT_ID }}
+      run: crowdin download sources -T ${{ secrets.CROWDIN_PAT }}
 
     - name: Update l10n strings
       env:
@@ -52,4 +52,4 @@ jobs:
 
     - name: Upload Palaso.en.xlf source file
       working-directory: ./l10n
-      run: crowdin upload sources -T ${{ secrets.CROWDIN_PAT }} -i ${{ secrets.CROWDIN_PROJECT_ID }}
+      run: crowdin upload sources -T ${{ secrets.CROWDIN_PAT }}
diff --git a/l10n/README.md b/l10n/README.md
index ad6e7efef..1341c1b54 100644
--- a/l10n/README.md
+++ b/l10n/README.md
@@ -2,7 +2,7 @@
 
 ### Using localizations in a project
 
-1. Add a Nuget dependency on libpalaso.l10ns to the project where you initialize the L10nSharp `LocalizationManager`
+1. Add a Nuget dependency on SIL.libpalaso.l10ns to the project where you initialize the L10nSharp `LocalizationManager`
 2. Add a build step to copy the Palaso.%langcode%.xlf files to the correct folder in your project
 
 ### Updating Crowdin with source string changes (automatic)
@@ -18,9 +18,9 @@ See `../.github/workflows/l10n-source.yml`
 
 It can also be run manually as follows (requires the [Crowdin CLI](https://crowdin.github.io/crowdin-cli/)):
 ```
-crowdin download sources -i CROWDIN_PROJECT_ID -T CROWDIN_ACCESS_TOKEN
+crowdin download sources -T CROWDIN_ACCESS_TOKEN
 msbuild l10n.proj /t:UpdateCrowdin
-crowdin upload sources -i CROWDIN_PROJECT_ID -T CROWDIN_ACCESS_TOKEN
+crowdin upload sources -T CROWDIN_ACCESS_TOKEN
 ```
 
 ### Building a NuGet package with the latest translations
@@ -30,7 +30,7 @@ This process is run by a github action whenever a version tag is pushed and manu
 
 It can also be run manually as follows (requires the [Crowdin CLI](https://crowdin.github.io/crowdin-cli/)):
 ```
-crowdin download --all -i CROWDIN_PROJECT_ID -T CROWDIN_ACCESS_TOKEN
+crowdin download --all -T CROWDIN_ACCESS_TOKEN
 msbuild l10n.proj /t:PackageL10ns
 nuget push -ApiKey TheSilNugetApiKey SIL.libpalaso.l10n.nupkg
 ```
\ No newline at end of file
diff --git a/l10n/crowdin.yml b/l10n/crowdin.yml
index 340e78e33..9d1ce641f 100644
--- a/l10n/crowdin.yml
+++ b/l10n/crowdin.yml
@@ -1,4 +1,5 @@
-base_path : "."
+project_id: 393909
+base_path: "."
 preserve_hierarchy: true
 
 files: [
diff --git a/l10n/l10n.proj b/l10n/l10n.proj
index dd3be9108..71b5d298c 100644
--- a/l10n/l10n.proj
+++ b/l10n/l10n.proj
@@ -7,8 +7,12 @@
     <Version>$(GitVersion_NuGetVersion)</Version>
     <Authors>Jason Naylor</Authors>
     <Company>SIL International</Company>
-	<RestartBuild Condition="'$(PkgL10NSharp_ExtractXliff)' == '' OR $(PkgGitVersion_GitVersion_MsBuild) == ''">true</RestartBuild>
-	<RestartBuild Condition="'$(PkgL10NSharp_ExtractXliff)' != '' AND $(PkgGitVersion_GitVersion_MsBuild) != ''">false</RestartBuild>
+	<RestartBuild Condition="'$(PkgGitVersion_GitVersion_MsBuild)' == ''
+	  OR '$(PkgL10NSharp_ExtractXliff)' == ''
+	  OR '$(PkgMSBuild_Extension_Pack)' == ''
+	  OR '$(PkgNuGet_CommandLine)' == ''
+	  OR '$(PkgSIL_BuildTasks)' == ''">true</RestartBuild>
+	<RestartBuild Condition="'$(RestartBuild)' == ''">false</RestartBuild>
   </PropertyGroup>
   
   <ItemGroup>
@@ -16,6 +20,7 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="L10NSharp.ExtractXliff" Version="7.0.0-beta0011" GeneratePathProperty="true" />
+    <PackageReference Include="MSBuild.Extension.Pack" Version="1.9.1" GeneratePathProperty="true" />
     <PackageReference Include="NuGet.CommandLine" Version="6.1.0" GeneratePathProperty="true" />
     <PackageReference Include="SIL.BuildTasks" Version="2.3.0-beta.14" GeneratePathProperty="true" />
   </ItemGroup>
@@ -33,8 +38,15 @@
   </Target>
 	
   <Target Name="UpdateCrowdinInternal" DependsOnTargets="GetVersion">
+	<!-- Remove "not found" messages that are appended each run (Can't MatchWholeLine because leading spaces are trimmed from Lines).
+		These messages accumulate linearly and inifinitely at each ExtractXliff run and are not removed if the string is later found.
+		Removing these lines before running ExtractXliff ensures that only unfound strings are annotated, and only once.
+		See https://github.com/sillsdev/l10nsharp/issues/113 -->
+	<MSBuild.ExtensionPack.FileSystem.File TaskAction="RemoveLines" Files="Palaso.en.xlf" AvoidRegex="true"
+	  Lines="        &lt;note xml:lang=&quot;en&quot;&gt;Not found in static scan of compiled code (version 0.0.0)&lt;/note&gt;"/>
+	<!-- Build and extract strings -->
 	<MSBuild Projects="..\build\Palaso.proj" Targets="Build" Properties="Configuration=Release" />
-	<Exec Command="&quot;$(PkgL10NSharp_ExtractXliff)\tools\ExtractXliff.exe&quot; -n SIL -o Palaso.dll -b ..\DistFiles\Palaso.en.xlf -x Palaso.en.xlf -p $(GitVersion_NuGetVersion) -m SIL.Localizer.GetString -m SIL.Localizer.Localize -g ../Output/Release/net461/SIL.*.dll" />
+	<Exec Command="&quot;$(PkgL10NSharp_ExtractXliff)\tools\ExtractXliff.exe&quot; -n SIL -o Palaso.dll -b Palaso.en.xlf -x Palaso.en.xlf -p $(GitVersion_NuGetVersion) -m SIL.Localizer.GetString -m SIL.Localizer.Localize -g ../Output/Release/net461/SIL.*.dll" />
   </Target>
   
   <Target Name="PackageL10ns" DependsOnTargets="restore;GetVersion">
diff --git a/l10n/l10ns.nuspec b/l10n/l10ns.nuspec
index 2d45cb117..4781fb730 100644
--- a/l10n/l10ns.nuspec
+++ b/l10n/l10ns.nuspec
@@ -8,7 +8,7 @@
         <authors>Jason Naylor</authors>
 		<license type="expression">MIT</license>
 		<projectUrl>https://github.com/sillsdev/libpalaso</projectUrl>
-		<copyright>Copyright © 2010-2020 SIL International</copyright>
+		<copyright>Copyright © 2010-2023 SIL International</copyright>
     </metadata>
 	<files>
 	  <file src="**\Palaso.*.xlf" target="content" />