Browse Source

Added localizations of some strings relating to code formatting UI.

pull/406/head
Andreas Weizel 12 years ago
parent
commit
8abddcfc80
  1. 6
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsPersistence.cs
  2. 1
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/FormattingOptionBinding.cs
  3. 4
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/CSharpFormattingEditor.xaml
  4. 5
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/CSharpFormattingEditor.xaml.cs
  5. 2
      src/Main/SharpDevelop/Project/Solution.cs

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

@ -49,7 +49,7 @@ namespace CSharpBinding.FormattingStrategy
GlobalOptions = new CSharpFormattingOptionsPersistence( GlobalOptions = new CSharpFormattingOptionsPersistence(
SD.PropertyService.MainPropertiesContainer, new CSharpFormattingOptionsContainer() SD.PropertyService.MainPropertiesContainer, new CSharpFormattingOptionsContainer()
{ {
DefaultText = "(global)" // TODO Localize! DefaultText = StringParser.Parse("${CSharpBinding.Formatting.GlobalOptionReference}")
}); });
GlobalOptions.Load(); GlobalOptions.Load();
@ -81,7 +81,7 @@ namespace CSharpBinding.FormattingStrategy
csproject.ExtensionProperties, csproject.ExtensionProperties,
new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer) new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer)
{ {
DefaultText = "(project)" // TODO Localize! DefaultText = StringParser.Parse("${CSharpBinding.Formatting.ProjectOptionReference}")
}); });
} }
@ -98,7 +98,7 @@ namespace CSharpBinding.FormattingStrategy
e.Solution.GlobalPreferences, e.Solution.GlobalPreferences,
new CSharpFormattingOptionsContainer(GlobalOptions.OptionsContainer) new CSharpFormattingOptionsContainer(GlobalOptions.OptionsContainer)
{ {
DefaultText = "(solution)" // TODO Localize! DefaultText = StringParser.Parse("${CSharpBinding.Formatting.SolutionOptionReference}")
}); });
} }

1
src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/FormattingOptionBinding.cs

@ -67,7 +67,6 @@ namespace CSharpBinding.FormattingStrategy
if (container != null) { if (container != null) {
if (container.Parent != null) { if (container.Parent != null) {
// Add "default" entry in ComboBox // Add "default" entry in ComboBox
// TODO Add located resource, maybe context-bound, like "(solution)" or "(global)"!
comboBox.Items.Add(new ComboBoxItem { comboBox.Items.Add(new ComboBoxItem {
Content = (container.Parent ?? container).DefaultText, Content = (container.Parent ?? container).DefaultText,
Tag = null Tag = null

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

@ -300,7 +300,7 @@
<StackPanel DockPanel.Dock="Top" Orientation="Vertical"> <StackPanel DockPanel.Dock="Top" Orientation="Vertical">
<CheckBox <CheckBox
Name="autoFormattingCheckBox" Name="autoFormattingCheckBox"
Content="Automatically format code" Content="{core:Localize CSharpBinding.Formatting.AutoFormat}"
IsThreeState="True" IsChecked="{Binding AutoFormatting}" IsThreeState="True" IsChecked="{Binding AutoFormatting}"
Margin="0,0,0,10" Margin="0,0,0,10"
Visibility="Collapsed"/> Visibility="Collapsed"/>
@ -311,7 +311,7 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button Grid.Column="0" Content="Reset to:" Click="ResetButton_Click" /> <Button Grid.Column="0" Content="{core:Localize CSharpBinding.Formatting.ResetTo}" Click="ResetButton_Click" />
<ComboBox Name="presetComboBox" Grid.Column="1" Margin="3,0,0,0" ItemsSource="{Binding Presets}" /> <ComboBox Name="presetComboBox" Grid.Column="1" Margin="3,0,0,0" ItemsSource="{Binding Presets}" />
</Grid> </Grid>
</StackPanel> </StackPanel>

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

@ -217,13 +217,12 @@ namespace CSharpBinding.OptionPanels
var presetFunc = presets[(string) selectedPresetItem.Tag]; var presetFunc = presets[(string) selectedPresetItem.Tag];
// Ask user if he's sure to reset all previously defined settings // Ask user if he's sure to reset all previously defined settings
// TODO Localize messages!
if (presetFunc != null) { if (presetFunc != null) {
if (SD.MessageService.AskQuestion("Are you sure that you want to reset all previously defined formatting options?")) { if (SD.MessageService.AskQuestion("${CSharpBinding.Formatting.PresetOverwriteQuestion}")) {
OptionsContainer.Reset(presetFunc()); OptionsContainer.Reset(presetFunc());
} }
} else { } else {
SD.MessageService.ShowWarning("No formatting preset selected!"); SD.MessageService.ShowWarning("${CSharpBinding.Formatting.NoPresetSelectedMessage}");
} }
} }
} }

2
src/Main/SharpDevelop/Project/Solution.cs

@ -528,7 +528,7 @@ namespace ICSharpCode.SharpDevelop.Project
{ {
var treeNode = AddInTree.GetTreeNode("/SharpDevelop/Dialogs/SolutionFormattingOptionsDialog", false); var treeNode = AddInTree.GetTreeNode("/SharpDevelop/Dialogs/SolutionFormattingOptionsDialog", false);
bool? result = ICSharpCode.SharpDevelop.Commands.OptionsCommand.ShowTreeOptions( bool? result = ICSharpCode.SharpDevelop.Commands.OptionsCommand.ShowTreeOptions(
"Solution Formatting Options", StringParser.Parse("${ICSharpCode.SharpDevelop.Project.SolutionFormattingOptions.Title}"),
treeNode); treeNode);
if ((bool) result) { if ((bool) result) {
// Formatting options have been changed, make solution dirty // Formatting options have been changed, make solution dirty

Loading…
Cancel
Save