Skip to content

Commit c98e32c

Browse files
MihaiCristianCondreaMihaiCristianCondrea
authored
Merge pull request #358 from MihaiCristianCondrea/codex/review-empty-folders-string-formatting
Use plurals for empty folder count
2 parents 580563f + 0a374d1 commit c98e32c

File tree

27 files changed

+113
-27
lines changed

27 files changed

+113
-27
lines changed

‎app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/ui/components/EmptyFolderCleanerCard.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.material3.MaterialTheme
88
import androidx.compose.material3.Text
99
import androidx.compose.runtime.Composable
1010
import androidx.compose.ui.Modifier
11+
import androidx.compose.ui.res.pluralStringResource
1112
import androidx.compose.ui.res.stringResource
1213
import com.d4rk.android.libs.apptoolkit.core.ui.components.spacers.SmallVerticalSpacer
1314
import com.d4rk.cleaner.R
@@ -32,7 +33,7 @@ fun EmptyFolderCleanerCard(
3233
) {
3334
SmallVerticalSpacer()
3435
Text(
35-
text = stringResource(id = R.string.empty_folders_found_format, folders.size),
36+
text = pluralStringResource(id = R.plurals.empty_folders_found_format, count = folders.size, folders.size),
3637
style = MaterialTheme.typography.bodyMedium,
3738
modifier = Modifier.animateContentSize()
3839
)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,10 @@
130130
<string name="clean_apks">حذف المثبتات</string>
131131
<string name="empty_folder_card_title">المجلدات الفارغة</string>
132132
<string name="empty_folder_card_subtitle">احذف المجلدات غير المستخدمة فوراً.</string>
133-
<string name="empty_folders_found_format">%1$d مجلد فارغ تم العثور عليه</string>
133+
<plurals name="empty_folders_found_format">
134+
<item quantity="one">تم العثور على %1$d مجلد فارغ</item>
135+
<item quantity="other">تم العثور على %1$d مجلدًا فارغًا</item>
136+
</plurals>
134137
<string name="clean_empty_folders">حذف المجلدات الفاضية</string>
135138
<string name="whatsapp_card_title">ملفات واتساب</string>
136139
<string name="whatsapp_card_subtitle">امسح الوسائط التي لم تعد تحتاجها.</string>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@
118118
<string name="clean_apks">Изтрий инсталаторите</string>
119119
<string name="empty_folder_card_title">Празни папки</string>
120120
<string name="empty_folder_card_subtitle">Премахнете неизползваните папки веднага.</string>
121-
<string name="empty_folders_found_format">%1$d празни папки намерени</string>
121+
<plurals name="empty_folders_found_format">
122+
<item quantity="one">Намерена %1$d празна папка</item>
123+
<item quantity="other">Намерени %1$d празни папки</item>
124+
</plurals>
122125
<string name="clean_empty_folders">Изтриване на празни папки</string>
123126
<string name="whatsapp_card_title">Файлове от WhatsApp</string>
124127
<string name="whatsapp_card_subtitle">Изчистете медията, която вече не ви трябва.</string>

‎app/src/main/res/values-bn-rBD/strings.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@
118118
<string name="clean_apks">ইনস্টলার ডিলিট করুন</string>
119119
<string name="empty_folder_card_title">খালি ফোল্ডার</string>
120120
<string name="empty_folder_card_subtitle">অব্যবহৃত ফোল্ডার সাথে সাথে মুছে ফেলুন।</string>
121-
<string name="empty_folders_found_format">%1$d টি খালি ফোল্ডার পাওয়া গেছে</string>
121+
<plurals name="empty_folders_found_format">
122+
<item quantity="one">%1$d টি খালি ফোল্ডার পাওয়া গেছে</item>
123+
<item quantity="other">%1$d টি খালি ফোল্ডার পাওয়া গেছে</item>
124+
</plurals>
122125
<string name="clean_empty_folders">খালি ফোল্ডার মুছুন</string>
123126
<string name="whatsapp_card_title">হোয়াটসঅ্যাপ ফাইল</string>
124127
<string name="whatsapp_card_subtitle">আপনার দরকার নেই এমন মিডিয়া সরান।</string>

‎app/src/main/res/values-de-rDE/strings.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@
118118
<string name="clean_apks">Installer löschen</string>
119119
<string name="empty_folder_card_title">Leere Ordner</string>
120120
<string name="empty_folder_card_subtitle">Nicht genutzte Ordner sofort entfernen.</string>
121-
<string name="empty_folders_found_format">%1$d leere Ordner gefunden</string>
121+
<plurals name="empty_folders_found_format">
122+
<item quantity="one">%1$d leerer Ordner gefunden</item>
123+
<item quantity="other">%1$d leere Ordner gefunden</item>
124+
</plurals>
122125
<string name="clean_empty_folders">Leere Ordner löschen</string>
123126
<string name="whatsapp_card_title">WhatsApp-Dateien</string>
124127
<string name="whatsapp_card_subtitle">Lösche Medien, die du nicht mehr brauchst.</string>

‎app/src/main/res/values-es-rGQ/strings.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@
121121
<string name="clean_apks">Eliminar instaladores</string>
122122
<string name="empty_folder_card_title">Carpetas vacías</string>
123123
<string name="empty_folder_card_subtitle">Elimina las carpetas sin uso al instante.</string>
124-
<string name="empty_folders_found_format">%1$d carpetas vacías encontradas</string>
124+
<plurals name="empty_folders_found_format">
125+
<item quantity="one">%1$d carpeta vacía encontrada</item>
126+
<item quantity="other">%1$d carpetas vacías encontradas</item>
127+
</plurals>
125128
<string name="clean_empty_folders">Eliminar carpetas vacías</string>
126129
<string name="whatsapp_card_title">Archivos de WhatsApp</string>
127130
<string name="whatsapp_card_subtitle">Elimina los archivos que ya no necesites.</string>

‎app/src/main/res/values-es-rMX/strings.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@
121121
<string name="clean_apks">Eliminar instaladores</string>
122122
<string name="empty_folder_card_title">Carpetas vacías</string>
123123
<string name="empty_folder_card_subtitle">Elimina las carpetas sin uso al instante.</string>
124-
<string name="empty_folders_found_format">%1$d carpetas vacías encontradas</string>
124+
<plurals name="empty_folders_found_format">
125+
<item quantity="one">%1$d carpeta vacía encontrada</item>
126+
<item quantity="other">%1$d carpetas vacías encontradas</item>
127+
</plurals>
125128
<string name="clean_empty_folders">Eliminar carpetas vacías</string>
126129
<string name="whatsapp_card_title">Archivos de WhatsApp</string>
127130
<string name="whatsapp_card_subtitle">Elimina los archivos que ya no necesites.</string>

‎app/src/main/res/values-fil-rPH/strings.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@
118118
<string name="clean_apks">Burahin ang mga Installer</string>
119119
<string name="empty_folder_card_title">Walang laman na mga folder</string>
120120
<string name="empty_folder_card_subtitle">Agad na tanggalin ang hindi nagagamit na mga folder.</string>
121-
<string name="empty_folders_found_format">%1$d na walang laman na folder ang nakita</string>
121+
<plurals name="empty_folders_found_format">
122+
<item quantity="one">%1$d na walang laman na folder ang nakita</item>
123+
<item quantity="other">%1$d na walang laman na folder ang nakita</item>
124+
</plurals>
122125
<string name="clean_empty_folders">Burahin ang mga walang lamang folder</string>
123126
<string name="whatsapp_card_title">Mga WhatsApp File</string>
124127
<string name="whatsapp_card_subtitle">Linisin ang media na hindi mo na kailangan.</string>

‎app/src/main/res/values-fr-rFR/strings.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@
121121
<string name="clean_apks">Supprimer les installateurs</string>
122122
<string name="empty_folder_card_title">Dossiers vides</string>
123123
<string name="empty_folder_card_subtitle">Supprimez instantanément les dossiers inutilisés.</string>
124-
<string name="empty_folders_found_format">%1$d dossiers vides trouvés</string>
124+
<plurals name="empty_folders_found_format">
125+
<item quantity="one">%1$d dossier vide trouvé</item>
126+
<item quantity="other">%1$d dossiers vides trouvés</item>
127+
</plurals>
125128
<string name="clean_empty_folders">Supprimer les dossiers vides</string>
126129
<string name="whatsapp_card_title">Fichiers WhatsApp</string>
127130
<string name="whatsapp_card_subtitle">Nettoyez les médias dont vous n’avez plus besoin.</string>

‎app/src/main/res/values-hi-rIN/strings.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@
118118
<string name="clean_apks">इंस्टॉलर हटाएँ</string>
119119
<string name="empty_folder_card_title">खाली फ़ोल्डर</string>
120120
<string name="empty_folder_card_subtitle">अनउपयोगी फ़ोल्डर तुरंत हटाएँ।</string>
121-
<string name="empty_folders_found_format">%1$d खाली फ़ोल्डर मिले</string>
121+
<plurals name="empty_folders_found_format">
122+
<item quantity="one">%1$d खाली फ़ोल्डर मिला</item>
123+
<item quantity="other">%1$d खाली फ़ोल्डर मिले</item>
124+
</plurals>
122125
<string name="clean_empty_folders">खाली फ़ोल्डर हटाएं</string>
123126
<string name="whatsapp_card_title">व्हाट्सएप फ़ाइलें</string>
124127
<string name="whatsapp_card_subtitle">वे मीडिया हटाएँ जिनकी अब ज़रूरत नहीं.</string>

0 commit comments

Comments
 (0)