Skip to content

Commit 95f272a

Browse files
ashishkumar468maskaravivek
ashishkumar468
authored and
maskaravivek
committed
merge conflict with strings (#3016)
1 parent ee9baf6 commit 95f272a

File tree

22 files changed

+79
-10
lines changed

22 files changed

+79
-10
lines changed

‎app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private boolean delete(Media media, String reason) {
110110
mwApi.appendEdit(editToken, logPageString + "\n",
111111
"Commons:Deletion_requests/" + date, summary);
112112
mwApi.appendEdit(editToken, userPageString + "\n",
113-
"User_Talk:" + sessionManager.getCurrentAccount().name, summary);
113+
"User_Talk:" + media.getCreator(), summary);
114114
} catch (Exception e) {
115115
Timber.e(e);
116116
return false;

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

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import fr.free.nrw.commons.MediaDataExtractor;
4545
import fr.free.nrw.commons.R;
4646
import fr.free.nrw.commons.Utils;
47+
import fr.free.nrw.commons.auth.AccountUtil;
4748
import fr.free.nrw.commons.category.CategoryDetailsActivity;
4849
import fr.free.nrw.commons.contributions.ContributionsFragment;
4950
import fr.free.nrw.commons.delete.DeleteHelper;
@@ -364,6 +365,7 @@ public void onCopyWikicodeClicked(){
364365

365366
@OnClick(R.id.nominateDeletion)
366367
public void onDeleteButtonClicked(){
368+
if(AccountUtil.getUserName(getContext()).equals(media.getCreator())){
367369
final ArrayAdapter<String> languageAdapter = new ArrayAdapter<>(getActivity(),
368370
R.layout.simple_spinner_dropdown_list, reasonList);
369371
final Spinner spinner = new Spinner(getActivity());
@@ -381,19 +383,19 @@ public void onDeleteButtonClicked(){
381383
if(isDeleted) {
382384
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
383385
}
386+
}
384387
//Reviewer correct me if i have misunderstood something over here
385388
//But how does this if (delete.getVisibility() == View.VISIBLE) {
386389
// enableDeleteButton(true); makes sense ?
390+
else{
387391
AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
388-
alert.setMessage("Why should this fileckathon-2018 be deleted?");
392+
alert.setMessage(getString(R.string.dialog_box_text_nomination,media.getDisplayTitle()));
389393
final EditText input = new EditText(getActivity());
390394
alert.setView(input);
391395
input.requestFocus();
392396
alert.setPositiveButton(R.string.ok, (dialog1, whichButton) -> {
393397
String reason = input.getText().toString();
394-
395-
deleteHelper.makeDeletion(getContext(), media, reason);
396-
enableDeleteButton(false);
398+
onDeleteClickeddialogtext(reason);
397399
});
398400
alert.setNegativeButton(R.string.cancel, (dialog12, whichButton) -> {
399401
});
@@ -424,6 +426,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
424426
d.show();
425427
d.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
426428
}
429+
}
427430

428431
@SuppressLint("CheckResult")
429432
private void onDeleteClicked(Spinner spinner) {
@@ -442,6 +445,22 @@ private void onDeleteClicked(Spinner spinner) {
442445

443446
}
444447

448+
@SuppressLint("CheckResult")
449+
private void onDeleteClickeddialogtext(String reason) {
450+
Single<Boolean> resultSingletext = reasonBuilder.getReason(media, reason)
451+
.flatMap(reasonString -> deleteHelper.makeDeletion(getContext(), media, reason));
452+
compositeDisposable.add(resultSingletext
453+
.subscribeOn(Schedulers.io())
454+
.observeOn(AndroidSchedulers.mainThread())
455+
.subscribe(s -> {
456+
if (getActivity() != null) {
457+
isDeleted = true;
458+
enableDeleteButton(false);
459+
}
460+
}));
461+
462+
}
463+
445464
@OnClick(R.id.seeMore)
446465
public void onSeeMoreClicked(){
447466
if (nominatedForDeletion.getVisibility() == VISIBLE && getActivity() != null) {

‎app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ public String getWikidataCsrfToken() throws IOException {
410410
*/
411411
@Nullable
412412
@Override
413-
public String wikidatCreateClaim(String entityId, String property, String snaktype, String value) throws IOException {
413+
public String wikidataCreateClaim(String entityId, String property, String snaktype, String value) throws IOException {
414414
Timber.d("Filename is %s", value);
415415
CustomApiResult result = wikidataApi.action("wbcreateclaim")
416416
.param("entity", entityId)

‎app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Single<UploadResult> uploadFileFinalize(String filename, String filekey,
5959
String appendEdit(String editToken, String processedPageContent, String filename, String summary) throws IOException;
6060

6161
@Nullable
62-
String wikidatCreateClaim(String entityId, String property, String snaktype, String value) throws IOException;
62+
String wikidataCreateClaim(String entityId, String property, String snaktype, String value) throws IOException;
6363

6464
@Nullable
6565
boolean addWikidataEditTag(String revisionId) throws IOException;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ private void setupMapView(Bundle savedInstanceState) {
535535
.compassGravity(Gravity.BOTTOM | Gravity.LEFT)
536536
.compassMargins(new int[]{12, 0, 0, 24})
537537
.styleUrl(isDarkTheme ? Style.DARK : Style.OUTDOORS)
538-
.logoEnabled(false)
539-
.attributionEnabled(false)
538+
.logoEnabled(true)
539+
.attributionEnabled(true)
540540
.camera(new CameraPosition.Builder()
541541
.target(new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude()))
542542
.zoom(ZOOM_LEVEL)

‎app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private void editWikidataProperty(String wikidataEntityId, String fileName) {
7979
Timber.d("Attempting to edit Wikidata property %s", wikidataEntityId);
8080
Observable.fromCallable(() -> {
8181
String propertyValue = getFileName(fileName);
82-
return mediaWikiApi.wikidatCreateClaim(wikidataEntityId, "P18", "value", propertyValue);
82+
return mediaWikiApi.wikidataCreateClaim(wikidataEntityId, "P18", "value", propertyValue);
8383
})
8484
.subscribeOn(Schedulers.io())
8585
.observeOn(AndroidSchedulers.mainThread())

‎app/src/main/res/values-ar/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@
179179
<string name="storage_permission_title">طلب إذن التخزين</string>
180180
<string name="read_storage_permission_rationale">صلاحية مطلوبة: قراءة وحدة التخزين الخارجية، لا يمكن للتطبيق الوصول إلى معرض الصور الخاص بك بدونها.</string>
181181
<string name="write_storage_permission_rationale">صلاحية مطلوبة: اكتب وحدة التخزين الخارجية، لا يمكن للتطبيق الوصول إلى معرض الصور/الكاميرا الخاصة بك بدونها.</string>
182+
<string name="location_permission_title">جارٍ طلب إذن الموقع</string>
182183
<string name="location_permission_rationale">صلاحية اختيارية: احصل على الموقع الحالي لاقتراحات التصنيفات</string>
183184
<string name="ok">موافق</string>
184185
<string name="title_activity_nearby">الأماكن القريبة</string>

‎app/src/main/res/values-bg/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@
215215
<string name="preference_author_name_summary">Персонализираното авторско име, което ще се използва вместо потребителското ви име при качване</string>
216216
<string name="archived_notifications">Известия (архивирани)</string>
217217
<string name="list_sheet">Списък</string>
218+
<string name="submit">Изпращане</string>
218219
<string name="desc_language_America">Америка</string>
219220
<string name="desc_language_Europe">Европа</string>
220221
<string name="desc_language_Africa">Африка</string>

‎app/src/main/res/values-da/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<string name="preference_category_appearance">Udseende</string>
1616
<string name="preference_category_general">Generelt</string>
1717
<string name="preference_category_feedback">Tilbagemelding</string>
18+
<string name="preference_category_privacy">Privatliv</string>
1819
<string name="preference_category_location">Sted</string>
1920
<string name="app_name">Commons</string>
2021
<string name="bullet">•</string>
@@ -370,5 +371,8 @@
370371
<string name="error_occurred_in_picking_images">Der opstod en fejl under udvælgelse af billeder</string>
371372
<string name="please_wait">Vent venligst…</string>
372373
<string name="skip_image">Spring over dette billede</string>
374+
<string name="exif_tag_name_copyright">Ophavsret</string>
375+
<string name="exif_tag_name_cameraModel">Kameramodel</string>
376+
<string name="exif_tag_name_serialNumbers">Serienumre</string>
373377
<string name="share_via">Del app via...</string>
374378
</resources>

‎app/src/main/res/values-fa/strings.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@
339339
<string name="quiz_question_string">آیا این تصویر برای بارگذاری مناسب است؟</string>
340340
<string name="question">پرسش</string>
341341
<string name="result">نتیجه</string>
342+
<string name="congratulatory_message_quiz">شما %1$s پاسخ درست دادید. آفرین!</string>
342343
<string name="warning_for_no_answer">یکی از دو گزینه را انتخاب کنید تا به سوال پاسخ دهید</string>
343344
<string name="user_not_logged_in">جلسه ورود به سیستم منقضی شد، لطفا دوباره وارد سیستم شوید.</string>
344345
<string name="quiz_result_share_message">کویز خود را با دوستان خود به اشتراک بگذارید.</string>
@@ -383,6 +384,11 @@
383384
<string name="next">بعدی</string>
384385
<string name="previous">قبلی</string>
385386
<string name="submit">ارسال</string>
387+
<string name="upload_title_duplicate">پرونده‌ای با نام %1$s وجود دارد. آیا اطمینان دارید که می‌خواهید ادامه دهید؟</string>
388+
<plurals name="upload_count_title">
389+
<item quantity="one">%1$d بارگذاری</item>
390+
<item quantity="other">%1$d بارگذاری</item>
391+
</plurals>
386392
<string name="navigation_item_bookmarks">نشانک‌ها</string>
387393
<string name="title_activity_bookmarks">نشانک‌ها</string>
388394
<string name="title_page_bookmarks_pictures">تصویرها</string>
@@ -396,6 +402,7 @@
396402
<string name="deletion_reason_bad_for_my_privacy">فهمیدم که این برای حریم خصوصی من بد است.</string>
397403
<string name="deletion_reason_no_longer_want_public">من تغییر عقیده دادم، نمی‌خواهم دیگر برای همه قابل‌مشاهده باشد.</string>
398404
<string name="deletion_reason_not_interesting">با پوزش، این تصویر برای یک دانشنامه مناسب نیست</string>
405+
<string name="uploaded_by_myself">بارگذاری‌شده توسط خودم در %1$s؛ استفاده‌شده در %2$d مقاله.</string>
399406
<string name="no_uploads">به کامانز خوش آمدید!\n\nاولین فایلتان را با فشردن کلید اضافه بارگذاری کنید.</string>
400407
<string name="desc_language_Worldwide">در سراسر جهان</string>
401408
<string name="desc_language_America">آمریکا</string>
@@ -423,6 +430,7 @@
423430
<string name="nominate_for_deletion_notify_user">به کاربر در صفحه بحثش خبر بده</string>
424431
<string name="notsure">مطمئن نیستم</string>
425432
<string name="send_thank_success_title">ارسال تشکر: موفق</string>
433+
<string name="send_thank_success_message">تشکر با موفقیت برای %1$s فرستاده شد</string>
426434
<string name="send_thank_failure_message">تلاش برای فرستادن تشکر شکست خورد %1$s</string>
427435
<string name="send_thank_failure_title">ارسال تشکر: ناموفق</string>
428436
<string name="send_thank_send">ارسال تشکر</string>

0 commit comments

Comments
 (0)