Skip to content

Commit da36f1a

Browse files
author
Mindaugas Veblauskas
committed
Merge branch 'release/3.5.1'
2 parents 3bfedb3 + 8ad283b commit da36f1a

File tree

13 files changed

+72
-72
lines changed

13 files changed

+72
-72
lines changed

‎src/GlobalAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

17-
[assembly: AssemblyVersion("3.5.0.0")]
18-
[assembly: AssemblyFileVersion("3.5.0.0")]
17+
[assembly: AssemblyVersion("3.5.1.0")]
18+
[assembly: AssemblyFileVersion("3.5.1.0")]
1919
[assembly: ComVisible(false)]
2020
[assembly: AssemblyInformationalVersion("$AssemblyVersion")]
2121
[assembly: SupportedOSPlatform("windows")]

‎src/ProcessCommunication/Client/ProtonVPN.ProcessCommunication.Client/GrpcClient.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ private GrpcChannel CreateChannel()
7676
{
7777
SocketsHttpHandler socketsHttpHandler = new()
7878
{
79-
ConnectCallback = _namedPipesConnectionFactory.ConnectAsync
79+
ConnectCallback = _namedPipesConnectionFactory.ConnectAsync,
80+
UseProxy = false,
81+
Proxy = null
8082
};
8183

8284
return GrpcChannel.ForAddress("http://localhost", new GrpcChannelOptions

‎src/ProtonVPN.App/Core/Bootstraper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ private void RegisterEvents()
497497
{
498498
if (e.PropertyName == nameof(IAppSettings.Language))
499499
{
500-
TranslationSource.Instance.CurrentCulture = new CultureInfo(appSettings.Language);
500+
Resolve<Language>().Set(appSettings.Language);
501501
}
502502

503503
IEnumerable<ISettingsAware> instances = Resolve<IEnumerable<ISettingsAware>>();

‎src/ProtonVPN.App/Core/Ioc/AppModule.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ protected override void Load(ContainerBuilder builder)
256256
builder.RegisterType<InsecureNetworkNotification>().AsImplementedInterfaces().AsSelf().SingleInstance();
257257
builder.Register(c => new Language(
258258
c.Resolve<IAppSettings>(),
259+
c.Resolve<ILogger>(),
259260
c.Resolve<ILanguageProvider>(),
260261
c.Resolve<IConfiguration>().DefaultLocale)) // REMOVE THIS CUSTOM REGISTRATION
261262
.AsSelf()

‎src/ProtonVPN.App/Core/Language.cs‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,54 @@
2323
using ProtonVPN.Common.Cli;
2424
using ProtonVPN.Core.Auth;
2525
using ProtonVPN.Core.Settings;
26+
using ProtonVPN.Logging.Contracts;
27+
using ProtonVPN.Logging.Contracts.Events.AppLogs;
2628
using ProtonVPN.Translations;
2729

2830
namespace ProtonVPN.Core
2931
{
3032
public class Language : ILoggedInAware
3133
{
3234
private readonly IAppSettings _appSettings;
35+
private readonly ILogger _logger;
3336
private readonly ILanguageProvider _languageProvider;
3437
private readonly string _defaultLocale;
3538
private string _startupLanguage;
3639

37-
public Language(IAppSettings appSettings, ILanguageProvider languageProvider, string defaultLocale)
40+
public Language(IAppSettings appSettings, ILogger logger, ILanguageProvider languageProvider, string defaultLocale)
3841
{
39-
_defaultLocale = defaultLocale;
40-
_languageProvider = languageProvider;
4142
_appSettings = appSettings;
43+
_logger = logger;
44+
_languageProvider = languageProvider;
45+
_defaultLocale = defaultLocale;
4246
}
4347

4448
public void Initialize(string[] args)
4549
{
46-
string lang = GetCommandLineLanguage(args);
47-
if (_languageProvider.GetAll().Contains(lang))
50+
string language = GetCommandLineLanguage(args);
51+
52+
if (_languageProvider.GetAll().Contains(language))
4853
{
49-
_startupLanguage = lang;
54+
_startupLanguage = language;
5055
}
5156
else
5257
{
53-
lang = GetStartupLanguage();
58+
language = GetStartupLanguage();
5459
}
5560

56-
TranslationSource.Instance.CurrentCulture = new CultureInfo(lang);
61+
Set(language);
62+
}
63+
64+
public void Set(string language)
65+
{
66+
if (_languageProvider.GetAll().Contains(language))
67+
{
68+
TranslationSource.Instance.CurrentCulture = new CultureInfo(language);
69+
}
70+
else
71+
{
72+
_logger.Warn<AppLog>($"Cannot set language '{language}'.");
73+
}
5774
}
5875

5976
public void OnUserLoggedIn()

‎src/ProtonVPN.App/Vpn/Connectors/ProfileConnector.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,7 @@ private List<VpnProtocol> GenerateSmartProtocolList()
382382
SetProtocolBucket(VpnProtocol.OpenVpnUdp, preferredProtocols, fallbackProtocols);
383383
SetProtocolBucket(VpnProtocol.OpenVpnTcp, preferredProtocols, fallbackProtocols);
384384

385-
preferredProtocols.AddRange(fallbackProtocols);
386-
387-
return preferredProtocols;
385+
return preferredProtocols.Count > 0 ? preferredProtocols : fallbackProtocols;
388386
}
389387

390388
private void SetProtocolBucket(VpnProtocol protocol, List<VpnProtocol> preferredProtocols,

‎src/ProtonVPN.Translations/Properties/.locale-state.metadata‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"project": "windows-vpn",
3-
"locale": "da78a1a220dcb37eb510e08323cd3097b931f049"
3+
"locale": "b07d1f171f537d161781c5bbae8921d8619664d9"
44
}

‎src/ProtonVPN.Translations/Properties/Resources.fi-FI.resx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,7 @@ Ota se käyttöön seuraamalla &lt;Hyperlink Command="{Binding OpenArticleComman
17531753
<value>Selvä</value>
17541754
</data>
17551755
<data name="Dialogs_SplitTunnelWarning_msg">
1756-
<value>Tappokytkin on poistettava käytöstä jaetun tunneloinnin kunnollista toimintaa varten.</value>
1756+
<value>Tappokytkin on poistettava käytöstä, jotta jaettu tunnelointi toimii oikein.</value>
17571757
</data>
17581758
<data name="Dialogs_SubscriptionExpired_ListOption1_One">
17591759
<value>Satoja palvelimia {0} maassa</value>
@@ -1810,7 +1810,7 @@ Ota se käyttöön seuraamalla &lt;Hyperlink Command="{Binding OpenArticleComman
18101810
<comment>The text displayed in troubleshooting modal window</comment>
18111811
</data>
18121812
<data name="Dialogs_Troubleshooting_msg_Firewall">
1813-
<value>&lt;Bold&gt;Välityspalvelimen/palomuurin aiheuttama häiriö&lt;/Bold&gt; - Poista välityspalvelimet ja/tai palomuurit käytöstä tai ole yhteydessä verkkosi ylläpitoon.</value>
1813+
<value>&lt;Bold&gt;Välityspalvelimen/palomuurin häiriö&lt;/Bold&gt; - Poista välityspalvelimet ja/tai palomuurit käytöstä, tai ole yhteydessä verkkosi ylläpitoon.</value>
18141814
<comment>The text displayed in troubleshooting modal window</comment>
18151815
</data>
18161816
<data name="Dialogs_Troubleshooting_msg_GovBlock">
@@ -2648,7 +2648,7 @@ Ota se käyttöön seuraamalla &lt;Hyperlink Command="{Binding OpenArticleComman
26482648
<comment>The label for application list in Settings window Advanced tab Split Tunneling section</comment>
26492649
</data>
26502650
<data name="Settings_Advanced_SplitTunnel_lbl_Exclude">
2651-
<value>Rajoita sovelluksia/IP-osoitteita VPN-tunnelin ulkopuolelle</value>
2651+
<value>Sulje sovelluksia/IP-osoitteita VPN-tunnelin ulkopuolelle</value>
26522652
<comment>The label of Split Tunnel mode in Split Tunneling section of Advanced tab of Settings window</comment>
26532653
</data>
26542654
<data name="Settings_Advanced_SplitTunnel_lbl_Include">
@@ -2746,7 +2746,7 @@ Ota se käyttöön seuraamalla &lt;Hyperlink Command="{Binding OpenArticleComman
27462746
<comment>The label for Split Tunneling toggle switch in Advanced tab of Settings window</comment>
27472747
</data>
27482748
<data name="Settings_Advanced_lbl_SplitTunnel_Info">
2749-
<value>Rajoita sovelluksia tai IP-osoitteita VPN-tietoliikenteen ulkopuolelle tai sisällytä vain tiettyjä sovelluksia. Ei voi olla käytössä samanaikaisesti tappokytkimen kanssa.</value>
2749+
<value>Sulje sovelluksia tai IP-osoitteita VPN-tietoliikenteen ulkopuolelle tai sisällytä vain tietyt sovellukset. Ei voi olla käytössä samanaikaisesti tappokytkimen kanssa.</value>
27502750
<comment>The description of Split Tunneling setting displayed in the tooltip of ( i ) image next to the label for Split Tunneling toggle switch in Advanced tab of Settings window</comment>
27512751
</data>
27522752
<data name="Settings_Advanced_lbl_btn_LearnMore">

0 commit comments

Comments
 (0)