Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Localization] Change LanguageSet and Dependencies #11512

Merged
merged 3 commits into from
May 13, 2021
Merged

[Localization] Change LanguageSet and Dependencies #11512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
724a71f
initial changes to Change languageSet and Dependencies
May 12, 2021
a07a3d0
merging main and fixing conflicts. Also editing common-Translations.i…
May 12, 2021
d53c057
Merge branch 'main' into ChangingLanguageSet
mandel-macaque May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,017 changes: 0 additions & 1,017 deletions msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.hu.resx
View file
Open in desktop

This file was deleted.

1,017 changes: 0 additions & 1,017 deletions msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.nl.resx
View file
Open in desktop

This file was deleted.

1,017 changes: 0 additions & 1,017 deletions msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pt-PT.resx
View file
Open in desktop

This file was deleted.

1,017 changes: 0 additions & 1,017 deletions msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.sv.resx
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions msbuild/Xamarin.Localization.MSBuild/Xamarin.Localization.MSBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.fr.resx">
<Link>MSBStrings.fr.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.hu.resx">
<Link>MSBStrings.hu.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.it.resx">
<Link>MSBStrings.it.resx</Link>
</EmbeddedResource>
Expand All @@ -44,24 +41,15 @@
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.ko.resx">
<Link>MSBStrings.ko.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.nl.resx">
<Link>MSBStrings.nl.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.pl.resx">
<Link>MSBStrings.pl.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.pt-BR.resx">
<Link>MSBStrings.pt-BR.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.pt-PT.resx">
<Link>MSBStrings.pt-PT.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.ru.resx">
<Link>MSBStrings.ru.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.sv.resx">
<Link>MSBStrings.sv.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.tr.resx">
<Link>MSBStrings.tr.resx</Link>
</EmbeddedResource>
Expand Down
5 changes: 4 additions & 1 deletion ...sbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/LocalizationIgnore/common-Translations.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Insert Error codes that are waiting on translations below (one per line)
E0067
E0174
E0175
E0177
E0178
E0179
Expand All @@ -8,6 +9,7 @@ E0181
E0182
E0183
E0184
E0185
E0186
E0187
E7069
Expand All @@ -16,3 +18,4 @@ E7071
InvalidFramework
InvalidPlatform
E7072
W0176
13 changes: 0 additions & 13 deletions tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/LocalizationStringTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@ public class LocalizationStringTest : TestBase {
[TestCase ("en-US", "Unknown image format.")]
[TestCase ("es-ES", "formato de imagen desconocido.")]
[TestCase ("fr-FR", "format d'image inconnu.")]
[TestCase ("hu", "hu")]
[TestCase ("it-IT", "Formato immagine sconosciuto.")]
[TestCase ("ja-JP", "の読み込みでエラーが発生しました: 画像の形式が不明です。")]
[TestCase ("ko-KR", "을(를) 로드하는 동안 오류 발생: 알 수 없는 이미지 형식입니다.")]
[TestCase ("nl", "nl")]
[TestCase ("pl-PL", "nieznany format obrazu.")]
[TestCase ("pt-BR", "formato de imagem desconhecido.")]
[TestCase ("pt-PT", "pt-PT")]
[TestCase ("ru-RU", "неизвестный формат изображения.")]
[TestCase ("sv", "sv")]
[TestCase ("tr-TR", "yüklenirken hata oluştu: Görüntü biçimi bilinmiyor.")]
[TestCase ("zh-CN", "时出错: 未知图像格式")]
[TestCase ("zh-TW", "時發生錯誤: 未知的映像格式。")]
Expand Down Expand Up @@ -57,16 +53,12 @@ public void AllSupportedTranslations (string culture, string errorMessage)
[TestCase ("de-DE")]
[TestCase ("es-ES")]
[TestCase ("fr-FR")]
[TestCase ("hu")]
[TestCase ("it-IT")]
[TestCase ("ja-JP")]
[TestCase ("ko-KR")]
[TestCase ("nl")]
[TestCase ("pl-PL")]
[TestCase ("pt-BR")]
[TestCase ("pt-PT")]
[TestCase ("ru-RU")]
[TestCase ("sv")]
[TestCase ("tr-TR")]
[TestCase ("zh-CN")]
[TestCase ("zh-TW")]
Expand Down Expand Up @@ -112,20 +104,15 @@ public void SetUp ()
[TestCase ("de-DE")]
[TestCase ("es-ES")]
[TestCase ("fr-FR")]
[TestCase ("hu")]
[TestCase ("it-IT")]
[TestCase ("ja-JP")]
[TestCase ("ko-KR")]
[TestCase ("nl")]
[TestCase ("pl-PL")]
[TestCase ("pt-PT")]
[TestCase ("pt-BR")]
[TestCase ("ru-RU")]
[TestCase ("sv")]
[TestCase ("tr-TR")]
[TestCase ("zh-CN")]
[TestCase ("zh-TW")]
[Ignore ("OneLocBuild will return proper translated resx files.")]
public void AllErrorTranslation (string culture)
{
StringBuilder errorList = new StringBuilder (string.Empty);
Expand Down
12 changes: 2 additions & 10 deletions tests/mtouch/LocalizationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,12 @@ public class LocalizationTests
[TestCase ("de-DE")]
[TestCase ("es-ES")]
[TestCase ("fr-FR")]
[TestCase ("hu")]
[TestCase ("it-IT")]
[TestCase ("ja-JP")]
[TestCase ("ko-KR")]
[TestCase ("nl")]
[TestCase ("pl")]
[TestCase ("pl-PL")]
[TestCase ("pt-BR")]
[TestCase ("pt-PT")]
[TestCase ("ru-RU")]
[TestCase ("sv")]
[TestCase ("tr-TR")]
[TestCase ("zh-CN")]
[TestCase ("zh-TW")]
Expand Down Expand Up @@ -72,16 +68,12 @@ private string TranslateError (string culture, string errorCode)
[TestCase ("de-DE")]
[TestCase ("es-ES")]
[TestCase ("fr-FR")]
[TestCase ("hu")]
[TestCase ("it-IT")]
[TestCase ("ja-JP")]
[TestCase ("ko-KR")]
[TestCase ("nl")]
[TestCase ("pl")]
[TestCase ("pl-PL")]
[TestCase ("pt-BR")]
[TestCase ("pt-PT")]
[TestCase ("ru-RU")]
[TestCase ("sv")]
[TestCase ("tr-TR")]
[TestCase ("zh-CN")]
[TestCase ("zh-TW")]
Expand Down
2 changes: 1 addition & 1 deletion tools/devops/LocProject.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Projects": [
{
"LanguageSet": "Azure_Languages",
"LanguageSet": "VS_Main_Languages",
"LocItems": [
{
"SourceFile": "@WORKING_DIRECTORY@/../../msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx",
Expand Down
16 changes: 0 additions & 16 deletions tools/dotnet-linker/dotnet-linker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,6 @@
<Link>tools\mtouch\Errors.fr.resx</Link>
<ManifestResourceName>Errors.mtouch.fr</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.hu.resx">
<Link>tools\mtouch\Errors.hu.resx</Link>
<ManifestResourceName>Errors.mtouch.hu</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.it.resx">
<Link>tools\mtouch\Errors.it.resx</Link>
<ManifestResourceName>Errors.mtouch.it</ManifestResourceName>
Expand All @@ -240,10 +236,6 @@
<Link>tools\mtouch\Errors.ko.resx</Link>
<ManifestResourceName>Errors.mtouch.ko</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.nl.resx">
<Link>tools\mtouch\Errors.nl.resx</Link>
<ManifestResourceName>Errors.mtouch.nl</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.pl.resx">
<Link>tools\mtouch\Errors.pl.resx</Link>
<ManifestResourceName>Errors.mtouch.pl</ManifestResourceName>
Expand All @@ -252,18 +244,10 @@
<Link>tools\mtouch\Errors.pt-BR.resx</Link>
<ManifestResourceName>Errors.mtouch.pt-BR</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.pt-PT.resx">
<Link>tools\mtouch\Errors.pt-PT.resx</Link>
<ManifestResourceName>Errors.mtouch.pt-PT</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.ru.resx">
<Link>tools\mtouch\Errors.ru.resx</Link>
<ManifestResourceName>Errors.mtouch.ru</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.sv.resx">
<Link>tools\mtouch\Errors.sv.resx</Link>
<ManifestResourceName>Errors.mtouch.sv</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.tr.resx">
<Link>tools\mtouch\Errors.tr.resx</Link>
<ManifestResourceName>Errors.mtouch.tr</ManifestResourceName>
Expand Down
16 changes: 0 additions & 16 deletions tools/mmp/mmp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,6 @@
<Link>tools\mtouch\Errors.fr.resx</Link>
<ManifestResourceName>Errors.mtouch.fr</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.hu.resx">
<Link>tools\mtouch\Errors.hu.resx</Link>
<ManifestResourceName>Errors.mtouch.hu</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.it.resx">
<Link>tools\mtouch\Errors.it.resx</Link>
<ManifestResourceName>Errors.mtouch.it</ManifestResourceName>
Expand All @@ -526,10 +522,6 @@
<Link>tools\mtouch\Errors.ko.resx</Link>
<ManifestResourceName>Errors.mtouch.ko</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.nl.resx">
<Link>tools\mtouch\Errors.nl.resx</Link>
<ManifestResourceName>Errors.mtouch.nl</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.pl.resx">
<Link>tools\mtouch\Errors.pl.resx</Link>
<ManifestResourceName>Errors.mtouch.pl</ManifestResourceName>
Expand All @@ -538,18 +530,10 @@
<Link>tools\mtouch\Errors.pt-BR.resx</Link>
<ManifestResourceName>Errors.mtouch.pt-BR</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.pt-PT.resx">
<Link>tools\mtouch\Errors.pt-PT.resx</Link>
<ManifestResourceName>Errors.mtouch.pt-PT</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.ru.resx">
<Link>tools\mtouch\Errors.ru.resx</Link>
<ManifestResourceName>Errors.mtouch.ru</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.sv.resx">
<Link>tools\mtouch\Errors.sv.resx</Link>
<ManifestResourceName>Errors.mtouch.sv</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.tr.resx">
<Link>tools\mtouch\Errors.tr.resx</Link>
<ManifestResourceName>Errors.mtouch.tr</ManifestResourceName>
Expand Down
Loading