Skip to content

Commit 6ac89ca

Browse files
committed
Add plural string for account botomsheet
1 parent 4700734 commit 6ac89ca

File tree

7 files changed

+34
-13
lines changed

7 files changed

+34
-13
lines changed

app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/AccountBottomSheetDialog.kt

+8-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,14 @@ class AccountBottomSheetDialog : BottomSheetDialogFragment() {
9393
}
9494

9595
private fun observeAccounts() = with(switchUserViewModel) {
96-
accounts.observe(viewLifecycleOwner, accountsAdapter::initializeAccounts)
96+
accounts.observe(viewLifecycleOwner) {
97+
binding.root.title = requireContext().resources.getQuantityString(
98+
R.plurals.titleMyAccount,
99+
it.size,
100+
it.size,
101+
)
102+
accountsAdapter.initializeAccounts(it)
103+
}
97104
getAccountsInDB()
98105
}
99106
}

app/src/main/res/layout/bottom_sheet_account.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
2323
app:centerHorizontally="true"
24-
app:title="@string/titleMyAccount"
2524
tools:context=".ui.bottomSheetDialogs.AccountBottomSheetDialog">
2625

2726
<androidx.core.widget.NestedScrollView
@@ -66,7 +65,7 @@
6665
app:iconColor="@color/redDestructiveAction"
6766
app:iconPaddingEnd="@dimen/marginStandardMedium"
6867
app:iconPaddingStart="@dimen/marginStandard"
69-
app:text="@string/buttonAccountDisconnect"
68+
app:text="@string/buttonAccountLogOut"
7069
app:textColor="@color/redDestructiveAction"
7170
app:visibleDivider="false" />
7271

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
<string name="buttonAccountAssociatedEmailAddresses">Mit diesem Konto verbundene E-Mail-Adressen</string>
116116
<string name="buttonAccountDelete">Konto löschen</string>
117117
<string name="buttonAccountDisconnect">Konto abmelden</string>
118+
<string name="buttonAccountLogOut">Abmelden</string>
118119
<string name="buttonAccountSwitch">Konto ändern</string>
119120
<string name="buttonAddAccount">Account hinzufügen</string>
120121
<string name="buttonAddEmailAddress">Eine E-Mail-Adresse hinzufügen</string>
@@ -566,8 +567,10 @@
566567
<string name="threadListSectionToday">Heute</string>
567568
<string name="threadListSpamHint">Nachrichten, die sich länger als 30 Tage im Spam-Ordner befinden, werden automatisch gelöscht.</string>
568569
<string name="threadListTrashHint">Nachrichten, die länger als 30 Tage im Papierkorb liegen, werden automatisch gelöscht.</string>
569-
<string name="titleMyAccount">Mein Konto</string>
570-
<string name="titleMyAccounts">Meine Konten</string>
570+
<plurals name="titleMyAccount">
571+
<item quantity="one">Mein Konto</item>
572+
<item quantity="other">Meine Konten</item>
573+
</plurals>
571574
<string name="toTitle">An:</string>
572575
<string name="tooManyRecipients">Sie können diese Adresse nicht hinzufügen, da Sie die Höchstzahl an Empfängern erreicht haben</string>
573576
<string name="trashFolder">Papierkorb</string>

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
<string name="buttonAccountAssociatedEmailAddresses">Direcciones de correo electrónico asociadas a esta cuenta</string>
116116
<string name="buttonAccountDelete">Eliminar cuenta</string>
117117
<string name="buttonAccountDisconnect">Desconectar cuenta</string>
118+
<string name="buttonAccountLogOut">Cerrar sesión</string>
118119
<string name="buttonAccountSwitch">Cambiar de cuenta</string>
119120
<string name="buttonAddAccount">Añadir una cuenta</string>
120121
<string name="buttonAddEmailAddress">Añadir una dirección de correo electrónico</string>
@@ -566,8 +567,10 @@
566567
<string name="threadListSectionToday">Hoy</string>
567568
<string name="threadListSpamHint">Los mensajes que lleven más de 30 días en la carpeta de spam se eliminarán automáticamente.</string>
568569
<string name="threadListTrashHint">Los mensajes que lleven más de 30 días en la papelera se borrarán automáticamente.</string>
569-
<string name="titleMyAccount">Mi cuenta</string>
570-
<string name="titleMyAccounts">Mis cuentas</string>
570+
<plurals name="titleMyAccount">
571+
<item quantity="one">Mi cuenta</item>
572+
<item quantity="other">Mis cuentas</item>
573+
</plurals>
571574
<string name="toTitle">Para:</string>
572575
<string name="tooManyRecipients">No puede añadir esta dirección porque ha alcanzado el límite de destinatarios</string>
573576
<string name="trashFolder">Basura</string>

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
<string name="buttonAccountAssociatedEmailAddresses">Adresses mail associées au compte</string>
118118
<string name="buttonAccountDelete">Supprimer mon compte</string>
119119
<string name="buttonAccountDisconnect">Me déconnecter de ce compte</string>
120+
<string name="buttonAccountLogOut">Se déconnecter</string>
120121
<string name="buttonAccountSwitch">Changer de compte</string>
121122
<string name="buttonAddAccount">Ajouter un compte</string>
122123
<string name="buttonAddEmailAddress">Ajouter une adresse mail</string>
@@ -580,8 +581,10 @@
580581
<string name="threadListSectionToday">Aujourd’hui</string>
581582
<string name="threadListSpamHint">Les messages placés dans le dossier spam pendant plus de 30 jours seront automatiquement supprimés.</string>
582583
<string name="threadListTrashHint">Les messages placés dans la corbeille pendant plus de 30 jours seront automatiquement supprimés.</string>
583-
<string name="titleMyAccount">Mon compte</string>
584-
<string name="titleMyAccounts">Mes comptes</string>
584+
<plurals name="titleMyAccount">
585+
<item quantity="one">Mon compte</item>
586+
<item quantity="other">Mes comptes</item>
587+
</plurals>
585588
<string name="toTitle">À :</string>
586589
<string name="tooManyRecipients">Vous ne pouvez pas ajouter cette adresse car vous avez atteint la limite de destinataires</string>
587590
<string name="trashFolder">Corbeille</string>

app/src/main/res/values-it/strings.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
<string name="buttonAccountAssociatedEmailAddresses">Indirizzi e-mail associati a questo account</string>
116116
<string name="buttonAccountDelete">Cancellare l’account</string>
117117
<string name="buttonAccountDisconnect">Disconnettere l’account</string>
118+
<string name="buttonAccountLogOut">Disconnettersi</string>
118119
<string name="buttonAccountSwitch">Modifica del conto</string>
119120
<string name="buttonAddAccount">Aggiungere un account</string>
120121
<string name="buttonAddEmailAddress">Aggiungere un indirizzo e-mail</string>
@@ -566,8 +567,10 @@
566567
<string name="threadListSectionToday">Oggi</string>
567568
<string name="threadListSpamHint">I messaggi che sono rimasti nella cartella spam per più di 30 giorni saranno eliminati automaticamente.</string>
568569
<string name="threadListTrashHint">I messaggi rimasti nel cestino per più di 30 giorni saranno automaticamente eliminati.</string>
569-
<string name="titleMyAccount">Il mio account</string>
570-
<string name="titleMyAccounts">I miei conti</string>
570+
<plurals name="titleMyAccount">
571+
<item quantity="one">Il mio account</item>
572+
<item quantity="other">I miei conti</item>
573+
</plurals>
571574
<string name="toTitle">A:</string>
572575
<string name="tooManyRecipients">Non è possibile aggiungere questo indirizzo perché è stato raggiunto il limite di destinatari</string>
573576
<string name="trashFolder">Cestino</string>

app/src/main/res/values/strings.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
<string name="buttonAccountAssociatedEmailAddresses">Email addresses associated with this account</string>
122122
<string name="buttonAccountDelete">Delete account</string>
123123
<string name="buttonAccountDisconnect">Disconnect account</string>
124+
<string name="buttonAccountLogOut">Log out</string>
124125
<string name="buttonAccountSwitch">Change account</string>
125126
<string name="buttonAddAccount">Add an account</string>
126127
<string name="buttonAddEmailAddress">Add an email address</string>
@@ -572,8 +573,10 @@
572573
<string name="threadListSectionToday">Today</string>
573574
<string name="threadListSpamHint">Messages that have been in the spam folder more than 30 days will be automatically deleted.</string>
574575
<string name="threadListTrashHint">Messages that have been in trash more than 30 days will be automatically deleted.</string>
575-
<string name="titleMyAccount">My account</string>
576-
<string name="titleMyAccounts">My accounts</string>
576+
<plurals name="titleMyAccount">
577+
<item quantity="one">My account</item>
578+
<item quantity="other">My accounts</item>
579+
</plurals>
577580
<string name="toTitle">To:</string>
578581
<string name="tooManyRecipients">You can’t add this address because you have reached the limit of recipients</string>
579582
<string name="trashFolder">Trash</string>

0 commit comments

Comments
 (0)