mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-03 10:16:45 +00:00
Code Issues Releases Wiki Activity

Translatable rule errors

Browse source
This commit is contained in:
M66B 2020-11-19 19:10:14 +01:00
parent b42d6bbb84
commit 1fad28dd6a
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/EntityRule.java
View file

@ -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");

4
app/src/main/res/values/strings.xml
View file

@ -1194,6 +1194,10 @@
<string name="title_rule_answer_remark">Only one reply will be sent for any conversation, to avoid reply loops</string>
<string name="title_rule_name_missing">Rule name missing</string>
<string name="title_rule_condition_missing">Condition missing</string>
<string name="title_rule_folder_missing">Folder missing</string>
<string name="title_rule_identity_missing">Identity missing</string>
<string name="title_rule_answer_missing">Template missing</string>
<string name="title_rule_keyword_missing">Keyword missing</string>
<string name="title_rule_automation_hint">This will send the intent \'%1$s\' with the extras \'%2$s\'</string>
<string name="title_rule_execute">Execute now</string>