Skip to content

Commit f6a2df6

Browse files
committed
Shifted strings to String.xml
1 parent af3cabf commit f6a2df6

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

app/src/main/java/fr/free/nrw/commons/delete/ReasonBuilder.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@ private void fetchArticleNumber() {
7171
}
7272

7373
private void appendArticlesUsed(FeedbackResponse object){
74-
reason += ". Uploaded by myself on" + prettyUploadedDate(media);
75-
reason += ",used in " + object.getArticlesUsingImages() + " articles";
74+
reason += context.getString(R.string.uploaded_by_myself).toString() + prettyUploadedDate(media);
75+
reason += context.getString(R.string.used_by).toString()
76+
+ object.getArticlesUsingImages()
77+
+ context.getString(R.string.articles).toString();
7678
Log.i("New Reason", reason);
7779
}
7880

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
171171
}
172172

173173
reasonList = new ArrayList<>();
174-
reasonList.add(getString(R.string.deletion_reason_1));
175-
reasonList.add(getString(R.string.deletion_reason_2));
176-
reasonList.add(getString(R.string.deletion_reason_3));
177-
reasonList.add(getString(R.string.deletion_reason_4));
178-
reasonList.add(getString(R.string.deletion_reason_5));
174+
reasonList.add(getString(R.string.deletion_reason_uploaded_by_mistake));
175+
reasonList.add(getString(R.string.deletion_reason_publicly_visible));
176+
reasonList.add(getString(R.string.deletion_reason_not_interesting));
177+
reasonList.add(getString(R.string.deletion_reason_no_longer_want_public));
178+
reasonList.add(getString(R.string.deletion_reason_bad_for_my_privacy));
179179

180180
categoryNames = new ArrayList<>();
181181
categoryNames.add(getString(R.string.detail_panel_cats_loading));

app/src/main/res/values/strings.xml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,13 @@
368368
<string name="log_collection_started">Log collection started. Please RESTART the app, perform action that you wish to log, and then tap \'Send log file\' again</string>
369369
<string name="no_uploads">Welcome to Commons!\n Upload your first media by touching the camera or gallery icon above.</string>
370370

371-
<string name="deletion_reason_1">I uploaded it by mistake</string>
372-
<string name="deletion_reason_2">I did not know it would be publicly visible</string>
373-
<string name="deletion_reason_3">I realized it is bad for my privacy</string>
374-
<string name="deletion_reason_4">I changed my mind, I don\'t want it to be publicly visible anymore</string>
375-
<string name="deletion_reason_5">Sorry this picture is not interesting for an encyclopedia</string>
371+
<string name="deletion_reason_uploaded_by_mistake">I uploaded it by mistake</string>
372+
<string name="deletion_reason_publicly_visible">I did not know it would be publicly visible</string>
373+
<string name="deletion_reason_bad_for_my_privacy">I realized it is bad for my privacy</string>
374+
<string name="deletion_reason_no_longer_want_public">I changed my mind, I don\'t want it to be publicly visible anymore</string>
375+
<string name="deletion_reason_not_interesting">Sorry this picture is not interesting for an encyclopedia</string>
376+
<string name="uploaded_by_myself">Uploaded by myself on</string>
377+
<string name="used_by">,used in</string>
378+
<string name="articles">articles</string>
376379

377380
</resources>

0 commit comments

Comments
 (0)