Skip to content

Commit e945d45

Browse files
dbrantmisaochan
dbrant
authored and
misaochan
committed
Work towards eliminating string literals from code. (commons-app#1861)
String literals are being used in many places in the code, instead of proper string resources which are automatically localized. This PR replaces many of the string literals with pre-packaged resources, or will add the appropriate string if necessary.
1 parent b84e22c commit e945d45

File tree

8 files changed

+23
-26
lines changed

8 files changed

+23
-26
lines changed

‎app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,12 @@ public void showAlert(Bitmap screenshot){
393393
TextView shareMessage = (TextView) view.findViewById(R.id.alert_text);
394394
shareMessage.setText(R.string.achievements_share_message);
395395
alertadd.setView(view);
396-
alertadd.setPositiveButton("Proceed", new DialogInterface.OnClickListener() {
396+
alertadd.setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() {
397397
public void onClick(DialogInterface dialog, int which) {
398398
shareScreen(screenshot);
399399
}
400400
});
401-
alertadd.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
401+
alertadd.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
402402
@Override
403403
public void onClick(DialogInterface dialog, int which) {
404404
dialog.cancel();

‎app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,10 +377,10 @@ public void showBackButtonDialog() {
377377
.setMessage("Are you sure you want to go back? The image will not "
378378
+ "have any categories saved.")
379379
.setTitle("Warning")
380-
.setPositiveButton("No", (dialog, id) -> {
380+
.setPositiveButton(android.R.string.no, (dialog, id) -> {
381381
//No need to do anything, user remains on categorization screen
382382
})
383-
.setNegativeButton("Yes", (dialog, id) -> getActivity().finish())
383+
.setNegativeButton(android.R.string.yes, (dialog, id) -> getActivity().finish())
384384
.create()
385385
.show();
386386
}
@@ -391,10 +391,10 @@ private void showConfirmationDialog() {
391391
+ "Are you sure you want to submit without selecting "
392392
+ "categories?")
393393
.setTitle("No Categories Selected")
394-
.setPositiveButton("No, go back", (dialog, id) -> {
394+
.setPositiveButton(android.R.string.no, (dialog, id) -> {
395395
//Exit menuItem so user can select their categories
396396
})
397-
.setNegativeButton("Yes, submit", (dialog, id) -> {
397+
.setNegativeButton(android.R.string.yes, (dialog, id) -> {
398398
//Proceed to submission
399399
onCategoriesSaveHandler.onCategoriesSave(getStringList(selectedCategories));
400400
})

‎app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
import android.content.Intent;
44
import android.content.SharedPreferences;
55
import android.content.pm.PackageManager;
6-
import android.net.Uri;
76
import android.os.Build;
87
import android.os.Bundle;
98
import android.support.annotation.NonNull;
109
import android.support.v4.content.ContextCompat;
1110
import android.support.v7.app.AlertDialog;
12-
import android.util.Log;
1311
import android.view.LayoutInflater;
1412
import android.view.Menu;
1513
import android.view.MenuInflater;
@@ -33,7 +31,6 @@
3331
import fr.free.nrw.commons.R;
3432
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
3533
import fr.free.nrw.commons.nearby.NearbyActivity;
36-
import fr.free.nrw.commons.utils.ContributionUtils;
3734
import timber.log.Timber;
3835

3936
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
@@ -154,11 +151,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
154151

155152
new AlertDialog.Builder(getActivity())
156153
.setMessage(getString(R.string.read_storage_permission_rationale))
157-
.setPositiveButton("OK", (dialog, which) -> {
154+
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
158155
requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 1);
159156
dialog.dismiss();
160157
})
161-
.setNegativeButton("Cancel", null)
158+
.setNegativeButton(android.R.string.cancel, null)
162159
.create()
163160
.show();
164161

@@ -196,11 +193,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
196193
// sees the explanation, try again to request the permission.
197194
new AlertDialog.Builder(getActivity())
198195
.setMessage(getString(R.string.write_storage_permission_rationale))
199-
.setPositiveButton("OK", (dialog, which) -> {
196+
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
200197
requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, 3);
201198
dialog.dismiss();
202199
})
203-
.setNegativeButton("Cancel", null)
200+
.setNegativeButton(android.R.string.cancel, null)
204201
.create()
205202
.show();
206203
} else {

‎app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
4141
recent_searches_delete_button.setOnClickListener(v -> {
4242
new AlertDialog.Builder(getContext())
4343
.setMessage(getString(R.string.delete_recent_searches_dialog))
44-
.setPositiveButton("YES", (dialog, which) -> {
44+
.setPositiveButton(android.R.string.yes, (dialog, which) -> {
4545
recentSearchesDao.deleteAll(recentSearches);
4646
Toast.makeText(getContext(),getString(R.string.search_history_deleted),Toast.LENGTH_SHORT).show();
4747
recentSearches = recentSearchesDao.recentSearches(10);
@@ -50,7 +50,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
5050
adapter.notifyDataSetChanged();
5151
dialog.dismiss();
5252
})
53-
.setNegativeButton("NO", null)
53+
.setNegativeButton(android.R.string.no, null)
5454
.create()
5555
.show();
5656
});

‎app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ void initiateGalleryUpload() {
3131
if (fragment.shouldShowRequestPermissionRationale(READ_EXTERNAL_STORAGE)) {
3232
new AlertDialog.Builder(fragment.getActivity())
3333
.setMessage(fragment.getActivity().getString(R.string.read_storage_permission_rationale))
34-
.setPositiveButton("OK", (dialog, which) -> {
34+
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
3535
Timber.d("Requesting permissions for read external storage");
3636
fragment.requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, 4);
3737
dialog.dismiss();
3838
})
39-
.setNegativeButton("Cancel", null)
39+
.setNegativeButton(android.R.string.cancel, null)
4040
.create()
4141
.show();
4242
} else {
@@ -58,11 +58,11 @@ void initiateCameraUpload() {
5858
if (fragment.shouldShowRequestPermissionRationale(WRITE_EXTERNAL_STORAGE)) {
5959
new AlertDialog.Builder(fragment.getActivity())
6060
.setMessage(fragment.getActivity().getString(R.string.write_storage_permission_rationale))
61-
.setPositiveButton("OK", (dialog, which) -> {
61+
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
6262
fragment.requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, 5);
6363
dialog.dismiss();
6464
})
65-
.setNegativeButton("Cancel", null)
65+
.setNegativeButton(android.R.string.cancel, null)
6666
.create()
6767
.show();
6868
} else {

‎app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,11 @@ private void checkLocationPermission() {
292292
// sees the explanation, try again to request the permission.
293293
new AlertDialog.Builder(this)
294294
.setMessage(getString(R.string.location_permission_rationale_nearby))
295-
.setPositiveButton("OK", (dialog, which) -> {
295+
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
296296
requestLocationPermissions();
297297
dialog.dismiss();
298298
})
299-
.setNegativeButton("Cancel", (dialog, id) -> {
299+
.setNegativeButton(android.R.string.cancel, (dialog, id) -> {
300300
showLocationPermissionDeniedErrorDialog();
301301
dialog.cancel();
302302
})
@@ -467,11 +467,11 @@ private void registerLocationUpdates() {
467467
if (locationManager.isPermissionExplanationRequired(this)) {
468468
new AlertDialog.Builder(this)
469469
.setMessage(getString(R.string.location_permission_rationale_nearby))
470-
.setPositiveButton("OK", (dialog, which) -> {
470+
.setPositiveButton(android.R.string.ok, (dialog, which) -> {
471471
requestLocationPermissions();
472472
dialog.dismiss();
473473
})
474-
.setNegativeButton("Cancel", (dialog, id) -> {
474+
.setNegativeButton(android.R.string.cancel, (dialog, id) -> {
475475
showLocationPermissionDeniedErrorDialog();
476476
dialog.cancel();
477477
})

‎app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void callQuiz() {
135135
alert.setTitle(context.getResources().getString(R.string.quiz));
136136
alert.setMessage(context.getResources().getString(R.string.quiz_alert_message,
137137
REVERT_PERCENTAGE_FOR_MESSAGE));
138-
alert.setPositiveButton("Proceed", new DialogInterface.OnClickListener() {
138+
alert.setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() {
139139
@Override
140140
public void onClick(DialogInterface dialog, int which) {
141141
int newRevetSharedPrefs = revertCount+ revertPref.getInt(REVERT_SHARED_PREFERENCE,0);

‎app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ public void showAlert(Bitmap screenshot) {
183183
TextView shareMessage = (TextView) view.findViewById(R.id.alert_text);
184184
shareMessage.setText(R.string.quiz_result_share_message);
185185
alertadd.setView(view);
186-
alertadd.setPositiveButton("Proceed", new DialogInterface.OnClickListener() {
186+
alertadd.setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() {
187187
public void onClick(DialogInterface dialog, int which) {
188188
shareScreen(screenshot);
189189
}
190190
});
191-
alertadd.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
191+
alertadd.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
192192
@Override
193193
public void onClick(DialogInterface dialog, int which) {
194194
dialog.cancel();

0 commit comments

Comments
 (0)