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

better variale name for ".*0s.*"

Browse source 
as that regex will match e.g. `1920s` and `80s` too, so the original `is20xxsYear` would be confusing name for it
This commit is contained in:
Matija Nalis 2024-07-15 01:09:59 +02:00
parent eafb363863
commit d92225a3a2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,10 +40,10 @@ class CategoriesModel @Inject constructor(
val prevYearInString = prevYear.toString() val prevYearInString = prevYear.toString()
Timber.d("Previous year: %s", prevYearInString) Timber.d("Previous year: %s", prevYearInString)
val is20xxsYear = item.matches(".*0s.*".toRegex()) val mentionsDecade = item.matches(".*0s.*".toRegex())
if (is20xxsYear) { if (mentionsDecade) {
//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 (or 2020s) as stated in Issue #1029
// If not, check if it is an irrelevant category such as Media_needing_categories_as_of_16_June_2017(Issue #750) // If not, check if it is an irrelevant category such as Media_needing_categories_as_of_16_June_2017(Issue #750)
return !item.matches(".*20[0-2]0s.*".toRegex()) return !item.matches(".*20[0-2]0s.*".toRegex())
|| item.matches("(.*)needing(.*)".toRegex()) || item.matches("(.*)needing(.*)".toRegex())