Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcf48f76

Browse files
authored
Merge pull request #4047 from Microsoft/xliff
move all localization support to GitHub
2 parents780b634 +9ccc135 commitcf48f76

File tree

547 files changed

+245959
-1098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

547 files changed

+245959
-1098
lines changed

‎build.cmd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -641,8 +641,8 @@ if "%BUILD_PROTO%" == "1" (
641641

642642
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (
643643

644-
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
645-
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
644+
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true
645+
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true
646646
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
647647
)
648648

@@ -651,8 +651,8 @@ if "%BUILD_PROTO%" == "1" (
651651
echo%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
652652
%_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
653653

654-
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
655-
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto
654+
echo%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true
655+
%_msbuildexe%%msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true
656656
@if ERRORLEVEL1echo Error: compiler proto build failed&&goto :failure
657657
)
658658

‎build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,12 +507,12 @@ if [ "$BUILD_PROTO" = '1' ]; then
507507
{pushd ./lkg/fsc&&eval"$_dotnetexe publish project.json --no-build -o${_scriptdir}Tools/lkg -r$_architecture"&&popd; }|| failwith"dotnet publish failed"
508508
{pushd ./lkg/fsi&&eval"$_dotnetexe publish project.json --no-build -o${_scriptdir}Tools/lkg -r$_architecture"&&popd; }|| failwith"dotnet publish failed"
509509

510-
{ printeval"$_msbuildexe$msbuildflags src/fsharp-proto-build.proj /p:Configuration=Proto"; }|| failwith"compiler proto build failed"
510+
{ printeval"$_msbuildexe$msbuildflags src/fsharp-proto-build.proj /p:Configuration=Proto /p:DisableLocalization=true"; }|| failwith"compiler proto build failed"
511511

512512
# { printeval "$_ngenexe install Proto/net40/bin/fsc-proto.exe /nologo"; } || failwith "NGen of proto failed"
513513
else
514514
# Build proto-compiler and libs
515-
{ printeval"$_msbuildexe$msbuildflags src/fsharp-proto-build.proj /p:UseMonoPackaging=true /p:Configuration=Proto"; }|| failwith"compiler proto build failed"
515+
{ printeval"$_msbuildexe$msbuildflags src/fsharp-proto-build.proj /p:UseMonoPackaging=true /p:Configuration=Proto /p:DisableLocalization=true"; }|| failwith"compiler proto build failed"
516516
fi
517517
fi
518518

‎packages.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,7 @@
6868
<!-- Perl is used for the fsharpqa test suite-->
6969
<packageid="StrawberryPerl64"version="5.22.2.1" />
7070

71+
<!-- Xliff localization-->
72+
<packageid="XliffTasks"version="0.2.0-beta-000076" />
73+
7174
</packages>

‎setup/FSharp.SDK/FSharp.SDK.wixproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<PropertyGroup>
2525
<DefineConstants>$(DefineConstants);LocaleCode=$(LocaleCode)</DefineConstants>
2626
<DefineConstants>$(DefineConstants);LocaleId=$(LocaleId)</DefineConstants>
27+
<DefineConstants>$(DefineConstants);LocaleParentId=$(LocaleParentId)</DefineConstants>
2728
<DefineConstants>$(DefineConstants);LocaleParentCulture=$(LocaleParentCulture)</DefineConstants>
2829
<DefineConstants>$(DefineConstants);LocaleSpecificCulture=$(LocaleSpecificCulture)</DefineConstants>
2930
<DefineConstants>$(DefineConstants);IsLangPack=$(IsLangPack)</DefineConstants>

‎setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,19 @@
77
<ComponentRefId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" />
88
<ComponentRefId="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)" />
99
<ComponentRefId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)" />
10-
<ComponentRefId="Compiler_LangPack_fsc.exe_$(var.LocaleCode)" />
11-
<ComponentRefId="Compiler_LangPack_fsi.exe_$(var.LocaleCode)" />
12-
<ComponentRefId="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)" />
1310
</ComponentGroup>
1411

1512
<DirectoryRefId="MicrosoftSDKs_FS_4.1_Framework_v4.0_$(var.LocaleId)">
1613
<ComponentId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode), $(var.LocaleCode)))">
17-
<FileId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
14+
<FileId="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll"KeyPath="yes" />
1815
</Component>
1916

2017
<ComponentId="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode), $(var.LocaleCode)))">
21-
<FileId="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Build.resources.dll"KeyPath="yes" />
18+
<FileId="Compiler_LangPack_FSharp.Build.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Build.resources.dll"KeyPath="yes" />
2219
</Component>
2320

2421
<ComponentId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode), $(var.LocaleCode)))">
25-
<FileId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Compiler.Private.resources.dll"KeyPath="yes" />
26-
</Component>
27-
28-
<ComponentId="Compiler_LangPack_fsc.exe_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_fsc.exe_$(var.LocaleCode), $(var.LocaleCode)))">
29-
<FileId="Compiler_LangPack_fsc.exe_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsc.resources.dll"KeyPath="yes" />
30-
</Component>
31-
32-
<ComponentId="Compiler_LangPack_fsi.exe_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_fsi.exe_$(var.LocaleCode), $(var.LocaleCode)))">
33-
<FileId="Compiler_LangPack_fsi.exe_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsi.resources.dll"KeyPath="yes"/>
34-
</Component>
35-
36-
<ComponentId="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)"Guid="$(fsharp.guid(Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode), $(var.LocaleCode)))">
37-
<FileId="Compiler_LangPack_fsiAnyCPU.exe_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\fsiAnyCPU.resources.dll"KeyPath="yes" />
22+
<FileId="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Compiler.Private.resources.dll"KeyPath="yes" />
3823
</Component>
3924
</DirectoryRef>
4025
</Fragment>

‎setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)">
4949
<ComponentId="Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack"Transitive="yes"Guid="$(fsharp.guid(Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
50-
<FileId="Runtime_LangPack_4.4.1.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\net40\bin\localize\$(var.LocaleCode)\FSharp.Core.resources.dll"KeyPath="yes" />
50+
<FileId="Runtime_LangPack_4.4.1.0_FSharp.Core.resources.dll"Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll"KeyPath="yes" />
5151
</Component>
5252
</DirectoryRef>
5353
<DirectoryRefId="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)">

‎setup/FSharp.Setup.props‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,97 +37,111 @@
3737
<SetupLanguagesInclude="ENU">
3838
<LocaleCode>ENU</LocaleCode>
3939
<LocaleId>1033</LocaleId>
40+
<LocaleParentId>9</LocaleParentId>
4041
<LocaleParentCulture>en</LocaleParentCulture>
4142
<LocaleSpecificCulture>en-US</LocaleSpecificCulture>
4243
<IsLangPack>false</IsLangPack>
4344
</SetupLanguages>
44-
<SetupLanguagesInclude="CHT"Condition="'$(LocLanguages)' != ''">
45+
<SetupLanguagesInclude="CHT">
4546
<LocaleCode>CHT</LocaleCode>
4647
<LocaleId>1028</LocaleId>
48+
<LocaleParentId>31748</LocaleParentId>
4749
<LocaleParentCulture>zh-Hant</LocaleParentCulture>
4850
<LocaleSpecificCulture>zh-TW</LocaleSpecificCulture>
4951
<IsLangPack>true</IsLangPack>
5052
</SetupLanguages>
51-
<SetupLanguagesInclude="CSY"Condition="'$(LocLanguages)' != ''">
53+
<SetupLanguagesInclude="CSY">
5254
<LocaleCode>CSY</LocaleCode>
5355
<LocaleId>1029</LocaleId>
56+
<LocaleParentId>5</LocaleParentId>
5457
<LocaleParentCulture>cs</LocaleParentCulture>
5558
<LocaleSpecificCulture>cs-CZ</LocaleSpecificCulture>
5659
<IsLangPack>true</IsLangPack>
5760
</SetupLanguages>
58-
<SetupLanguagesInclude="DEU"Condition="'$(LocLanguages)' != ''">
61+
<SetupLanguagesInclude="DEU">
5962
<LocaleCode>DEU</LocaleCode>
6063
<LocaleId>1031</LocaleId>
64+
<LocaleParentId>7</LocaleParentId>
6165
<LocaleParentCulture>de</LocaleParentCulture>
6266
<LocaleSpecificCulture>de-DE</LocaleSpecificCulture>
6367
<IsLangPack>true</IsLangPack>
6468
</SetupLanguages>
65-
<SetupLanguagesInclude="FRA"Condition="'$(LocLanguages)' != ''">
69+
<SetupLanguagesInclude="FRA">
6670
<LocaleCode>FRA</LocaleCode>
6771
<LocaleId>1036</LocaleId>
72+
<LocaleParentId>12</LocaleParentId>
6873
<LocaleParentCulture>fr</LocaleParentCulture>
6974
<LocaleSpecificCulture>fr-FR</LocaleSpecificCulture>
7075
<IsLangPack>true</IsLangPack>
7176
</SetupLanguages>
72-
<SetupLanguagesInclude="ITA"Condition="'$(LocLanguages)' != ''">
77+
<SetupLanguagesInclude="ITA">
7378
<LocaleCode>ITA</LocaleCode>
7479
<LocaleId>1040</LocaleId>
80+
<LocaleParentId>16</LocaleParentId>
7581
<LocaleParentCulture>it</LocaleParentCulture>
7682
<LocaleSpecificCulture>it-IT</LocaleSpecificCulture>
7783
<IsLangPack>true</IsLangPack>
7884
</SetupLanguages>
79-
<SetupLanguagesInclude="JPN"Condition="'$(LocLanguages)' != ''">
85+
<SetupLanguagesInclude="JPN">
8086
<LocaleCode>JPN</LocaleCode>
8187
<LocaleId>1041</LocaleId>
88+
<LocaleParentId>17</LocaleParentId>
8289
<LocaleParentCulture>ja</LocaleParentCulture>
8390
<LocaleSpecificCulture>ja-JP</LocaleSpecificCulture>
8491
<IsLangPack>true</IsLangPack>
8592
</SetupLanguages>
86-
<SetupLanguagesInclude="KOR"Condition="'$(LocLanguages)' != ''">
93+
<SetupLanguagesInclude="KOR">
8794
<LocaleCode>KOR</LocaleCode>
8895
<LocaleId>1042</LocaleId>
96+
<LocaleParentId>18</LocaleParentId>
8997
<LocaleParentCulture>ko</LocaleParentCulture>
9098
<LocaleSpecificCulture>ko-KR</LocaleSpecificCulture>
9199
<IsLangPack>true</IsLangPack>
92100
</SetupLanguages>
93-
<SetupLanguagesInclude="PLK"Condition="'$(LocLanguages)' != ''">
101+
<SetupLanguagesInclude="PLK">
94102
<LocaleCode>PLK</LocaleCode>
95103
<LocaleId>1045</LocaleId>
104+
<LocaleParentId>21</LocaleParentId>
96105
<LocaleParentCulture>pl</LocaleParentCulture>
97106
<LocaleSpecificCulture>pl-PL</LocaleSpecificCulture>
98107
<IsLangPack>true</IsLangPack>
99108
</SetupLanguages>
100-
<SetupLanguagesInclude="PTB"Condition="'$(LocLanguages)' != ''">
109+
<SetupLanguagesInclude="PTB">
101110
<LocaleCode>PTB</LocaleCode>
102111
<LocaleId>1046</LocaleId>
112+
<LocaleParentId>1046</LocaleParentId>
103113
<LocaleParentCulture>pt-BR</LocaleParentCulture>
104114
<LocaleSpecificCulture>pt-BR</LocaleSpecificCulture>
105115
<IsLangPack>true</IsLangPack>
106116
</SetupLanguages>
107-
<SetupLanguagesInclude="RUS"Condition="'$(LocLanguages)' != ''">
117+
<SetupLanguagesInclude="RUS">
108118
<LocaleCode>RUS</LocaleCode>
109119
<LocaleId>1049</LocaleId>
120+
<LocaleParentId>25</LocaleParentId>
110121
<LocaleParentCulture>ru</LocaleParentCulture>
111122
<LocaleSpecificCulture>ru-RU</LocaleSpecificCulture>
112123
<IsLangPack>true</IsLangPack>
113124
</SetupLanguages>
114-
<SetupLanguagesInclude="TRK"Condition="'$(LocLanguages)' != ''">
125+
<SetupLanguagesInclude="TRK">
115126
<LocaleCode>TRK</LocaleCode>
116127
<LocaleId>1055</LocaleId>
128+
<LocaleParentId>31</LocaleParentId>
117129
<LocaleParentCulture>tr</LocaleParentCulture>
118130
<LocaleSpecificCulture>tr-TR</LocaleSpecificCulture>
119131
<IsLangPack>true</IsLangPack>
120132
</SetupLanguages>
121-
<SetupLanguagesInclude="CHS"Condition="'$(LocLanguages)' != ''">
133+
<SetupLanguagesInclude="CHS">
122134
<LocaleCode>CHS</LocaleCode>
123135
<LocaleId>2052</LocaleId>
136+
<LocaleParentId>4</LocaleParentId>
124137
<LocaleParentCulture>zh-Hans</LocaleParentCulture>
125138
<LocaleSpecificCulture>zh-CN</LocaleSpecificCulture>
126139
<IsLangPack>true</IsLangPack>
127140
</SetupLanguages>
128-
<SetupLanguagesInclude="ESN"Condition="'$(LocLanguages)' != ''">
141+
<SetupLanguagesInclude="ESN">
129142
<LocaleCode>ESN</LocaleCode>
130143
<LocaleId>3082</LocaleId>
144+
<LocaleParentId>10</LocaleParentId>
131145
<LocaleParentCulture>es</LocaleParentCulture>
132146
<LocaleSpecificCulture>es-ES</LocaleSpecificCulture>
133147
<IsLangPack>true</IsLangPack>

‎setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<ErrorCondition="'$(FSharpPackageVersion)' == ''"Text="A 'FSharpPackageVersion' property must be passed to the project." />
3333
</Target>
3434

35-
<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize">
35+
<TargetName="GatherBinariesToBeSigned"AfterTargets="CopyFilesToOutputDirectory">
3636
<!-- SWIX plugin adds the built vsix to signing automatically-->
3737
</Target>
3838
</Project>

‎setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ErrorCondition="'$(FSharpPackageVersion)' == ''"Text="A 'FSharpPackageVersion' property must be passed to the project." />
3030
</Target>
3131

32-
<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize">
32+
<TargetName="GatherBinariesToBeSigned"AfterTargets="CopyFilesToOutputDirectory">
3333
<!-- MSI is already signed before wrapping it here-->
3434
</Target>
3535
</Project>

‎setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
2222
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
2323
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleCode=$(LocaleCode)</PackagePreprocessorDefinitions>
24-
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
24+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleId=$(LocaleId)</PackagePreprocessorDefinitions>
25+
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentId=$(LocaleParentId)</PackagePreprocessorDefinitions>
2526
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleParentCulture=$(LocaleParentCulture)</PackagePreprocessorDefinitions>
2627
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);LocaleSpecificCulture=$(LocaleSpecificCulture)</PackagePreprocessorDefinitions>
2728
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);IsLangPack=$(IsLangPack)</PackagePreprocessorDefinitions>
@@ -35,7 +36,7 @@
3536
<PackageInclude="Files.swr" />
3637
</ItemGroup>
3738

38-
<TargetName="GatherBinariesToBeSigned"AfterTargets="Localize">
39+
<TargetName="GatherBinariesToBeSigned"AfterTargets="CopyFilesToOutputDirectory">
3940
<!-- MSI is already signed before wrapping it here-->
4041
</Target>
4142

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp