From bed675fb0dc784644641227852b1e3120a492edb Mon Sep 17 00:00:00 2001 From: pppscn <35696959@qq.com> Date: Sun, 6 Mar 2022 15:38:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=BE=AE=E8=B0=83=EF=BC=88=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E6=8F=90=E7=A4=BA=E7=AD=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idormy/sms/forwarder/RuleActivity.java | 2 +- .../idormy/sms/forwarder/SenderActivity.java | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java index 6f5d7c03..4b266bd2 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/RuleActivity.java @@ -257,7 +257,7 @@ public class RuleActivity extends AppCompatActivity { Button buttonRuleOk = view1.findViewById(R.id.buttonRuleOk); Button buttonRuleDel = view1.findViewById(R.id.buttonRuleDel); - buttonRuleDel.setText(ruleModel != null ? "删除" : "取消"); + buttonRuleDel.setText(ruleModel != null ? R.string.del : R.string.cancel); Button buttonRuleTest = view1.findViewById(R.id.buttonRuleTest); alertDialog71 .setTitle(getDialogTitle(currentType)) diff --git a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java index 1bbc2560..b0627563 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java @@ -442,7 +442,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setdingdingtitle) @@ -576,7 +576,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setemailtitle) @@ -781,7 +781,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setbarktitle) @@ -993,7 +993,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setwebnotifytitle) @@ -1101,7 +1101,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setqywxgrouprobottitle) @@ -1220,7 +1220,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setqywxapptitle) @@ -1338,7 +1338,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setserverchantitle) @@ -1491,7 +1491,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.settelegramtitle) @@ -1664,7 +1664,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setsmstitle) @@ -1795,7 +1795,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setfeishutitle) @@ -1944,7 +1944,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setpushplustitle) @@ -2098,7 +2098,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonOk = view1.findViewById(R.id.buttonOk); Button buttonDel = view1.findViewById(R.id.buttonDel); - buttonDel.setText(senderModel != null ? "删除" : "取消"); + buttonDel.setText(senderModel != null ? R.string.del : R.string.cancel); Button buttonTest = view1.findViewById(R.id.buttonTest); alertDialog71 .setTitle(R.string.setgotifytitle)