From 1fad28dd6a0bf2189333c1b0aaf6864f518c8d4c Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 19 Nov 2020 19:10:14 +0100 Subject: [PATCH] Translatable rule errors --- app/src/main/java/eu/faircode/email/EntityRule.java | 8 ++++---- app/src/main/res/values/strings.xml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java index 43a62f5540..d17f86ce4b 100644 --- a/app/src/main/java/eu/faircode/email/EntityRule.java +++ b/app/src/main/java/eu/faircode/email/EntityRule.java @@ -371,12 +371,12 @@ public class EntityRule { case TYPE_KEYWORD: String keyword = jargs.getString("keyword"); if (TextUtils.isEmpty(keyword)) - throw new IllegalArgumentException("Keyword missing"); + throw new IllegalArgumentException(context.getString(R.string.title_rule_keyword_missing)); case TYPE_MOVE: case TYPE_COPY: long target = jargs.optLong("target", -1); if (target < 0) - throw new IllegalArgumentException("Folder missing"); + throw new IllegalArgumentException(context.getString(R.string.title_rule_folder_missing)); EntityFolder folder = db.folder().getFolder(target); if (folder == null) throw new IllegalArgumentException("Folder not found"); @@ -384,14 +384,14 @@ public class EntityRule { case TYPE_ANSWER: long iid = jargs.optLong("identity", -1); if (iid < 0) - throw new IllegalArgumentException("Identity missing"); + throw new IllegalArgumentException(context.getString(R.string.title_rule_identity_missing)); EntityIdentity identity = db.identity().getIdentity(iid); if (identity == null) throw new IllegalArgumentException("Identity not found"); long aid = jargs.optLong("answer", -1); if (aid < 0) - throw new IllegalArgumentException("Answer missing"); + throw new IllegalArgumentException(context.getString(R.string.title_rule_answer_missing)); EntityAnswer answer = db.answer().getAnswer(aid); if (answer == null) throw new IllegalArgumentException("Answer not found"); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 757e13bc06..212572e784 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1194,6 +1194,10 @@ Only one reply will be sent for any conversation, to avoid reply loops Rule name missing Condition missing + Folder missing + Identity missing + Template missing + Keyword missing This will send the intent \'%1$s\' with the extras \'%2$s\' Execute now