diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java index 0b0d8fde49..1b72833dd2 100644 --- a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java +++ b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java @@ -110,7 +110,7 @@ private boolean delete(Media media, String reason) { mwApi.appendEdit(editToken, logPageString + "\n", "Commons:Deletion_requests/" + date, summary); mwApi.appendEdit(editToken, userPageString + "\n", - "User_Talk:" + sessionManager.getCurrentAccount().name, summary); + "User_Talk:" + media.getCreator(), summary); } catch (Exception e) { Timber.e(e); return false; diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 92c0a4b018..18349f5259 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -44,6 +44,7 @@ import fr.free.nrw.commons.MediaDataExtractor; import fr.free.nrw.commons.R; import fr.free.nrw.commons.Utils; +import fr.free.nrw.commons.auth.AccountUtil; import fr.free.nrw.commons.category.CategoryDetailsActivity; import fr.free.nrw.commons.contributions.ContributionsFragment; import fr.free.nrw.commons.delete.DeleteHelper; @@ -364,6 +365,7 @@ public void onCopyWikicodeClicked(){ @OnClick(R.id.nominateDeletion) public void onDeleteButtonClicked(){ + if(AccountUtil.getUserName(getContext()).equals(media.getCreator())){ final ArrayAdapter languageAdapter = new ArrayAdapter<>(getActivity(), R.layout.simple_spinner_dropdown_list, reasonList); final Spinner spinner = new Spinner(getActivity()); @@ -381,19 +383,19 @@ public void onDeleteButtonClicked(){ if(isDeleted) { dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); } + } //Reviewer correct me if i have misunderstood something over here //But how does this if (delete.getVisibility() == View.VISIBLE) { // enableDeleteButton(true); makes sense ? + else{ AlertDialog.Builder alert = new AlertDialog.Builder(getActivity()); - alert.setMessage("Why should this fileckathon-2018 be deleted?"); + alert.setMessage(getString(R.string.dialog_box_text_nomination,media.getDisplayTitle())); final EditText input = new EditText(getActivity()); alert.setView(input); input.requestFocus(); alert.setPositiveButton(R.string.ok, (dialog1, whichButton) -> { String reason = input.getText().toString(); - - deleteHelper.makeDeletion(getContext(), media, reason); - enableDeleteButton(false); + onDeleteClickeddialogtext(reason); }); alert.setNegativeButton(R.string.cancel, (dialog12, whichButton) -> { }); @@ -424,6 +426,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) { d.show(); d.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); } + } @SuppressLint("CheckResult") private void onDeleteClicked(Spinner spinner) { @@ -442,6 +445,22 @@ private void onDeleteClicked(Spinner spinner) { } + @SuppressLint("CheckResult") + private void onDeleteClickeddialogtext(String reason) { + Single resultSingletext = reasonBuilder.getReason(media, reason) + .flatMap(reasonString -> deleteHelper.makeDeletion(getContext(), media, reason)); + compositeDisposable.add(resultSingletext + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(s -> { + if (getActivity() != null) { + isDeleted = true; + enableDeleteButton(false); + } + })); + + } + @OnClick(R.id.seeMore) public void onSeeMoreClicked(){ if (nominatedForDeletion.getVisibility() == VISIBLE && getActivity() != null) { diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java index 85076cb699..8f5b4213f8 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java @@ -410,7 +410,7 @@ public String getWikidataCsrfToken() throws IOException { */ @Nullable @Override - public String wikidatCreateClaim(String entityId, String property, String snaktype, String value) throws IOException { + public String wikidataCreateClaim(String entityId, String property, String snaktype, String value) throws IOException { Timber.d("Filename is %s", value); CustomApiResult result = wikidataApi.action("wbcreateclaim") .param("entity", entityId) diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java b/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java index 2d39740d5b..e38c4dc0f0 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java @@ -59,7 +59,7 @@ Single uploadFileFinalize(String filename, String filekey, String appendEdit(String editToken, String processedPageContent, String filename, String summary) throws IOException; @Nullable - String wikidatCreateClaim(String entityId, String property, String snaktype, String value) throws IOException; + String wikidataCreateClaim(String entityId, String property, String snaktype, String value) throws IOException; @Nullable boolean addWikidataEditTag(String revisionId) throws IOException; diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java index c701c3aae2..bbc6cd09ec 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java @@ -535,8 +535,8 @@ private void setupMapView(Bundle savedInstanceState) { .compassGravity(Gravity.BOTTOM | Gravity.LEFT) .compassMargins(new int[]{12, 0, 0, 24}) .styleUrl(isDarkTheme ? Style.DARK : Style.OUTDOORS) - .logoEnabled(false) - .attributionEnabled(false) + .logoEnabled(true) + .attributionEnabled(true) .camera(new CameraPosition.Builder() .target(new LatLng(curLatLng.getLatitude(), curLatLng.getLongitude())) .zoom(ZOOM_LEVEL) diff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java index 4b51921acf..eac1f7cde7 100644 --- a/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java +++ b/app/src/main/java/fr/free/nrw/commons/wikidata/WikidataEditService.java @@ -79,7 +79,7 @@ private void editWikidataProperty(String wikidataEntityId, String fileName) { Timber.d("Attempting to edit Wikidata property %s", wikidataEntityId); Observable.fromCallable(() -> { String propertyValue = getFileName(fileName); - return mediaWikiApi.wikidatCreateClaim(wikidataEntityId, "P18", "value", propertyValue); + return mediaWikiApi.wikidataCreateClaim(wikidataEntityId, "P18", "value", propertyValue); }) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 8185aab5b2..a1267231f3 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -179,6 +179,7 @@ طلب إذن التخزين صلاحية مطلوبة: قراءة وحدة التخزين الخارجية، لا يمكن للتطبيق الوصول إلى معرض الصور الخاص بك بدونها. صلاحية مطلوبة: اكتب وحدة التخزين الخارجية، لا يمكن للتطبيق الوصول إلى معرض الصور/الكاميرا الخاصة بك بدونها. + جارٍ طلب إذن الموقع صلاحية اختيارية: احصل على الموقع الحالي لاقتراحات التصنيفات موافق الأماكن القريبة diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5371fbaa8f..86a140485b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -215,6 +215,7 @@ Персонализираното авторско име, което ще се използва вместо потребителското ви име при качване Известия (архивирани) Списък + Изпращане Америка Европа Африка diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b89520ef58..95d2f7ccc7 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -15,6 +15,7 @@ Udseende Generelt Tilbagemelding + Privatliv Sted Commons @@ -370,5 +371,8 @@ Der opstod en fejl under udvælgelse af billeder Vent venligst… Spring over dette billede + Ophavsret + Kameramodel + Serienumre Del app via... diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 0000912742..47760ee8ae 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -339,6 +339,7 @@ آیا این تصویر برای بارگذاری مناسب است؟ پرسش نتیجه + شما %1$s پاسخ درست دادید. آفرین! یکی از دو گزینه را انتخاب کنید تا به سوال پاسخ دهید جلسه ورود به سیستم منقضی شد، لطفا دوباره وارد سیستم شوید. کویز خود را با دوستان خود به اشتراک بگذارید. @@ -383,6 +384,11 @@ بعدی قبلی ارسال + پرونده‌ای با نام %1$s وجود دارد. آیا اطمینان دارید که می‌خواهید ادامه دهید؟ + + %1$d بارگذاری + %1$d بارگذاری + نشانک‌ها نشانک‌ها تصویرها @@ -396,6 +402,7 @@ فهمیدم که این برای حریم خصوصی من بد است. من تغییر عقیده دادم، نمی‌خواهم دیگر برای همه قابل‌مشاهده باشد. با پوزش، این تصویر برای یک دانشنامه مناسب نیست + بارگذاری‌شده توسط خودم در %1$s؛ استفاده‌شده در %2$d مقاله. به کامانز خوش آمدید!\n\nاولین فایلتان را با فشردن کلید اضافه بارگذاری کنید. در سراسر جهان آمریکا @@ -423,6 +430,7 @@ به کاربر در صفحه بحثش خبر بده مطمئن نیستم ارسال تشکر: موفق + تشکر با موفقیت برای %1$s فرستاده شد تلاش برای فرستادن تشکر شکست خورد %1$s ارسال تشکر: ناموفق ارسال تشکر diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d191a98ad1..80f92abde4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -189,6 +189,7 @@ Demande d\'autorisation d\'accès au stockage Autorisation nécessaire : Lire un stockage externe. L’application ne peut pas accéder à votre galerie sans cela. Permission obligatoire : Écriture sur stockage externe. L’application ne peut pas accéder à votre appareil photo/galerie sans cela. + Demande d\'autorisation d\'accès au stockage Autorisation facultative : Obtenir l’emplacement actuel pour des suggestions de catégorie OK Endroits à proximité diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1228946f35..f37cbb58da 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -21,6 +21,7 @@ Aspetto Generale Commenti + Privacy Posizione Commons @@ -470,6 +471,9 @@ Clicca per riusare il titolo e la descrizione dell\'immagine precedente e adattarli all\'immagine attuale. SALTA QUESTA IMMAGINE Autore + Modello fotocamera + Numeri seriali + Software Condividi applicazione tramite... Informazioni sull\'immagine diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9eaf98ffa9..664d1ff729 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -176,6 +176,7 @@ 기억 장치 권한 요청 중 권한 필요: 외부 저장소 읽기. 이것이 없으면 앱은 갤러리에 접근할 수 없습니다. 권한 필요: 외부 저장소 쓰기. 이것이 없으면 앱은 카메라에 접근할 수 없습니다. + 위치 권한 요청 중 선택적 권한: 분류 추천을 위해 현재 위치 정보를 가져옵니다. 확인 근처의 장소 @@ -458,6 +459,7 @@ 저작권 위치 카메라 모델 + 렌즈 모델 일련 번호 소프트웨어 앱 공유... diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml index 1a7adaaa68..dc1a1c2b2a 100644 --- a/app/src/main/res/values-lb/strings.xml +++ b/app/src/main/res/values-lb/strings.xml @@ -338,4 +338,9 @@ Sicht Biller eraus fir eropzelueden Waart w.e.g. ... DËST BILD IWWERWSPRANGEN + Auteur + Copyright + Plaz + Seriennummeren + Software diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 27cfbeda88..852f8ba137 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -169,6 +169,7 @@ Се бара дозвола за складирање Потребна дозвола: Треба да се прочита од надворешен склад. Прилогот без ова нема пристап до вашата галерија. Потребна дозвола: Треба да се запише на надворешен склад. Прилогот без ова нема пристап до вашата камера/галерија. + Се бара дозвола за утврдување на местоположбата Дозвола по желба: Утврдување на тековната местоположба за предлагање категории ОК Околни места diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index f6e5cef4ad..465a91384b 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -9,6 +9,7 @@ ပုံပန်းသွင်ပြင် အထွေထွေ အကြံပေးရန် + ကိုယ်ရေးမူဝါဒ နေရာ ကွန်မွန်းစ် @@ -129,6 +130,7 @@ ဆွေးနွေးချက် မရှိပါ အမည်မသိရသော လိုင်စင် ပြန်လည်ဆန်းသစ်ရန် + တည်နေရာ ခွင့်ပြုချက် တောင်းဆိုနေသည် အိုကေ အနီးအနား နေရာများ အနီးအနား နေရာများ မတွေ့ပါ @@ -281,4 +283,8 @@ ပြီးပြီ မသေချာပါ ကျေးဇူးပြု၍ ခဏစောင့်ပါ... + မူပိုင်ခွင့် + တည်နေရာ + ကင်မရာ မော်ဒယ် + ဆော့ဝဲလ် diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0df25a964c..2eba4e3869 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -181,6 +181,7 @@ Solicitando permissão de armazenamento Permissão necessária: leia o armazenamento externo. App não pode acessar sua galeria sem isso. Permissão necessária: escreva o armazenamento externo. App não pode acessar sua câmera/galeria sem isso. + Autorização para identificar localização Permissão opcional: Obter a localização atual de sugestões de categoria OK Lugares próximos diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 477d9d333c..96958bcece 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -23,6 +23,7 @@ Aparência Geral Comentários + Privacidade Localização Commons @@ -181,6 +182,7 @@ A pedir permissão de armazenamento Permissão necessária: Ler a armazenagem externa. A aplicação não pode aceder à sua galeria sem isto. Permissão necessária: Escrever na armazenagem externa. A aplicação não pode aceder à sua câmara/galeria sem isto. + Autorização para identificar localização Permissão opcional: Obter a localização atual para sugestões de categoria OK Locais Próximos @@ -520,6 +522,15 @@ Exemplos de imagens que não devem ser carregadas SALTAR ESTA IMAGEM O descarregamento falhou! Não podemos descarregar o ficheiro sem permissão de armazenagem externa. + Gerir etiquetas EXIF + Selecionar as etiquetas EXIF a manter nos carregamentos + Autor + Direitos de autor + Localização + Modelo da câmara + Modelo da lente + Números de série + \'\'Software\'\' Carregar fotografias na wiki Wikimedia Commons, do seu telemóvel Descarregar a aplicação Commons: %1$s Partilhar aplicação por... Informação da imagem diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml index e2cec15dcf..cbfe2eab63 100644 --- a/app/src/main/res/values-qq/strings.xml +++ b/app/src/main/res/values-qq/strings.xml @@ -156,4 +156,6 @@ {{Identical|Submit}} \"Send log file\" is {{msg-wm|Commons-android-strings-send log file}}. {{Identical|Done}} + {{Identical|Author}} + {{Identical|Location}} diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4ec460d304..bed086c67d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -187,6 +187,7 @@ Запрос разрешения по использованию внешнего носителя Требуемые разрешения: чтение с внешнего носителя. Приложение не сможет получить доступ к вашей галерее без этого разрешения. Требуемые разрешения: запись на внешнее хранилище. Приложение не сможет получить доступ к галерее/камере без этого разрешения. + Запрос разрешения по определение местоположения Необязательное разрешение: получение текущего местоположения для предложения категорий OK Места поблизости diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index fe80d25209..f290a3e1f3 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -174,6 +174,7 @@ Begär lagringsbehörighet Nödvändig behörighet: Läs extern lagring. Appen kan inte komma åt ditt galleri utan detta. Nödvändig behörighet: Skriv till extern lagring. Appen kan inte komma åt din kamera/galleri utan detta. + Begär platsbehörighet Valfri behörighet: Hämta aktuell plats för kategoriförslag OK Platser i närheten diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9bf5418612..0c6ba28f06 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -557,4 +557,5 @@ Upload your first media by tapping on the add button. No Categories found Cancelled Upload There is no data for previous image\'s title or description + Why should %1$s be deleted?