From 5e6f2e459925f2a71ab629446db7d76e4da613aa Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 11 Mar 2020 14:25:09 +0100 Subject: [PATCH] Localize service error messages --- app/src/main/java/eu/faircode/email/EmailService.java | 4 ++-- app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java index 20f219e11c..68673d47ff 100644 --- a/app/src/main/java/eu/faircode/email/EmailService.java +++ b/app/src/main/java/eu/faircode/email/EmailService.java @@ -340,7 +340,7 @@ public class EmailService implements AutoCloseable { } catch (MailConnectException ex) { if (ConnectionHelper.vpnActive(context)) { MailConnectException mex = new MailConnectException(new SocketConnectException( - "The might be caused by the VPN in use", + context.getString(R.string.title_service_vpn), new Exception(), ex.getHost(), ex.getPort(), @@ -351,7 +351,7 @@ public class EmailService implements AutoCloseable { throw ex; } catch (MessagingException ex) { if (port == 995 && !("pop3".equals(protocol) || "pop3s".equals(protocol))) - throw new MessagingException("Please double check the port number", ex); + throw new MessagingException(context.getString(R.string.title_service_port), ex); else throw ex; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7ec1c4e40e..0b804f1f62 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -589,6 +589,8 @@ OAuth is not supported Review Long press for options, like copy to create alias identities + This might be caused by the VPN that is being used + Please double check the port number Browse messages on the server Mark messages read on expanding