diff --git a/dev/ResourceHelper/ResourceAccessor.h b/dev/ResourceHelper/ResourceAccessor.h index 182ba7792e..c99af0d123 100755 --- a/dev/ResourceHelper/ResourceAccessor.h +++ b/dev/ResourceHelper/ResourceAccessor.h @@ -205,4 +205,7 @@ class ResourceAccessor sealed #define SR_CommandBarFlyoutAppBarButtonLocalizedControlType L"CommandBarFlyoutAppBarButtonLocalizedControlType" #define SR_CommandBarFlyoutAppBarToggleButtonLocalizedControlType L"CommandBarFlyoutAppBarToggleButtonLocalizedControlType" +#define SR_WarningSuitableWebView2NotFound L"WarningSuitableWebView2NotFound" +#define SR_DownloadWebView2Runtime L"DownloadWebView2Runtime" + #define IR_NoiseAsset_256X256_PNG L"NoiseAsset_256X256_PNG" diff --git a/dev/WebView2/Strings/en-us/Resources.resw b/dev/WebView2/Strings/en-us/Resources.resw new file mode 100644 index 0000000000..324fe8ee21 --- /dev/null +++ b/dev/WebView2/Strings/en-us/Resources.resw @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + A suitable version of Microsoft Edge WebView2 Runtime was not detected. + Represents warning when suitable WebView2 is not found. + + + Download and install WebView2 Runtime + Part 2 of warning suitable WebView2 not found. + + \ No newline at end of file diff --git a/dev/WebView2/WebView2.cpp b/dev/WebView2/WebView2.cpp index 8b7daa5d4c..1fa99d6fbf 100644 --- a/dev/WebView2/WebView2.cpp +++ b/dev/WebView2/WebView2.cpp @@ -821,13 +821,10 @@ HWND WebView2::EnsureTemporaryHostHwnd() void WebView2::CreateMissingAnaheimWarning() { auto warning = winrt::TextBlock(); - warning.Text(L"A suitable version of Microsoft Edge WebView2 Runtime was not detected. "); + warning.Text(ResourceAccessor::GetLocalizedStringResource(SR_WarningSuitableWebView2NotFound)); warning.Inlines().Append(winrt::LineBreak()); - auto moreText = winrt::Run(); - moreText.Text(L"Please install from: "); - warning.Inlines().Append(moreText); auto linkText = winrt::Run(); - linkText.Text(L"Download WebView2 Runtime"); + linkText.Text(ResourceAccessor::GetLocalizedStringResource(SR_DownloadWebView2Runtime)); auto hyperlink = winrt::Hyperlink(); hyperlink.Inlines().Append(linkText); auto url = winrt::Uri(L"https://aka.ms/winui3/webview2download/"); diff --git a/dev/WebView2/WebView2.vcxitems b/dev/WebView2/WebView2.vcxitems index 86946e224b..2f56e3162e 100644 --- a/dev/WebView2/WebView2.vcxitems +++ b/dev/WebView2/WebView2.vcxitems @@ -29,4 +29,7 @@ + + + \ No newline at end of file