Browse Source

Forgotten localization of "Code Formatting" tab text, fixed other localizations.

pull/406/head
Andreas Weizel 11 years ago
parent
commit
f84804fa8e
  1. 3
      data/resources/StringResources.resx
  2. 2
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
  3. 6
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsPersistence.cs
  4. 6
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/CSharpFormattingEditor.xaml.cs

3
data/resources/StringResources.resx

@ -2725,6 +2725,9 @@ system. I don't think that it needs translation.</comment>
<data name="Dialog.ProjectOptions.BuildOptions.VBOptionsDefaultValues" xml:space="preserve"> <data name="Dialog.ProjectOptions.BuildOptions.VBOptionsDefaultValues" xml:space="preserve">
<value>Default values for VB Options:</value> <value>Default values for VB Options:</value>
</data> </data>
<data name="Dialog.ProjectOptions.CodeFormatting" xml:space="preserve">
<value>Code Formatting</value>
</data>
<data name="Dialog.ProjectOptions.Configuration" xml:space="preserve"> <data name="Dialog.ProjectOptions.Configuration" xml:space="preserve">
<value>&amp;Configuration</value> <value>&amp;Configuration</value>
</data> </data>

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

@ -121,7 +121,7 @@
<Include id = "AllManaged" path="/SharpDevelop/BackendBindings/ProjectOptions/AllManaged"/> <Include id = "AllManaged" path="/SharpDevelop/BackendBindings/ProjectOptions/AllManaged"/>
<!-- TODO Localize label! --> <!-- TODO Localize label! -->
<OptionPanel id = "CSharpProjectFormattingOptions" <OptionPanel id = "CSharpProjectFormattingOptions"
label = "Code Formatting" label = "${res:Dialog.ProjectOptions.CodeFormatting}"
class = "CSharpBinding.OptionPanels.CSharpProjectFormattingOptionPanel"/> class = "CSharpBinding.OptionPanels.CSharpProjectFormattingOptionPanel"/>
</Path> </Path>

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

@ -59,7 +59,7 @@ namespace CSharpBinding.FormattingStrategy
GlobalOptions = new CSharpFormattingOptionsPersistence( GlobalOptions = new CSharpFormattingOptionsPersistence(
SD.PropertyService.MainPropertiesContainer, new CSharpFormattingOptionsContainer() SD.PropertyService.MainPropertiesContainer, new CSharpFormattingOptionsContainer()
{ {
DefaultText = StringParser.Parse("${CSharpBinding.Formatting.GlobalOptionReference}") DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.GlobalOptionReference}")
}); });
GlobalOptions.Load(); GlobalOptions.Load();
@ -94,7 +94,7 @@ namespace CSharpBinding.FormattingStrategy
csproject.ExtensionProperties, csproject.ExtensionProperties,
new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer) new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer)
{ {
DefaultText = StringParser.Parse("${CSharpBinding.Formatting.ProjectOptionReference}") DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.ProjectOptionReference}")
}); });
} }
@ -111,7 +111,7 @@ namespace CSharpBinding.FormattingStrategy
e.Solution.GlobalPreferences, e.Solution.GlobalPreferences,
new CSharpFormattingOptionsContainer(GlobalOptions.OptionsContainer) new CSharpFormattingOptionsContainer(GlobalOptions.OptionsContainer)
{ {
DefaultText = StringParser.Parse("${CSharpBinding.Formatting.SolutionOptionReference}") DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.SolutionOptionReference}")
}); });
} }

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

@ -191,13 +191,13 @@ namespace CSharpBinding.OptionPanels
// Add a "default" preset // Add a "default" preset
presetItems.Add(new ComboBoxItem { Content = (container.Parent ?? container).DefaultText, Tag = "(default)" }); presetItems.Add(new ComboBoxItem { Content = (container.Parent ?? container).DefaultText, Tag = "(default)" });
} }
presetItems.Add(new ComboBoxItem { Content = "Empty", Tag = "Empty" });
presetItems.Add(new ComboBoxItem { Content = "SharpDevelop", Tag = "SharpDevelop" }); presetItems.Add(new ComboBoxItem { Content = "SharpDevelop", Tag = "SharpDevelop" });
presetItems.Add(new ComboBoxItem { Content = "Mono", Tag = "Mono" }); presetItems.Add(new ComboBoxItem { Content = "Mono", Tag = "Mono" });
presetItems.Add(new ComboBoxItem { Content = "K&R", Tag = "K&R" }); presetItems.Add(new ComboBoxItem { Content = "K&R", Tag = "K&R" });
presetItems.Add(new ComboBoxItem { Content = "Allman", Tag = "Allman" }); presetItems.Add(new ComboBoxItem { Content = "Allman", Tag = "Allman" });
presetItems.Add(new ComboBoxItem { Content = "Whitesmiths", Tag = "Whitesmiths" }); presetItems.Add(new ComboBoxItem { Content = "Whitesmiths", Tag = "Whitesmiths" });
presetItems.Add(new ComboBoxItem { Content = "GNU", Tag = "GNU" }); presetItems.Add(new ComboBoxItem { Content = "GNU", Tag = "GNU" });
presetItems.Add(new ComboBoxItem { Content = "Empty", Tag = "Empty" });
presetComboBox.SelectedIndex = 0; presetComboBox.SelectedIndex = 0;
} }
@ -218,11 +218,11 @@ namespace CSharpBinding.OptionPanels
// Ask user if he's sure to reset all previously defined settings // Ask user if he's sure to reset all previously defined settings
if (presetFunc != null) { if (presetFunc != null) {
if (SD.MessageService.AskQuestion("${CSharpBinding.Formatting.PresetOverwriteQuestion}")) { if (SD.MessageService.AskQuestion("${res:CSharpBinding.Formatting.PresetOverwriteQuestion}")) {
OptionsContainer.Reset(presetFunc()); OptionsContainer.Reset(presetFunc());
} }
} else { } else {
SD.MessageService.ShowWarning("${CSharpBinding.Formatting.NoPresetSelectedMessage}"); SD.MessageService.ShowWarning("${res:CSharpBinding.Formatting.NoPresetSelectedMessage}");
} }
} }
} }

Loading…
Cancel
Save