[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Split yes-no strings used in dialog box questions into separ...

2017-08-08 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370524 )

Change subject: Split yes-no strings used in dialog box questions into separate 
strings tags
..


Split yes-no strings used in dialog box questions into separate strings tags

Currently, the yes-no strings in the Android app are used to confirm the 
following dialog box questions:

- "This saved page may be out of date, and must be refreshed for editing to be 
enabled. Would you like to refresh the page?"
- "The page has been modified. Are you sure you want to exit without saving 
your changes?"
- "This will delete all of your browsing history, and close any currently open 
tabs. Are you sure?"
- "Are you sure you want to cancel downloading this compilation?"
- "Are you sure you want to close all tabs?"
- "Are you sure you want to clear your search history?"
- "This will delete any previously synced reading lists from remote storage. 
Proceed?"

These are the places where new tags were created for the yes-no string.

Bug: T69628
Change-Id: I620d5646a03a0744feab552a8bf3ae04c73de1b3
---
M app/src/main/java/org/wikipedia/edit/EditHandler.java
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
9 files changed, 44 insertions(+), 19 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/app/src/main/java/org/wikipedia/edit/EditHandler.java 
b/app/src/main/java/org/wikipedia/edit/EditHandler.java
index 203f456..ef0cef8 100644
--- a/app/src/main/java/org/wikipedia/edit/EditHandler.java
+++ b/app/src/main/java/org/wikipedia/edit/EditHandler.java
@@ -72,13 +72,13 @@
 new AlertDialog.Builder(fragment.getActivity())
 .setCancelable(false)
 .setMessage(R.string.edit_saved_page_refresh)
-.setPositiveButton(android.R.string.yes, new 
DialogInterface.OnClickListener() {
+
.setPositiveButton(R.string.edit_saved_page_refresh_yes, new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface 
dialogInterface, int i) {
 fragment.refreshPage();
 }
 })
-.setNegativeButton(android.R.string.no, new 
DialogInterface.OnClickListener() {
+
.setNegativeButton(R.string.edit_saved_page_refresh_no, new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface 
dialogInterface, int i) {
 dialogInterface.dismiss();
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java 
b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
index 01f2313..9e0edb1 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
@@ -718,14 +718,14 @@
 if (sectionTextModified) {
 AlertDialog.Builder alert = new AlertDialog.Builder(this);
 alert.setMessage(getString(R.string.edit_abandon_confirm));
-alert.setPositiveButton(getString(R.string.yes), new 
DialogInterface.OnClickListener() {
+
alert.setPositiveButton(getString(R.string.edit_abandon_confirm_yes), new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int id) {
 dialog.dismiss();
 finish();
 }
 });
-alert.setNegativeButton(getString(R.string.no), new 
DialogInterface.OnClickListener() {
+
alert.setNegativeButton(getString(R.string.edit_abandon_confirm_no), new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int id) {
 dialog.dismiss();
diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java 
b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
index 8d2fd26..083c83d 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -176,7 +176,7 @@
 new AlertDialog.Builder(getContext())
 .setTitle(R.string.dialog_title_clear_history)

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Split yes-no strings used in dialog box questions into separ...

2017-08-07 Thread Jcasariego (Code Review) 
Jcasariego has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370524 )

Change subject: Split yes-no strings used in dialog box questions into separate 
strings tags
..

Split yes-no strings used in dialog box questions into separate strings tags

Currently, the yes-no strings in the Android app are used to confirm the 
following dialog box questions:

- "This saved page may be out of date, and must be refreshed for editing to be 
enabled. Would you like to refresh the page?"
- "The page has been modified. Are you sure you want to exit without saving 
your changes?"
- "This will delete all of your browsing history, and close any currently open 
tabs. Are you sure?"
- "Are you sure you want to cancel downloading this compilation?"
- "Are you sure you want to close all tabs?"
- "Are you sure you want to clear your search history?"
- "This will delete any previously synced reading lists from remote storage. 
Proceed?"

These are the places where new tags were created for the yes-no string.

Bug: T69628
Change-Id: I620d5646a03a0744feab552a8bf3ae04c73de1b3
---
M app/src/main/java/org/wikipedia/edit/EditHandler.java
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
M app/src/main/java/org/wikipedia/history/HistoryFragment.java
M app/src/main/java/org/wikipedia/offline/CompilationDownloadControlView.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/java/org/wikipedia/search/RecentSearchesFragment.java
M app/src/main/java/org/wikipedia/settings/SettingsPreferenceLoader.java
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
9 files changed, 44 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/24/370524/1

diff --git a/app/src/main/java/org/wikipedia/edit/EditHandler.java 
b/app/src/main/java/org/wikipedia/edit/EditHandler.java
index 203f456..ef0cef8 100644
--- a/app/src/main/java/org/wikipedia/edit/EditHandler.java
+++ b/app/src/main/java/org/wikipedia/edit/EditHandler.java
@@ -72,13 +72,13 @@
 new AlertDialog.Builder(fragment.getActivity())
 .setCancelable(false)
 .setMessage(R.string.edit_saved_page_refresh)
-.setPositiveButton(android.R.string.yes, new 
DialogInterface.OnClickListener() {
+
.setPositiveButton(R.string.edit_saved_page_refresh_yes, new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface 
dialogInterface, int i) {
 fragment.refreshPage();
 }
 })
-.setNegativeButton(android.R.string.no, new 
DialogInterface.OnClickListener() {
+
.setNegativeButton(R.string.edit_saved_page_refresh_no, new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface 
dialogInterface, int i) {
 dialogInterface.dismiss();
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java 
b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
index 01f2313..9e0edb1 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
@@ -718,14 +718,14 @@
 if (sectionTextModified) {
 AlertDialog.Builder alert = new AlertDialog.Builder(this);
 alert.setMessage(getString(R.string.edit_abandon_confirm));
-alert.setPositiveButton(getString(R.string.yes), new 
DialogInterface.OnClickListener() {
+
alert.setPositiveButton(getString(R.string.edit_abandon_confirm_yes), new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int id) {
 dialog.dismiss();
 finish();
 }
 });
-alert.setNegativeButton(getString(R.string.no), new 
DialogInterface.OnClickListener() {
+
alert.setNegativeButton(getString(R.string.edit_abandon_confirm_no), new 
DialogInterface.OnClickListener() {
 @Override
 public void onClick(DialogInterface dialog, int id) {
 dialog.dismiss();
diff --git a/app/src/main/java/org/wikipedia/history/HistoryFragment.java 
b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
index 8d2fd26..083c83d 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryFragment.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryFragment.java
@@ -176,7 +176,7 @@
 new AlertDialog.Builder(getContext())
 .setTitle(R.string.dialog_title_clear_history)