Skip to content

Commit b32b683

Browse files
michael-hawkermichael-hawker
committed
Update to call Extension method for GetLocalized directly
1 parent 568da68 commit b32b683

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownButtonActions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public override void FormatLink(ToolbarButton button, string label, string forma
4444
{
4545
var select = Formatter.Selected;
4646
int originalStart = Formatter.Selected.StartPosition;
47-
string urlLabel = StringExtensions.GetLocalized("TextToolbarStrings_UrlLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
48-
string labelLabel = StringExtensions.GetLocalized("TextToolbarStrings_LabelLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
47+
string urlLabel = "TextToolbarStrings_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
48+
string labelLabel = "TextToolbarStrings_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
4949

5050
// Replaces Selection of first Line only.
5151
if (select.Text.Contains("\r"))

‎Microsoft.Toolkit.Uwp.UI.Controls.Markdown/TextToolbar/Formats/MarkDown/MarkDownFormatter.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void StyleHeader(ToolbarButton button)
5555
{
5656
Content = new MarkdownTextBlock
5757
{
58-
Text = val + StringExtensions.GetLocalized("TextToolbarStrings_HeaderLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
58+
Text = val + "TextToolbarStrings_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
5959
IsTextSelectionEnabled = false
6060
},
6161
Tag = val,
@@ -462,7 +462,7 @@ public override ButtonMap DefaultButtons
462462
QuoteButton = new ToolbarButton
463463
{
464464
Name = QuoteElement,
465-
ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_QuoteLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
465+
ToolTip = "TextToolbarStrings_QuoteLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
466466
Icon = new SymbolIcon { Symbol = Symbol.Message },
467467
Activation = FormatQuote
468468
};
@@ -479,13 +479,13 @@ public override ButtonMap DefaultButtons
479479
{
480480
Name = HeadersElement,
481481
Icon = new SymbolIcon { Symbol = Symbol.FontSize },
482-
ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_HeaderLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
482+
ToolTip = "TextToolbarStrings_HeaderLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
483483
Activation = StyleHeader
484484
},
485485
new ToolbarButton
486486
{
487487
Name = CodeElement,
488-
ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_CodeLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
488+
ToolTip = "TextToolbarStrings_CodeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
489489
Icon = new FontIcon { Glyph = "{}", FontFamily = new FontFamily("Segoe UI"), Margin = new Thickness(0, -5, 0, 0) },
490490
Activation = FormatCode
491491
},

‎Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public override ButtonMap DefaultButtons
120120
StrikeButton = CommonButtons.Strikethrough;
121121
Underline = new ToolbarButton
122122
{
123-
ToolTip = StringExtensions.GetLocalized("TextToolbarStrings_UnderlineLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
123+
ToolTip = "TextToolbarStrings_UnderlineLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
124124
Icon = new SymbolIcon { Symbol = Symbol.Underline },
125125
ShortcutKey = VirtualKey.U,
126126
Activation = ((RichTextButtonActions)ButtonActions).FormatUnderline

‎Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public async void OpenLinkCreator(ToolbarButton button)
5454

5555
var labelBox = new RichEditBox
5656
{
57-
PlaceholderText = StringExtensions.GetLocalized("TextToolbarStrings_LabelLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
57+
PlaceholderText = "TextToolbarStrings_LabelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
5858
Margin = new Thickness(0, 0, 0, 5),
5959
AcceptsReturn = false
6060
};
6161
var linkBox = new TextBox
6262
{
63-
PlaceholderText = StringExtensions.GetLocalized("TextToolbarStrings_UrlLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources")
63+
PlaceholderText = "TextToolbarStrings_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
6464
};
6565

6666
CheckBox relativeBox = null;
@@ -78,7 +78,7 @@ public async void OpenLinkCreator(ToolbarButton button)
7878
{
7979
relativeBox = new CheckBox
8080
{
81-
Content = StringExtensions.GetLocalized("TextToolbarStrings_RelativeLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources")
81+
Content = "TextToolbarStrings_RelativeLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
8282
};
8383
contentPanel.Children.Add(relativeBox);
8484
}
@@ -89,10 +89,10 @@ public async void OpenLinkCreator(ToolbarButton button)
8989

9090
var contentDialog = new ContentDialog
9191
{
92-
Title = StringExtensions.GetLocalized("TextToolbarStrings_CreateLinkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
92+
Title = "TextToolbarStrings_CreateLinkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
9393
Content = contentPanel,
94-
PrimaryButtonText = StringExtensions.GetLocalized("TextToolbarStrings_OkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
95-
SecondaryButtonText = StringExtensions.GetLocalized("TextToolbarStrings_CancelLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources")
94+
PrimaryButtonText = "TextToolbarStrings_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
95+
SecondaryButtonText = "TextToolbarStrings_CancelLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")
9696
};
9797

9898
if (ControlHelpers.IsXamlRootAvailable && button.XamlRoot != null)
@@ -107,9 +107,9 @@ public async void OpenLinkCreator(ToolbarButton button)
107107
labelBox.Document.GetText(Windows.UI.Text.TextGetOptions.None, out string labelText);
108108
labelBox.Document.GetText(Windows.UI.Text.TextGetOptions.FormatRtf, out string formattedlabelText);
109109

110-
string linkInvalidLabel = StringExtensions.GetLocalized("TextToolbarStrings_LinkInvalidLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
111-
string okLabel = StringExtensions.GetLocalized("TextToolbarStrings_OkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
112-
string warningLabel = StringExtensions.GetLocalized("TextToolbarStrings_WarningLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
110+
string linkInvalidLabel = "TextToolbarStrings_LinkInvalidLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
111+
string okLabel = "TextToolbarStrings_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
112+
string warningLabel = "TextToolbarStrings_WarningLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
113113
string linkText = linkBox.Text.Trim();
114114

115115
if (string.IsNullOrWhiteSpace(linkText))

‎UnitTests/UnitTests.XamlIslands.UWPApp/XamlIslandsTest_StringExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ public async Task StringExtensions_GetLocalized()
3636
await App.Dispatcher.ExecuteOnUIThreadAsync(() =>
3737
{
3838
var xamlRoot = App.XamlRoot;
39-
var str = StringExtensions.GetLocalized("abc", xamlRoot.UIContext);
39+
var str = "abc".GetLocalized(xamlRoot.UIContext);
4040
Assert.AreEqual("ABCDEF", str);
4141
});
4242
}
4343

4444
[TestMethod]
4545
public void StringExtensions_GetLocalizedWithResourcePath()
4646
{
47-
var str = StringExtensions.GetLocalized("TextToolbarStrings_OkLabel", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
47+
var str = "TextToolbarStrings_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
4848
Assert.AreEqual("Ok", str);
4949
}
5050

0 commit comments

Comments
 (0)