Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit f84804f

Browse files
committed
Forgotten localization of "Code Formatting" tab text, fixed other localizations.
1 parent 9779d7e commit f84804f

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

data/resources/StringResources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2725,6 +2725,9 @@ system. I don't think that it needs translation.</comment>
27252725
<data name="Dialog.ProjectOptions.BuildOptions.VBOptionsDefaultValues" xml:space="preserve">
27262726
<value>Default values for VB Options:</value>
27272727
</data>
2728+
<data name="Dialog.ProjectOptions.CodeFormatting" xml:space="preserve">
2729+
<value>Code Formatting</value>
2730+
</data>
27282731
<data name="Dialog.ProjectOptions.Configuration" xml:space="preserve">
27292732
<value>&amp;Configuration</value>
27302733
</data>

src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<Include id = "AllManaged" path="/SharpDevelop/BackendBindings/ProjectOptions/AllManaged"/>
122122
<!-- TODO Localize label! -->
123123
<OptionPanel id = "CSharpProjectFormattingOptions"
124-
label = "Code Formatting"
124+
label = "${res:Dialog.ProjectOptions.CodeFormatting}"
125125
class = "CSharpBinding.OptionPanels.CSharpProjectFormattingOptionPanel"/>
126126
</Path>
127127

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsPersistence.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static void Initialize()
5959
GlobalOptions = new CSharpFormattingOptionsPersistence(
6060
SD.PropertyService.MainPropertiesContainer, new CSharpFormattingOptionsContainer()
6161
{
62-
DefaultText = StringParser.Parse("${CSharpBinding.Formatting.GlobalOptionReference}")
62+
DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.GlobalOptionReference}")
6363
});
6464
GlobalOptions.Load();
6565

@@ -94,7 +94,7 @@ public static CSharpFormattingOptionsPersistence GetProjectOptions(IProject proj
9494
csproject.ExtensionProperties,
9595
new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer)
9696
{
97-
DefaultText = StringParser.Parse("${CSharpBinding.Formatting.ProjectOptionReference}")
97+
DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.ProjectOptionReference}")
9898
});
9999
}
100100

@@ -111,7 +111,7 @@ static void SolutionOpened(object sender, SolutionEventArgs e)
111111
e.Solution.GlobalPreferences,
112112
new CSharpFormattingOptionsContainer(GlobalOptions.OptionsContainer)
113113
{
114-
DefaultText = StringParser.Parse("${CSharpBinding.Formatting.SolutionOptionReference}")
114+
DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.SolutionOptionReference}")
115115
});
116116
}
117117

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/CSharpFormattingEditor.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,13 @@ private void FillPresetList(CSharpFormattingOptionsContainer container)
191191
// Add a "default" preset
192192
presetItems.Add(new ComboBoxItem { Content = (container.Parent ?? container).DefaultText, Tag = "(default)" });
193193
}
194-
presetItems.Add(new ComboBoxItem { Content = "Empty", Tag = "Empty" });
195194
presetItems.Add(new ComboBoxItem { Content = "SharpDevelop", Tag = "SharpDevelop" });
196195
presetItems.Add(new ComboBoxItem { Content = "Mono", Tag = "Mono" });
197196
presetItems.Add(new ComboBoxItem { Content = "K&R", Tag = "K&R" });
198197
presetItems.Add(new ComboBoxItem { Content = "Allman", Tag = "Allman" });
199198
presetItems.Add(new ComboBoxItem { Content = "Whitesmiths", Tag = "Whitesmiths" });
200199
presetItems.Add(new ComboBoxItem { Content = "GNU", Tag = "GNU" });
200+
presetItems.Add(new ComboBoxItem { Content = "Empty", Tag = "Empty" });
201201

202202
presetComboBox.SelectedIndex = 0;
203203
}
@@ -218,11 +218,11 @@ void ResetButton_Click(object sender, RoutedEventArgs e)
218218

219219
// Ask user if he's sure to reset all previously defined settings
220220
if (presetFunc != null) {
221-
if (SD.MessageService.AskQuestion("${CSharpBinding.Formatting.PresetOverwriteQuestion}")) {
221+
if (SD.MessageService.AskQuestion("${res:CSharpBinding.Formatting.PresetOverwriteQuestion}")) {
222222
OptionsContainer.Reset(presetFunc());
223223
}
224224
} else {
225-
SD.MessageService.ShowWarning("${CSharpBinding.Formatting.NoPresetSelectedMessage}");
225+
SD.MessageService.ShowWarning("${res:CSharpBinding.Formatting.NoPresetSelectedMessage}");
226226
}
227227
}
228228
}

0 commit comments

Comments
 (0)