Skip to content

Commit e3c08ac

Browse files
michael-hawkermichael-hawker
authored
Merge pull request #3460 from michael-hawker/mhawker/localization-override-fix
Application Developer Localization Override Fix
2 parents 0e2d49f + 4ad2a12 commit e3c08ac

File tree

21 files changed

+560
-64
lines changed

21 files changed

+560
-64
lines changed

‎Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ async Task<Stream> CopyStream(HttpContent source)
331331
// Takes a second copy of the image stream, so that is can save the image data to cache.
332332
using (var saveStream = await CopyStream(response.Content))
333333
{
334-
await SaveImageToCache(localpath, saveStream);
334+
await SaveImageToCache(localPath, saveStream);
335335
}
336336
#endif
337337
}

‎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 = "WCT_TextToolbar_UrlLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
48+
string labelLabel = "WCT_TextToolbar_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 + "WCT_TextToolbar_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 = "WCT_TextToolbar_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 = "WCT_TextToolbar_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 = "WCT_TextToolbar_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/BladeView/BladeItem.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected override void OnExpanded(EventArgs args)
6868
{
6969
Width = _normalModeWidth;
7070
VisualStateManager.GoToState(this, "Expanded", true);
71-
var name = StringExtensions.GetLocalized("WindowsCommunityToolkit_BladeView_ExpandButton_Collapsed", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
71+
var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
7272
if (_enlargeButton != null)
7373
{
7474
AutomationProperties.SetName(_enlargeButton, name);
@@ -84,7 +84,7 @@ protected override void OnCollapsed(EventArgs args)
8484
{
8585
Width = double.NaN;
8686
VisualStateManager.GoToState(this, "Collapsed", true);
87-
var name = StringExtensions.GetLocalized("WindowsCommunityToolkit_BladeView_ExpandButton_Expanded", "Microsoft.Toolkit.Uwp.UI.Controls/Resources");
87+
var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
8888
if (_enlargeButton != null)
8989
{
9090
AutomationProperties.SetName(_enlargeButton, name);

‎Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public GridSplitter()
168168
{
169169
DefaultStyleKey = typeof(GridSplitter);
170170
Loaded += GridSplitter_Loaded;
171-
string automationName = StringExtensions.GetLocalized("WindowsCommunityToolkit_GridSplitter_AutomationName", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources");
171+
string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
172172
AutomationProperties.SetName(this, automationName);
173173
}
174174

‎Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected override void OnApplyTemplate()
6363
{
6464
_dismissButton.Visibility = ShowDismissButton ? Visibility.Visible : Visibility.Collapsed;
6565
_dismissButton.Click += DismissButton_Click;
66-
AutomationProperties.SetName(_dismissButton, StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_DismissButton_AutomationName", "Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
66+
AutomationProperties.SetName(_dismissButton, "WCT_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
6767
}
6868

6969
if (_visualStateGroup != null)

‎Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Setter Property="HorizontalOffset" Value="0" />
3131
<Setter Property="AutomationProperties.LandmarkType" Value="Custom" />
3232
<!-- The setter value is localized using x:Uid but we still need to set it explicitly to avoid a compiler warning -->
33-
<Setter x:Uid="WindowsCommunityToolkit_InAppNotification_LandmarkProperty" Property="AutomationProperties.LocalizedLandmarkType" Value="Notification" />
33+
<Setter x:Uid="WCT_InAppNotification_LandmarkProperty" Property="AutomationProperties.LocalizedLandmarkType" Value="Notification" />
3434
<Setter Property="AutomationProperties.LiveSetting" Value="Assertive" />
3535
<Setter Property="Template" Value="{StaticResource MSEdgeNotificationTemplate}" />
3636
</Style>

‎Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -117,107 +117,107 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="TextToolbarStrings_BoldLabel" xml:space="preserve">
120+
<data name="WCT_TextToolbar_BoldLabel" xml:space="preserve">
121121
<value>Bold</value>
122122
<comment>Label for TextToolbar Control bold button.</comment>
123123
</data>
124-
<data name="TextToolbarStrings_CancelLabel" xml:space="preserve">
124+
<data name="WCT_TextToolbar_CancelLabel" xml:space="preserve">
125125
<value>Cancel</value>
126126
<comment>Label for TextToolbar Control Cancel message.</comment>
127127
</data>
128-
<data name="TextToolbarStrings_CodeLabel" xml:space="preserve">
128+
<data name="WCT_TextToolbar_CodeLabel" xml:space="preserve">
129129
<value>Code</value>
130130
<comment>Label for TextToolbar Control Code button.</comment>
131131
</data>
132-
<data name="TextToolbarStrings_CreateLinkLabel" xml:space="preserve">
132+
<data name="WCT_TextToolbar_CreateLinkLabel" xml:space="preserve">
133133
<value>Create Link</value>
134134
<comment>Label for TextToolbar Control Create Link button.</comment>
135135
</data>
136-
<data name="TextToolbarStrings_EmptyTextLabel" xml:space="preserve">
136+
<data name="WCT_TextToolbar_EmptyTextLabel" xml:space="preserve">
137137
<value>Empty Text</value>
138138
<comment>Label for TextToolbar Control Empty Text.</comment>
139139
</data>
140-
<data name="TextToolbarStrings_HeaderLabel" xml:space="preserve">
140+
<data name="WCT_TextToolbar_HeaderLabel" xml:space="preserve">
141141
<value>Header</value>
142142
<comment>Label for TextToolbar Control Header button.</comment>
143143
</data>
144-
<data name="TextToolbarStrings_ItalicsLabel" xml:space="preserve">
144+
<data name="WCT_TextToolbar_ItalicsLabel" xml:space="preserve">
145145
<value>Italics</value>
146146
<comment>Label for TextToolbar Control italics button.</comment>
147147
</data>
148-
<data name="TextToolbarStrings_LabelLabel" xml:space="preserve">
148+
<data name="WCT_TextToolbar_LabelLabel" xml:space="preserve">
149149
<value>Label</value>
150150
<comment>Label for TextToolbar Control Label button.</comment>
151151
</data>
152-
<data name="TextToolbarStrings_LinkInvalidLabel" xml:space="preserve">
152+
<data name="WCT_TextToolbar_LinkInvalidLabel" xml:space="preserve">
153153
<value>Link Invalid</value>
154154
<comment>Label for TextToolbar Control Link Invalid message.</comment>
155155
</data>
156-
<data name="TextToolbarStrings_LinkLabel" xml:space="preserve">
156+
<data name="WCT_TextToolbar_LinkLabel" xml:space="preserve">
157157
<value>Link</value>
158158
<comment>Label for TextToolbar Control Link button.</comment>
159159
</data>
160-
<data name="TextToolbarStrings_ListLabel" xml:space="preserve">
160+
<data name="WCT_TextToolbar_ListLabel" xml:space="preserve">
161161
<value>List</value>
162162
<comment>Label for TextToolbar Control List button.</comment>
163163
</data>
164-
<data name="TextToolbarStrings_OkLabel" xml:space="preserve">
164+
<data name="WCT_TextToolbar_OkLabel" xml:space="preserve">
165165
<value>Ok</value>
166166
<comment>Label for TextToolbar Control Ok message.</comment>
167167
</data>
168-
<data name="TextToolbarStrings_OrderedListLabel" xml:space="preserve">
168+
<data name="WCT_TextToolbar_OrderedListLabel" xml:space="preserve">
169169
<value>Ordered List</value>
170170
<comment>Label for TextToolbar Control Ordered List button.</comment>
171171
</data>
172-
<data name="TextToolbarStrings_QuoteLabel" xml:space="preserve">
172+
<data name="WCT_TextToolbar_QuoteLabel" xml:space="preserve">
173173
<value>Quote</value>
174174
<comment>Label for TextToolbar Control Quote button.</comment>
175175
</data>
176-
<data name="TextToolbarStrings_RelativeLabel" xml:space="preserve">
176+
<data name="WCT_TextToolbar_RelativeLabel" xml:space="preserve">
177177
<value>Relative</value>
178178
<comment>Label for TextToolbar Control Relative.</comment>
179179
</data>
180-
<data name="TextToolbarStrings_StrikethroughLabel" xml:space="preserve">
180+
<data name="WCT_TextToolbar_StrikethroughLabel" xml:space="preserve">
181181
<value>Strikethrough</value>
182182
<comment>Label for TextToolbar Control Strikethrough button.</comment>
183183
</data>
184-
<data name="TextToolbarStrings_UnderlineLabel" xml:space="preserve">
184+
<data name="WCT_TextToolbar_UnderlineLabel" xml:space="preserve">
185185
<value>Underline</value>
186186
<comment>Label for TextToolbar Control Underline button.</comment>
187187
</data>
188-
<data name="TextToolbarStrings_UrlLabel" xml:space="preserve">
188+
<data name="WCT_TextToolbar_UrlLabel" xml:space="preserve">
189189
<value>Url</value>
190190
<comment>Label for TextToolbar Control Url button.</comment>
191191
</data>
192-
<data name="TextToolbarStrings_WarningLabel" xml:space="preserve">
192+
<data name="WCT_TextToolbar_WarningLabel" xml:space="preserve">
193193
<value>Warning</value>
194194
<comment>Label for TextToolbar Control Warning message.</comment>
195195
</data>
196-
<data name="WindowsCommunityToolkit_BladeView_ExpandButton_Collapsed" xml:space="preserve">
196+
<data name="WCT_BladeView_ExpandButton_Collapsed" xml:space="preserve">
197197
<value>Collapse Blade</value>
198198
<comment>Narrator Resource for BladeView collapsed status</comment>
199199
</data>
200-
<data name="WindowsCommunityToolkit_BladeView_ExpandButton_Expanded" xml:space="preserve">
200+
<data name="WCT_BladeView_ExpandButton_Expanded" xml:space="preserve">
201201
<value>Expand Blade</value>
202202
<comment>Narrator Resource for BladeView expanded status</comment>
203203
</data>
204-
<data name="WindowsCommunityToolkit_GridSplitter_AutomationName" xml:space="preserve">
204+
<data name="WCT_GridSplitter_AutomationName" xml:space="preserve">
205205
<value>GridSplitter</value>
206206
<comment>Narrator Resource for GridSplitter control</comment>
207207
</data>
208-
<data name="WindowsCommunityToolkit_InAppNotification_DismissButton_AutomationName" xml:space="preserve">
208+
<data name="WCT_InAppNotification_DismissButton_AutomationName" xml:space="preserve">
209209
<value>Dismiss</value>
210210
<comment>The automation name for the dismiss button of the InAppNotification control.</comment>
211211
</data>
212-
<data name="WindowsCommunityToolkit_InAppNotification_LandmarkProperty.Value" xml:space="preserve">
212+
<data name="WCT_InAppNotification_LandmarkProperty.Value" xml:space="preserve">
213213
<value>Notification</value>
214214
<comment>The landmark name for the InAppNotification control. It is said by the narrator when using landmark navigation.</comment>
215215
</data>
216-
<data name="WindowsCommunityToolkit_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
216+
<data name="WCT_TokenizingTextBoxItem_MenuFlyout_Remove" xml:space="preserve">
217217
<value>Remove</value>
218218
<comment>Label for TokenizingTextBox MenuFlyout 'Remove' option.</comment>
219219
</data>
220-
<data name="WindowsCommunityToolkit_TokenizingTextBox_MenuFlyout_SelectAll" xml:space="preserve">
220+
<data name="WCT_TokenizingTextBox_MenuFlyout_SelectAll" xml:space="preserve">
221221
<value>Select All</value>
222222
<comment>Label for TokenizingTextBox MenuFlyout 'Select All' option.</comment>
223223
</data>

‎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 = "WCT_TextToolbar_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 = "WCT_TextToolbar_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 = "WCT_TextToolbar_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 = "WCT_TextToolbar_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 = "WCT_TextToolbar_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 = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"),
95+
SecondaryButtonText = "WCT_TextToolbar_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 = "WCT_TextToolbar_LinkInvalidLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
111+
string okLabel = "WCT_TextToolbar_OkLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
112+
string warningLabel = "WCT_TextToolbar_WarningLabel".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources");
113113
string linkText = linkBox.Text.Trim();
114114

115115
if (string.IsNullOrWhiteSpace(linkText))

0 commit comments

Comments
 (0)