[Editor] Translations fix (stride3d#1717)

lionfire · Sep 28, 2023 · da514b6 · da514b6
1 parent 9e3b22c
commit da514b6
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 30 deletions.
diff --git a/deps/Gettext.Net/GNU.Getopt.dll b/deps/Gettext.Net/GNU.Getopt.dll
diff --git a/deps/Gettext.Net/GNU.Gettext.Msgfmt.dll.config b/deps/Gettext.Net/GNU.Gettext.Msgfmt.dll.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<appSettings>
+		<add key="Gnu.PosixlyCorrect" value="true"/>
+	</appSettings>
+</configuration>
diff --git a/deps/Gettext.Net/GNU.Gettext.Msgfmt.exe b/deps/Gettext.Net/GNU.Gettext.Msgfmt.exe
diff --git a/deps/Gettext.Net/GNU.Gettext.Msgfmt.exe.config b/deps/Gettext.Net/GNU.Gettext.Msgfmt.exe.config
diff --git a/deps/Gettext.Net/GNU.Gettext.dll b/deps/Gettext.Net/GNU.Gettext.dll
diff --git a/deps/Gettext.Net/System.Configuration.ConfigurationManager.dll b/deps/Gettext.Net/System.Configuration.ConfigurationManager.dll
diff --git a/deps/Gettext.Net/System.Security.AccessControl.dll b/deps/Gettext.Net/System.Security.AccessControl.dll
diff --git a/deps/Gettext.Net/System.Security.Permissions.dll b/deps/Gettext.Net/System.Security.Permissions.dll
diff --git a/deps/Gettext.Net/System.Security.Principal.Windows.dll b/deps/Gettext.Net/System.Security.Principal.Windows.dll
diff --git a/sources/core/Stride.Core.Translation/Stride.Core.Translation.csproj b/sources/core/Stride.Core.Translation/Stride.Core.Translation.csproj
@@ -12,7 +12,7 @@
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Stride.GNU.Gettext" Version="1.0.0.0" />
+    <PackageReference Include="Stride.GNU.Gettext" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">

diff --git a/sources/targets/Stride.Core.targets b/sources/targets/Stride.Core.targets
@@ -169,7 +169,7 @@
   <Import Project="$(MSBuildThisFileDirectory)Stride.AutoPack.targets"/>
 
   <!-- Generate localization satellite assemblies -->
-  <Target Name="StrideGenerateLocalizationSatelliteDlls" BeforeTargets="SatelliteDllsProjectOutputGroup" Returns="@(SatelliteDllsProjectOutputGroupOutput)" Condition="'$(StrideLocalized)' == 'true' And '$(Configuration)' == 'Release'">
+  <Target Name="StrideGenerateLocalizationSatelliteDlls" BeforeTargets="SatelliteDllsProjectOutputGroup" Returns="@(SatelliteDllsProjectOutputGroupOutput)" Condition="'$(StrideLocalized)' == 'true'" AfterTargets="Build">
     <ItemGroup>
       <!-- Current list of languages to try to generate -->
       <StrideTraductions Include="fr;ja;es;de;ru;it;ko"/>
@@ -182,8 +182,7 @@
       </_StrideTraductions>
     </ItemGroup>
     <Message Importance="High" Text="Generating traduction for %(_StrideTraductions.Identity) %(_StrideTraductions.SourceFolder)"/>
-    <Exec Condition="Exists('$(SolutionDir)..\sources\localization\%(_StrideTraductions.Source)\$(TargetName).%(_StrideTraductions.Source).po')" Command="Path=$(RoslynTargetsPath);$(Path)
-&quot;$(SolutionDir)..\deps\Gettext.Net\GNU.Gettext.Msgfmt.exe&quot; --lib-dir &quot;$(SolutionDir)..\deps\Gettext.Net&quot; --resource $(TargetName) -d &quot;$(TargetDir).&quot; --locale %(_StrideTraductions.Identity) &quot;$(MSBuildThisFileDirectory)..\localization\%(_StrideTraductions.Source)\$(TargetName).%(_StrideTraductions.Source).po&quot; --verbose" />
+    <Exec Condition="Exists('$(SolutionDir)..\sources\localization\%(_StrideTraductions.Source)\$(TargetName).%(_StrideTraductions.Source).po')" Command="$(SolutionDir)..\deps\Gettext.Net\GNU.Gettext.Msgfmt.exe -r $(TargetName) -d $(TargetDir) -l %(_StrideTraductions.Identity) -L $(SolutionDir)..\deps\Gettext.Net\ $(MSBuildThisFileDirectory)..\localization\%(_StrideTraductions.Source)\$(TargetName).%(_StrideTraductions.Source).po" />
     <ItemGroup>
       <SatelliteDllsProjectOutputGroupOutputIntermediate Include="$(OutDir)%(_StrideTraductions.Identity)\$(TargetName).Messages.resources.dll" Condition="Exists('$(OutDir)%(_StrideTraductions.Identity)\$(TargetName).Messages.resources.dll')">
         <TargetPath>%(_StrideTraductions.Identity)\$(TargetName).Messages.resources.dll</TargetPath>

diff --git a/sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj b/sources/tools/Stride.Core.Translation.Extractor/Stride.Core.Translation.Extractor.csproj
@@ -14,8 +14,8 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Stride.GNU.Getopt" Version="1.0.0.0" />
-    <PackageReference Include="Stride.GNU.Gettext" Version="1.0.0.0" />
+    <PackageReference Include="Stride.GNU.Getopt" Version="2.0.0" />
+    <PackageReference Include="Stride.GNU.Gettext" Version="2.0.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>