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

[Xamarin.Android.Build.Tasks] Remove "Xamarin" from messages #8884

Merged
merged 2 commits into from
Apr 22, 2024
Merged

[Xamarin.Android.Build.Tasks] Remove "Xamarin" from messages #8884

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66659aa
[Xamarin.Android.Build.Tasks] Remove "Xamarin" from messages
jonpryor Apr 19, 2024
2cb4d7b
Address feedback
jonpryor Apr 22, 2024
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
2 changes: 1 addition & 1 deletion src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="XA2000" xml:space="preserve">
<value>Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.</value>
<value>Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will is no longer be available.</value>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is a typo, maybe it should be something like:

Suggested change
<value>Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will is no longer be available.</value>
<value>Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API is no longer available.</value>

<comment>The following are literal names and should not be translated: AppDomain.CreateDomain(), AppDomain
{0} - The name of the assembly</comment>
</data>
Expand Down
6 changes: 3 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,11 +562,11 @@ Either change the value in the AndroidManifest.xml to match the $(SupportedOSPla
{0} - The assembly name</comment>
</data>
<data name="APT2264" xml:space="preserve">
<value>This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2264 for details.</value>
<value>This could be caused by the project exceeding the Windows maximum path length limitation. See https://learn.microsoft.com/en-us/dotnet/android/messages/apt2264 for details.</value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should not use the en-us bit in the url. Otherwise it won't redirect to the culture specific page once the translations are done.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://learn.microsoft.com/dotnet/android/messages/apt2264 should work

<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="APT2265" xml:space="preserve">
<value>This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/xamarin/android/errors-and-warnings/apt2265 for details.</value>
<value>This could be caused by the project having non-ASCII characters in its filename or path. See https://learn.microsoft.com/en-us/dotnet/android/messages/apt2265 for details.</value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto . https://learn.microsoft.com/dotnet/android/messages/apt2265 should work fine

<comment>The following are literal names and should not be translated:</comment>
</data>
<data name="XA3001" xml:space="preserve">
Expand Down Expand Up @@ -1010,7 +1010,7 @@ To use a custom JDK path for a command line build, set the 'JavaSdkDirectory' MS
{1} - The numeric version of .NET</comment>
</data>
<data name="XA1039" xml:space="preserve">
<value>The Android Support libraries are not supported in .NET 9 and later, please migrate to AndroidX. See https://aka.ms/xamarin/androidx for more details.</value>
<value>The Android Support libraries are not supported in .NET 9 and later, please migrate to AndroidX. See https://aka.ms/net-android/androidx for more details.</value>
<comment>The following are literal names and should not be translated: Android Support, AndroidX, .NET.</comment>
</data>
<data name="XA4241" xml:space="preserve">
Expand Down