From 2548097fd01f88e85464e7207ebcfdb8ca8aed22 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 12 Jun 2015 16:54:59 -0500 Subject: [PATCH] Use built-in ok and cancel strings --- src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java | 4 ++-- src/main/res/layout/control_dialog_ok.xml | 2 +- src/main/res/layout/gtasks_login_activity.xml | 2 +- src/main/res/layout/repeat_until_dialog.xml | 4 ++-- src/main/res/values-ar/strings.xml | 2 -- src/main/res/values-bg-rBG/strings.xml | 2 -- src/main/res/values-ca/strings.xml | 2 -- src/main/res/values-cs/strings.xml | 1 - src/main/res/values-de/strings.xml | 1 - src/main/res/values-el/strings.xml | 2 -- src/main/res/values-es/strings.xml | 2 -- src/main/res/values-fr/strings.xml | 1 - src/main/res/values-it/strings.xml | 1 - src/main/res/values-iw/strings.xml | 2 -- src/main/res/values-ja/strings.xml | 1 - src/main/res/values-ko/strings.xml | 2 -- src/main/res/values-nl/strings.xml | 1 - src/main/res/values-pl/strings.xml | 1 - src/main/res/values-pt-rBR/strings.xml | 2 -- src/main/res/values-pt/strings.xml | 1 - src/main/res/values-ru/strings.xml | 2 -- src/main/res/values-sk/strings.xml | 1 - src/main/res/values-sl-rSI/strings.xml | 2 -- src/main/res/values-sv/strings.xml | 1 - src/main/res/values-tr/strings.xml | 2 -- src/main/res/values-uk/strings.xml | 2 -- src/main/res/values-zh-rCN/strings.xml | 2 -- src/main/res/values-zh-rTW/strings.xml | 2 -- src/main/res/values/strings-core.xml | 5 ----- 29 files changed, 6 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java b/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java index c389697f8..918ed874e 100644 --- a/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java +++ b/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java @@ -79,7 +79,7 @@ public class DateChangedAlerts { d.setContentView(R.layout.astrid_reminder_view); Button okButton = (Button) d.findViewById(R.id.reminder_complete); - okButton.setText(R.string.DLG_ok); + okButton.setText(android.R.string.ok); d.findViewById(R.id.reminder_snooze).setVisibility(View.GONE); d.findViewById(R.id.reminder_edit).setVisibility(View.GONE); @@ -134,7 +134,7 @@ public class DateChangedAlerts { }); } - okButton.setText(R.string.DLG_ok); + okButton.setText(android.R.string.ok); undoButton.setText(R.string.DLG_undo); int titleResource = lastTime ? R.string.repeat_rescheduling_dialog_title_last_time : R.string.repeat_rescheduling_dialog_title; diff --git a/src/main/res/layout/control_dialog_ok.xml b/src/main/res/layout/control_dialog_ok.xml index cd4b5e0ff..4333e3d4f 100644 --- a/src/main/res/layout/control_dialog_ok.xml +++ b/src/main/res/layout/control_dialog_ok.xml @@ -15,4 +15,4 @@ android:textStyle="bold" android:textColor="@android:color/black" android:layout_alignParentBottom="true" - android:text="@string/DLG_ok"/> + android:text="@android:string/ok"/> diff --git a/src/main/res/layout/gtasks_login_activity.xml b/src/main/res/layout/gtasks_login_activity.xml index 210a3bf52..dc0af93ff 100644 --- a/src/main/res/layout/gtasks_login_activity.xml +++ b/src/main/res/layout/gtasks_login_activity.xml @@ -32,7 +32,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="50dip" - android:text="@string/DLG_ok" /> + android:text="@android:string/ok" /> diff --git a/src/main/res/layout/repeat_until_dialog.xml b/src/main/res/layout/repeat_until_dialog.xml index 1f831b65f..d3409d119 100644 --- a/src/main/res/layout/repeat_until_dialog.xml +++ b/src/main/res/layout/repeat_until_dialog.xml @@ -30,13 +30,13 @@ android:layout_width="fill_parent" android:layout_height="50dip" android:layout_weight="1" - android:text="@string/DLG_ok"/> + android:text="@android:string/ok"/>