Commit 6ac89ca 1 parent 4700734 commit 6ac89ca Copy full SHA for 6ac89ca
File tree 7 files changed +34
-13
lines changed
java/com/infomaniak/mail/ui/bottomSheetDialogs
7 files changed +34
-13
lines changed Original file line number Diff line number Diff line change @@ -93,7 +93,14 @@ class AccountBottomSheetDialog : BottomSheetDialogFragment() {
93
93
}
94
94
95
95
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
+ }
97
104
getAccountsInDB()
98
105
}
99
106
}
Original file line number Diff line number Diff line change 21
21
android : layout_width =" match_parent"
22
22
android : layout_height =" match_parent"
23
23
app : centerHorizontally =" true"
24
- app : title =" @string/titleMyAccount"
25
24
tools : context =" .ui.bottomSheetDialogs.AccountBottomSheetDialog" >
26
25
27
26
<androidx .core.widget.NestedScrollView
66
65
app : iconColor =" @color/redDestructiveAction"
67
66
app : iconPaddingEnd =" @dimen/marginStandardMedium"
68
67
app : iconPaddingStart =" @dimen/marginStandard"
69
- app : text =" @string/buttonAccountDisconnect "
68
+ app : text =" @string/buttonAccountLogOut "
70
69
app : textColor =" @color/redDestructiveAction"
71
70
app : visibleDivider =" false" />
72
71
Original file line number Diff line number Diff line change 115
115
<string name =" buttonAccountAssociatedEmailAddresses" >Mit diesem Konto verbundene E-Mail-Adressen</string >
116
116
<string name =" buttonAccountDelete" >Konto löschen</string >
117
117
<string name =" buttonAccountDisconnect" >Konto abmelden</string >
118
+ <string name =" buttonAccountLogOut" >Abmelden</string >
118
119
<string name =" buttonAccountSwitch" >Konto ändern</string >
119
120
<string name =" buttonAddAccount" >Account hinzufügen</string >
120
121
<string name =" buttonAddEmailAddress" >Eine E-Mail-Adresse hinzufügen</string >
566
567
<string name =" threadListSectionToday" >Heute</string >
567
568
<string name =" threadListSpamHint" >Nachrichten, die sich länger als 30 Tage im Spam-Ordner befinden, werden automatisch gelöscht.</string >
568
569
<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 >
571
574
<string name =" toTitle" >An:</string >
572
575
<string name =" tooManyRecipients" >Sie können diese Adresse nicht hinzufügen, da Sie die Höchstzahl an Empfängern erreicht haben</string >
573
576
<string name =" trashFolder" >Papierkorb</string >
Original file line number Diff line number Diff line change 115
115
<string name =" buttonAccountAssociatedEmailAddresses" >Direcciones de correo electrónico asociadas a esta cuenta</string >
116
116
<string name =" buttonAccountDelete" >Eliminar cuenta</string >
117
117
<string name =" buttonAccountDisconnect" >Desconectar cuenta</string >
118
+ <string name =" buttonAccountLogOut" >Cerrar sesión</string >
118
119
<string name =" buttonAccountSwitch" >Cambiar de cuenta</string >
119
120
<string name =" buttonAddAccount" >Añadir una cuenta</string >
120
121
<string name =" buttonAddEmailAddress" >Añadir una dirección de correo electrónico</string >
566
567
<string name =" threadListSectionToday" >Hoy</string >
567
568
<string name =" threadListSpamHint" >Los mensajes que lleven más de 30 días en la carpeta de spam se eliminarán automáticamente.</string >
568
569
<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 >
571
574
<string name =" toTitle" >Para:</string >
572
575
<string name =" tooManyRecipients" >No puede añadir esta dirección porque ha alcanzado el límite de destinatarios</string >
573
576
<string name =" trashFolder" >Basura</string >
Original file line number Diff line number Diff line change 117
117
<string name =" buttonAccountAssociatedEmailAddresses" >Adresses mail associées au compte</string >
118
118
<string name =" buttonAccountDelete" >Supprimer mon compte</string >
119
119
<string name =" buttonAccountDisconnect" >Me déconnecter de ce compte</string >
120
+ <string name =" buttonAccountLogOut" >Se déconnecter</string >
120
121
<string name =" buttonAccountSwitch" >Changer de compte</string >
121
122
<string name =" buttonAddAccount" >Ajouter un compte</string >
122
123
<string name =" buttonAddEmailAddress" >Ajouter une adresse mail</string >
580
581
<string name =" threadListSectionToday" >Aujourd’hui</string >
581
582
<string name =" threadListSpamHint" >Les messages placés dans le dossier spam pendant plus de 30 jours seront automatiquement supprimés.</string >
582
583
<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 >
585
588
<string name =" toTitle" >À :</string >
586
589
<string name =" tooManyRecipients" >Vous ne pouvez pas ajouter cette adresse car vous avez atteint la limite de destinataires</string >
587
590
<string name =" trashFolder" >Corbeille</string >
Original file line number Diff line number Diff line change 115
115
<string name =" buttonAccountAssociatedEmailAddresses" >Indirizzi e-mail associati a questo account</string >
116
116
<string name =" buttonAccountDelete" >Cancellare l’account</string >
117
117
<string name =" buttonAccountDisconnect" >Disconnettere l’account</string >
118
+ <string name =" buttonAccountLogOut" >Disconnettersi</string >
118
119
<string name =" buttonAccountSwitch" >Modifica del conto</string >
119
120
<string name =" buttonAddAccount" >Aggiungere un account</string >
120
121
<string name =" buttonAddEmailAddress" >Aggiungere un indirizzo e-mail</string >
566
567
<string name =" threadListSectionToday" >Oggi</string >
567
568
<string name =" threadListSpamHint" >I messaggi che sono rimasti nella cartella spam per più di 30 giorni saranno eliminati automaticamente.</string >
568
569
<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 >
571
574
<string name =" toTitle" >A:</string >
572
575
<string name =" tooManyRecipients" >Non è possibile aggiungere questo indirizzo perché è stato raggiunto il limite di destinatari</string >
573
576
<string name =" trashFolder" >Cestino</string >
Original file line number Diff line number Diff line change 121
121
<string name =" buttonAccountAssociatedEmailAddresses" >Email addresses associated with this account</string >
122
122
<string name =" buttonAccountDelete" >Delete account</string >
123
123
<string name =" buttonAccountDisconnect" >Disconnect account</string >
124
+ <string name =" buttonAccountLogOut" >Log out</string >
124
125
<string name =" buttonAccountSwitch" >Change account</string >
125
126
<string name =" buttonAddAccount" >Add an account</string >
126
127
<string name =" buttonAddEmailAddress" >Add an email address</string >
572
573
<string name =" threadListSectionToday" >Today</string >
573
574
<string name =" threadListSpamHint" >Messages that have been in the spam folder more than 30 days will be automatically deleted.</string >
574
575
<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 >
577
580
<string name =" toTitle" >To:</string >
578
581
<string name =" tooManyRecipients" >You can’t add this address because you have reached the limit of recipients</string >
579
582
<string name =" trashFolder" >Trash</string >
You can’t perform that action at this time.
0 commit comments