mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-28 13:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

clarify "year" is current year

Browse source
This commit is contained in:
Matija Nalis 2024-07-15 01:06:35 +02:00
parent 99e5d1f625
commit 8916362704
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/fr/free/nrw/commons/category/CategoriesModel.kt
View file

@ -34,9 +34,9 @@ class CategoriesModel @Inject constructor(
fun containsYear(item: String): Boolean { fun containsYear(item: String): Boolean {
//Check for current and previous year to exclude these categories from removal //Check for current and previous year to exclude these categories from removal
val now = Calendar.getInstance() val now = Calendar.getInstance()
val year = now[Calendar.YEAR] val curYear = now[Calendar.YEAR]
val yearInString = year.toString() val curYearInString = curYear.toString()
val prevYear = year - 1 val prevYear = curYear - 1
val prevYearInString = prevYear.toString() val prevYearInString = prevYear.toString()
Timber.d("Previous year: %s", prevYearInString) Timber.d("Previous year: %s", prevYearInString)
@ -45,7 +45,7 @@ class CategoriesModel @Inject constructor(
//And if it is an irrelevant category such as Media_needing_categories_as_of_16_June_2017(Issue #750) //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 //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}.*".toRegex()) return item.matches(".*(19|20)\\d{2}.*".toRegex())
&& !item.contains(yearInString) && !item.contains(curYearInString)
&& !item.contains(prevYearInString) && !item.contains(prevYearInString)
|| item.matches("(.*)needing(.*)".toRegex()) || item.matches("(.*)needing(.*)".toRegex())
|| item.matches("(.*)taken on(.*)".toRegex()) || item.matches("(.*)taken on(.*)".toRegex())