Skip to content

Commit e434f47

Browse files
retailcoderretailcoder
committed
fixed localization. ref. #2226 
1 parent 6276daf commit e434f47

26 files changed

+58
-41
lines changed

‎RetailCoder.VBE/App.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System;
1010
using System.Globalization;
1111
using System.Windows.Forms;
12+
using Rubberduck.Inspections.Resources;
1213
using Rubberduck.UI.Command;
1314
using Rubberduck.UI.Command.MenuItems.CommandBars;
1415
using Rubberduck.VBEditor.SafeComWrappers.Abstract;
@@ -130,6 +131,8 @@ private void LoadConfig()
130131
try
131132
{
132133
CultureManager.UICulture = CultureInfo.GetCultureInfo(_config.UserSettings.GeneralSettings.Language.Code);
134+
RubberduckUI.Culture = CultureInfo.CurrentUICulture;
135+
InspectionsUI.Culture = CultureInfo.CurrentUICulture;
133136
_appMenus.Localize();
134137
_stateBar.Localize();
135138
}

‎RetailCoder.VBE/Common/DeclarationExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Diagnostics;
44
using System.Diagnostics.CodeAnalysis;
5+
using System.Globalization;
56
using System.Linq;
67
using System.Windows.Media.Imaging;
78
using Rubberduck.Parsing;
@@ -11,7 +12,6 @@
1112
using Rubberduck.Properties;
1213
using Rubberduck.UI;
1314
using Rubberduck.VBEditor;
14-
using Rubberduck.VBEditor.Extensions;
1515
using Rubberduck.VBEditor.SafeComWrappers;
1616

1717
// ReSharper disable LocalizableElement
@@ -24,7 +24,7 @@ public static class DeclarationExtensions
2424

2525
public static string ToLocalizedString(this DeclarationType type)
2626
{
27-
return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type, UI.Settings.Settings.Culture);
27+
return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type, CultureInfo.CurrentUICulture);
2828
}
2929

3030
public static BitmapImage BitmapImage(this Declaration declaration)

‎RetailCoder.VBE/Inspections/Abstract/InspectionBase.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Globalization;
34
using System.Linq;
45
using Rubberduck.Inspections.Resources;
56
using Rubberduck.Parsing.Annotations;
@@ -57,13 +58,13 @@ protected InspectionBase(RubberduckParserState state, CodeInspectionSeverity def
5758
/// <summary>
5859
/// Meta-information about why an inspection exists.
5960
/// </summary>
60-
public virtual string Meta { get { return InspectionsUI.ResourceManager.GetString(Name + "Meta", UI.Settings.Settings.Culture); } }
61+
public virtual string Meta { get { return InspectionsUI.ResourceManager.GetString(Name + "Meta", CultureInfo.CurrentUICulture); } }
6162

6263
/// <summary>
6364
/// Gets a localized string representing the type of inspection.
6465
/// <see cref="InspectionType"/>
6566
/// </summary>
66-
public virtual string InspectionTypeName { get { return InspectionsUI.ResourceManager.GetString(InspectionType.ToString(), UI.Settings.Settings.Culture); } }
67+
public virtual string InspectionTypeName { get { return InspectionsUI.ResourceManager.GetString(InspectionType.ToString(), CultureInfo.CurrentUICulture); } }
6768

6869
/// <summary>
6970
/// Gets a string representing the text that must be present in an

‎RetailCoder.VBE/Inspections/Abstract/QuickFixBase.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Windows.Threading;
1+
using System.Globalization;
2+
using System.Windows.Threading;
23
using Antlr4.Runtime;
34
using Rubberduck.VBEditor;
45

@@ -12,8 +13,8 @@ public abstract class QuickFixBase
1213

1314
public QuickFixBase(ParserRuleContext context, QualifiedSelection selection, string description)
1415
{
15-
Dispatcher.CurrentDispatcher.Thread.CurrentCulture = UI.Settings.Settings.Culture;
16-
Dispatcher.CurrentDispatcher.Thread.CurrentUICulture = UI.Settings.Settings.Culture;
16+
Dispatcher.CurrentDispatcher.Thread.CurrentCulture = CultureInfo.CurrentUICulture;
17+
Dispatcher.CurrentDispatcher.Thread.CurrentUICulture = CultureInfo.CurrentUICulture;
1718

1819
_context = context;
1920
_selection = selection;

‎RetailCoder.VBE/Inspections/Concrete/Inspector.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Concurrent;
33
using System.Collections.Generic;
4+
using System.Globalization;
45
using System.Linq;
56
using System.Threading;
67
using System.Threading.Tasks;
@@ -104,7 +105,7 @@ public async Task<IEnumerable<IInspectionResult>> FindIssuesAsync(RubberduckPars
104105
.Select(kv => new AggregateInspectionResult(kv.Value.OrderBy(i => i.QualifiedSelection).First(), kv.Value.Count)))
105106
.ToList();
106107

107-
state.OnStatusMessageUpdate(RubberduckUI.ResourceManager.GetString("ParserState_" + state.Status, UI.Settings.Settings.Culture)); // should be "Ready"
108+
state.OnStatusMessageUpdate(RubberduckUI.ResourceManager.GetString("ParserState_" + state.Status, CultureInfo.CurrentUICulture)); // should be "Ready"
108109
return results;
109110
}
110111

‎RetailCoder.VBE/Inspections/QuickFixes/RenameDeclarationQuickFix.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Globalization;
12
using System.Windows.Forms;
23
using Antlr4.Runtime;
34
using Rubberduck.Inspections.Abstract;
@@ -20,7 +21,7 @@ public class RenameDeclarationQuickFix : QuickFixBase
2021
private readonly IMessageBox _messageBox;
2122

2223
public RenameDeclarationQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state, IMessageBox messageBox)
23-
: base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, UI.Settings.Settings.Culture)))
24+
: base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, CultureInfo.CurrentUICulture)))
2425
{
2526
_target = target;
2627
_state = state;

‎RetailCoder.VBE/Inspections/QuickFixes/RenameProjectQuickFix.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Windows.Forms;
1+
using System.Globalization;
2+
using System.Windows.Forms;
23
using Antlr4.Runtime;
34
using Rubberduck.Inspections.Abstract;
45
using Rubberduck.Parsing.Symbols;
@@ -20,7 +21,7 @@ public class RenameProjectQuickFix : QuickFixBase
2021
private readonly RubberduckParserState _state;
2122

2223
public RenameProjectQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state)
23-
: base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + DeclarationType.Project, UI.Settings.Settings.Culture)))
24+
: base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + DeclarationType.Project, CultureInfo.CurrentUICulture)))
2425
{
2526
_target = target;
2627
_state = state;

‎RetailCoder.VBE/Inspections/Results/IdentifierNameInspectionResult.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using System.Globalization;
23
using Rubberduck.Common;
34
using Rubberduck.Inspections.Abstract;
45
using Rubberduck.Inspections.QuickFixes;
@@ -42,7 +43,7 @@ public override IEnumerable<QuickFixBase> QuickFixes
4243

4344
public override string Description
4445
{
45-
get { return string.Format(InspectionsUI.IdentifierNameInspectionResultFormat, RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType, UI.Settings.Settings.Culture), Target.IdentifierName).Captialize(); }
46+
get { return string.Format(InspectionsUI.IdentifierNameInspectionResultFormat, RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType, CultureInfo.CurrentUICulture), Target.IdentifierName).Captialize(); }
4647
}
4748

4849
public override NavigateCodeEventArgs GetNavigationArgs()

‎RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Collections.ObjectModel;
4+
using System.Globalization;
45
using System.Linq;
56
using NLog;
67
using Rubberduck.Navigation.Folders;
@@ -194,7 +195,7 @@ public string PanelTitle
194195

195196
var nameWithDeclarationType = declaration.IdentifierName +
196197
string.Format(" - ({0})", RubberduckUI.ResourceManager.GetString(
197-
"DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture));
198+
"DeclarationType_" + declaration.DeclarationType, CultureInfo.CurrentUICulture));
198199

199200
if (string.IsNullOrEmpty(declaration.AsTypeName))
200201
{

‎RetailCoder.VBE/Settings/CodeInspectionSettings.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public string LocalizedName
8484
{
8585
get
8686
{
87-
return InspectionsUI.ResourceManager.GetString(Name + "Name", UI.Settings.Settings.Culture);
87+
return InspectionsUI.ResourceManager.GetString(Name + "Name", CultureInfo.CurrentUICulture);
8888
}
8989
} // not serialized because culture-dependent
9090

@@ -102,25 +102,25 @@ public string Meta
102102
{
103103
get
104104
{
105-
return InspectionsUI.ResourceManager.GetString(Name + "Meta", UI.Settings.Settings.Culture);
105+
return InspectionsUI.ResourceManager.GetString(Name + "Meta", CultureInfo.CurrentUICulture);
106106
}
107107
}
108108

109109
[XmlIgnore]
110110
public string TypeLabel
111111
{
112-
get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSettings_" + InspectionType, UI.Settings.Settings.Culture); }
112+
get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSettings_" + InspectionType, CultureInfo.CurrentUICulture); }
113113
}
114114

115115
[XmlIgnore]
116116
public string SeverityLabel
117117
{
118-
get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + Severity, UI.Settings.Settings.Culture); }
118+
get { return RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + Severity, CultureInfo.CurrentUICulture); }
119119
set
120120
{
121121
foreach (var severity in Enum.GetValues(typeof (CodeInspectionSeverity)))
122122
{
123-
if (value == RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + severity, UI.Settings.Settings.Culture))
123+
if (value == RubberduckUI.ResourceManager.GetString("CodeInspectionSeverity_" + severity, CultureInfo.CurrentUICulture))
124124
{
125125
Severity = (CodeInspectionSeverity)severity;
126126
return;

0 commit comments

Comments
 (0)