awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Refactor: Use android plural handling

Browse Source
This commit is contained in:
Dr. Tobias Quathamer
2017-02-07 11:08:30 +01:00
parent ae9dfb1595
commit 9b5984182f
9 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java
+3 -3
View File
@@ -136,7 +136,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
else if( do_what == SELECT_CONTACTS_FOR_NEW_GROUP )
{
title = LocaleController.getString("NewGroup", R.string.NewGroup);
subtitle = LocaleController.getString("MeAnd", R.string.MeAnd) + " " + LocaleController.formatPluralString("Members", 0);
subtitle = ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.MeAndMembers, 0, 0);
}
else if( do_what == ADD_CONTACTS_TO_GROUP )
{
@@ -163,7 +163,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
private volatile boolean m_in_sync = false;
@Override
public View createView(Context context) {
public View createView(final Context context) {
// do sync?
boolean do_sync_now = true;
@@ -464,7 +464,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
span.uid = user.id;
ignoreChange = false;
}
actionBar.setSubtitle(LocaleController.getString("MeAnd", R.string.MeAnd) + " " + LocaleController.formatPluralString("Members", selectedContacts.size()));
actionBar.setSubtitle(context.getResources().getQuantityString(R.plurals.MeAndMembers, selectedContacts.size(), selectedContacts.size()));
if (searching || searchWas) {
ignoreChange = true;
SpannableStringBuilder ssb = new SpannableStringBuilder("");
MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java
+1 -1
View File
@@ -271,7 +271,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
}
GreySectionCell sectionCell = new GreySectionCell(context);
sectionCell.setText(LocaleController.formatPluralString("Members", selectedContacts.size()));
sectionCell.setText(context.getResources().getQuantityString(R.plurals.Members, selectedContacts.size(), selectedContacts.size()));
linearLayout.addView(sectionCell);
listView = new ListView(context);
MessengerProj/src/main/res/values-de/strings.xml
+8 -7
View File
@@ -339,12 +339,14 @@
<string name="IntroStartMessaging">Jetzt beginnen</string>
<!--plural-->
<string name="Members_zero">%1$d Mitglieder</string>
<string name="Members_one">%1$d Mitglied</string>
<string name="Members_two">%1$d Mitglieder</string>
<string name="Members_few">%1$d Mitglieder</string>
<string name="Members_many">%1$d Mitglieder</string>
<string name="Members_other">%1$d Mitglieder</string>
<plurals name="Members">
<item quantity="one">%d Mitglied</item>
<item quantity="other">%d Mitglieder</item>
</plurals>
<plurals name="MeAndMembers">
<item quantity="one">Ich und %d Mitglied</item>
<item quantity="other">Ich und %d Mitglieder</item>
</plurals>
<plurals name="NewMessages">
<item quantity="one">%d neue Nachricht</item>
<item quantity="other">%d neue Nachrichten</item>
@@ -479,7 +481,6 @@
<string name="SeachUser">Benutzer suchen</string>
<string name="Name">Name</string>
<string name="EmailAddress">E-Mail-Adresse</string>
<string name="MeAnd">Ich und</string>
<string name="CannotDeleteContact">Der Benutzer kann nicht gelöscht werden, da er verwendet wird; er kann aber blockiert werden.</string>
<string name="BadEmailAddress">Ungültige E-Mail-Adresse.</string>
<string name="ContactDeleted">Benutzer gelöscht.</string>
MessengerProj/src/main/res/values-es/strings.xml
+4 -6
View File
@@ -318,12 +318,10 @@
<!--Intro view-->
<string name="IntroStartMessaging">Empieza a conversar</string>
<!--plural-->
<string name="Members_zero">%1$d miembros</string>
<string name="Members_one">%1$d miembro</string>
<string name="Members_two">%1$d miembros</string>
<string name="Members_few">%1$d miembros</string>
<string name="Members_many">%1$d miembros</string>
<string name="Members_other">%1$d miembros</string>
<plurals name="Members">
<item quantity="one">%d miembro</item>
<item quantity="other">%d miembros</item>
</plurals>
<plurals name="NewMessages">
<item quantity="one">%d nuevo mensaje</item>
<item quantity="other">%d nuevos mensajes</item>
MessengerProj/src/main/res/values-fr/strings.xml
+8 -7
View File
@@ -336,12 +336,14 @@
<string name="IntroStartMessaging">Commencez à converser</string>
<!--plural-->
<string name="Members_zero">%1$d membre</string>
<string name="Members_one">%1$d membre</string>
<string name="Members_two">%1$d membres</string>
<string name="Members_few">%1$d membres</string>
<string name="Members_many">%1$d membres</string>
<string name="Members_other">%1$d membres</string>
<plurals name="Members">
<item quantity="one">%d membre</item>
<item quantity="other">%d membres</item>
</plurals>
<plurals name="MeAndMembers">
<item quantity="one">Moi et %d membre</item>
<item quantity="other">Moi et %d membres</item>
</plurals>
<plurals name="NewMessages">
<item quantity="one">%d nouveau message</item>
<item quantity="other">%d nouveaux messages</item>
@@ -476,7 +478,6 @@
<string name="SeachUser">Recherche un contact</string>
<string name="Name" >Nom</string>
<string name="EmailAddress">Adresse e-mail</string>
<string name="MeAnd">Moi et</string>
<string name="CannotDeleteContact">Impossible de supprimer les contacts en cours d\'utilisation, bloquez-les à la place.</string>
<string name="BadEmailAddress">Mauvaise adresse e-mail.</string>
<string name="ContactDeleted">Utilisateur supprimé.</string>
MessengerProj/src/main/res/values-it/strings.xml
+4 -6
View File
@@ -318,12 +318,10 @@
<!--Intro view-->
<string name="IntroStartMessaging">Inizia a chattare</string>
<!--plural-->
<string name="Members_zero">%1$d membri</string>
<string name="Members_one">%1$d membro</string>
<string name="Members_two">%1$d membri</string>
<string name="Members_few">%1$d membri</string>
<string name="Members_many">%1$d membri</string>
<string name="Members_other">%1$d membri</string>
<plurals name="Members">
<item quantity="one">%d membro</item>
<item quantity="other">%d membri</item>
</plurals>
<plurals name="NewMessages">
<item quantity="one">%d nuovo messaggio</item>
<item quantity="other">%d nuovi messaggi</item>
MessengerProj/src/main/res/values-nl/strings.xml
+4 -6
View File
@@ -318,12 +318,10 @@
<!--Intro view-->
<string name="IntroStartMessaging">Begin met chatten</string>
<!--plural-->
<string name="Members_zero">%1$d leden</string>
<string name="Members_one">%1$d leden</string>
<string name="Members_two">%1$d leden</string>
<string name="Members_few">%1$d leden</string>
<string name="Members_many">%1$d leden</string>
<string name="Members_other">%1$d leden</string>
<plurals name="Members">
<item quantity="one">%d leden</item>
<item quantity="other">%d leden</item>
</plurals>
<plurals name="NewMessages">
<item quantity="one">%d nieuw bericht</item>
<item quantity="other">%d nieuwe berichten</item>
MessengerProj/src/main/res/values-pt/strings.xml
+4 -6
View File
@@ -318,12 +318,10 @@
<!--Intro view-->
<string name="IntroStartMessaging">Comece a conversar</string>
<!--plural-->
<string name="Members_zero">%1$d membros</string>
<string name="Members_one">%1$d membro</string>
<string name="Members_two">%1$d membros</string>
<string name="Members_few">%1$d membros</string>
<string name="Members_many">%1$d membros</string>
<string name="Members_other">%1$d membros</string>
<plurals name="Members">
<item quantity="one">%d membro</item>
<item quantity="other">%d membros</item>
</plurals>
<plurals name="NewMessages">
<item quantity="one">%d nova mensagem</item>
<item quantity="other">%d novas mensagens</item>
MessengerProj/src/main/res/values/strings.xml
+8 -7
View File
@@ -338,12 +338,14 @@
<string name="IntroStartMessaging">Start Messaging</string>
<!--plural-->
<string name="Members_zero">%1$d members</string>
<string name="Members_one">%1$d member</string>
<string name="Members_two">%1$d members</string>
<string name="Members_few">%1$d members</string>
<string name="Members_many">%1$d members</string>
<string name="Members_other">%1$d members</string>
<plurals name="Members">
<item quantity="one">%d member</item>
<item quantity="other">%d members</item>
</plurals>
<plurals name="MeAndMembers">
<item quantity="one">Me and %d member</item>
<item quantity="other">Me and %d members</item>
</plurals>
<plurals name="NewMessages">
<item quantity="one">%d new message</item>
<item quantity="other">%d new messages</item>
@@ -478,7 +480,6 @@
<string name="SeachUser">Search user</string>
<string name="Name" >Name</string>
<string name="EmailAddress">E-mail address</string>
<string name="MeAnd">Me and</string>
<string name="CannotDeleteContact">Cannot delete users in use, block user instead.</string>
<string name="BadEmailAddress">Bad e-mail address.</string>
<string name="ContactDeleted">User deleted.</string>