From 5838483bfdb2a2ba2f52ab88bc15897422f05524 Mon Sep 17 00:00:00 2001 From: junkiattan Date: Mon, 5 Feb 2018 21:41:10 +0800 Subject: [PATCH 1/3] Resolved xml errors in string tags by inserting false formatted attribute --- app/src/main/res/values-bn/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-is/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-mk/strings.xml | 2 +- app/src/main/res/values-pms/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- build.gradle | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 545cbbf73..6af522d50 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -212,5 +212,5 @@ উইকিমিডিয়া কমন্সে স্বাগতম, %s! আপনাকে এখানে পেয়ে আমরা আনন্দিত। %s আপনার আলাপ পাতায় একটি বার্তা দিয়েছেন একটি সম্পাদনা করার জন্য আপনাকে ধন্যবাদ - %s আপনাকে %s-এ উল্লেখ করেছেন। + %s আপনাকে %s-এ উল্লেখ করেছেন। diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 5109eed55..ef7c15efa 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -178,5 +178,5 @@ COM ANAR-HI LLEGIU L’ARTICLE Gràcies per fer una modificació - %s us ha mencionat a %s. + %s us ha mencionat a %s. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0318473ff..2542f5d38 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -213,5 +213,5 @@ Willkommen auf Wikimedia Commons, %s! Wir sind froh, dass du hier bist. %s hinterließ eine Nachricht auf deiner Diskussionsseite Vielen Dank für deine Bearbeitung - %s erwähnte dich auf %s. + %s erwähnte dich auf %s. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 87713802f..665077d5e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -213,5 +213,5 @@ Καλωσήρθατε στο Wikimedia Commons, %s! Είμαστε χαρούμενοι που είστε εδώ. Ο %s άφησε ένα μήνυμα στην σελίδα συζήτησής σας Ευχαριστούμε που κάνατε μια επεξεργασία - Ο %s σας ανέφερε στο %s. + Ο %s σας ανέφερε στο %s. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b5accc246..3c5eab2a5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -213,5 +213,5 @@ ¡Te damos la bienvenida a Wikimedia Commons, %s! Qué bueno que estés aquí. %s dejó un mensaje en tu página de discusión Gracias por realizar una edición - %s te ha mencionado en %s. + %s te ha mencionado en %s. diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index ee9cd0a67..6ed2c5981 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -213,5 +213,5 @@ %s، به ویکی‌انبار خوش آمدید! خوشحالیم که اینجا هستید. %s در صفحهٔ بحث شما پیامی گذاشته‌است برای ویرایش ممنون - %s در %s به شما اشاره کرده‌است. + %s در %s به شما اشاره کرده‌است. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0666be16b..e7408e25e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -213,5 +213,5 @@ Bienvenue sur Wikimedia Commons, %s! Nous sommes heureux que vous soyez venu. %s a laissé un message sur votre page de discussion Merci de faire une modification - %s vous a mentionné sur %s . + %s vous a mentionné sur %s . diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 8e4f3cd12..96d94dec9 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -213,5 +213,5 @@ Benvido a Wikimedia Commons, %s! Alegrámonos de que estea aquí. %s deixoulle unha mensaxe na súa páxina de conversa Grazas por realizar unha edición - %s mencionouno en %s. + %s mencionouno en %s. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 288ea8f00..718121ceb 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -212,5 +212,5 @@ विकिमीडिया कॉमन्स पर आपका स्वागत है, %s! हमें हर्ष है कि आप यहाँ हैं। %s ने आपके वार्ता पृष्ठ पर सन्देश छोड़ा है सम्पादन करने के लिए धन्यवाद - %s ने %s में आपका उल्लेख किया है + %s ने %s में आपका उल्लेख किया है diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index a3e397117..f0b280f77 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -213,5 +213,5 @@ Velkomin á Wikimedia Commons, %s! Við erum ánægð með að þú skulir vera hérna. %s skildi eftir skilaboð á spjallsíðunni þinni Takk fyrir að hafa gert breytingar - %s minntist á þig á %s. + %s minntist á þig á %s. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9e24b8de4..05e462fe4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -184,5 +184,5 @@ Benvenuto in Wikimedia Commons, %s! Siamo contenti che tu sia qui. %s ti ha lasciato un messaggio nella tua pagina di discussione Grazie per aver fatto una modifica - %s ti ha menzionato su %s. + %s ti ha menzionato su %s. diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 3633e5169..e35407a63 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -213,5 +213,5 @@ Добре дојдовте на Ризницата, %s! Драго ни е што сте тука. %s ви остави порака на разговорната страница Ви благодариме за уредувањето - %s ве спомна на %s. + %s ве спомна на %s. diff --git a/app/src/main/res/values-pms/strings.xml b/app/src/main/res/values-pms/strings.xml index 5d627dea4..e869921c1 100644 --- a/app/src/main/res/values-pms/strings.xml +++ b/app/src/main/res/values-pms/strings.xml @@ -213,5 +213,5 @@ Bin-ëvnù an Wikimedia Commons, %s! I soma content ëd vëdd-lo sì. %s a l\'ha lassà un mëssagi su soa pàgina ëd ciaciarade Mersì d\'avèj fàit na modìfica - %s a l\'ha massionalo su %s . + %s a l\'ha massionalo su %s . diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a2c679c3c..be9036d40 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -213,5 +213,5 @@ Bem-vindo ao Wikimedia Commons, %s! É um prazer tê-lo aqui. %s deixou uma mensagem na sua página de discussão Obrigado por ter realizado uma edição - %s fez menção a você em %s. + %s fez menção a você em %s. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a3ac9c1d5..be96d27f1 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -213,5 +213,5 @@ Bem-vindo ao Wikimedia Commons, %s! É um prazer tê-lo aqui. %s deixou uma mensagem na sua página de discussão Obrigado por ter realizado uma edição - %s fez menção a si em %s. + %s fez menção a si em %s. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 387090d7f..c41602c77 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -217,5 +217,5 @@ Добро пожаловать в Wikimedia Commons, %s! Рады вас здесь видеть :-) %s оставил сообщение на вашей странице обсуждения Спасибо за правку - %s упомянул вас на %s. + %s упомянул вас на %s. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2b781a1c5..c73542aa8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -213,5 +213,5 @@ Välkommen till Wikimedia Commons, %s! Vi är glada att du är här. %s lämnade ett meddelande på din diskussionssida Tack för att du gjorde en redigering - %s nämnde dig på %s. + %s nämnde dig på %s. diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4ef5363a4..846fc02dd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -213,5 +213,5 @@ %s，歡迎來到維基共享資源！我們很高興您來到這裡。 %s 留了訊息在您的對話頁 感謝您所做的編輯 - %s 在 %s 提到了您。 + %s 在 %s 提到了您。 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 9b42cdbf0..11f1963b0 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -213,5 +213,5 @@ 欢迎来到维基共享资源，%s！我们很高兴您来这里。 %s在您的讨论页上留下了一条消息 感谢您做出编辑 - %s在%s提到了您。 + %s在%s提到了您。 diff --git a/build.gradle b/build.gradle index 6b7e5dc00..b0e8b6718 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath "com.android.tools.build:gradle:${project.gradleVersion}" + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" From 68fb5ee1acf2dc2bdd8236b981f680a1ada502f5 Mon Sep 17 00:00:00 2001 From: junkiattan Date: Mon, 12 Feb 2018 17:40:18 +0800 Subject: [PATCH 2/3] added relevant filtering to containsYear method of CategorizationFragment.java --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 76a70c0b3..51376c7fe 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -298,8 +298,10 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment { //Check if item contains a 4-digit word anywhere within the string (.* is wildcard) //And that item does not equal the current year or previous year //And if it is an irrelevant category such as Media_needing_categories_as_of_16_June_2017(Issue #750) + //Check if the year in the form of XX(X)0s is relevant, i.e. in the 2000s or 2010s as stated in Issue #1029 return ((item.matches(".*(19|20)\\d{2}.*") && !item.contains(yearInString) && !item.contains(prevYearInString)) - || item.matches("(.*)needing(.*)") || item.matches("(.*)taken on(.*)")); + || item.matches("(.*)needing(.*)") || item.matches("(.*)taken on(.*)") + || (item.matches(".*0s.*") && !item.matches(".*(200|201)0s.*"))); } private void updateCategoryCount(CategoryItem item) { From 34a00660fc6b7b48115fbad1dfab26bd77732056 Mon Sep 17 00:00:00 2001 From: junkiattan Date: Tue, 13 Feb 2018 22:43:11 +0800 Subject: [PATCH 3/3] Removed hardcoded class path in build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0e8b6718..6b7e5dc00 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath "com.android.tools.build:gradle:${project.gradleVersion}" classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"