diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml index 229cf4924..9ca936534 100644 --- a/briar-android/res/values/strings.xml +++ b/briar-android/res/values/strings.xml @@ -76,8 +76,14 @@ Add Cancel Post sent - New private message. - New forum post. + + New private message. + %d new private messages. + + + New forum post. + %d new forum posts. + Settings Activate Bluetooth while signed in Briar uses Bluetooth to communicate with nearby contacts diff --git a/briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java b/briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java index 51dcea4d1..7e8bc622b 100644 --- a/briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java +++ b/briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java @@ -68,8 +68,9 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager { new NotificationCompat.Builder(appContext); b.setSmallIcon(R.drawable.message_notification_icon); b.setContentTitle(appContext.getText(R.string.app_name)); - b.setContentText(appContext.getText( - R.string.private_message_notification_text)); + b.setContentText(appContext.getResources().getQuantityString( + R.plurals.private_message_notification_text, privateTotal, + privateTotal)); b.setDefaults(DEFAULT_ALL); b.setOnlyAlertOnce(true); if(contactCounts.size() == 1) { @@ -126,8 +127,9 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager { new NotificationCompat.Builder(appContext); b.setSmallIcon(R.drawable.message_notification_icon); b.setContentTitle(appContext.getText(R.string.app_name)); - b.setContentText(appContext.getText( - R.string.group_post_notification_text)); + b.setContentText(appContext.getResources().getQuantityString( + R.plurals.group_post_notification_text, groupTotal, + groupTotal)); b.setDefaults(DEFAULT_ALL); b.setOnlyAlertOnce(true); if(groupCounts.size() == 1) { diff --git a/briar-android/src/org/briarproject/android/groups/GroupListActivity.java b/briar-android/src/org/briarproject/android/groups/GroupListActivity.java index 55133a989..f422f7421 100644 --- a/briar-android/src/org/briarproject/android/groups/GroupListActivity.java +++ b/briar-android/src/org/briarproject/android/groups/GroupListActivity.java @@ -223,9 +223,9 @@ implements EventListener, OnClickListener, OnItemClickListener { available.setVisibility(GONE); } else { available.setVisibility(VISIBLE); - String format = getResources().getQuantityString( - R.plurals.forums_available, availableCount); - available.setText(String.format(format, availableCount)); + available.setText(getResources().getQuantityString( + R.plurals.forums_available, availableCount, + availableCount)); } } });