TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 12:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix more plurals

Browse Source 
Closes #4898
// FREEBIE
This commit is contained in:
Christian Ascheberg 2015-12-16 15:36:14 +01:00 committed by Moxie Marlinspike
parent ed592950c0
commit fd570310e0
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
res/values/strings.xml
View File

@ -185,11 +185,15 @@
</plurals> </plurals>
<string name="ConversationListFragment_deleting">Deleting</string> <string name="ConversationListFragment_deleting">Deleting</string>
<string name="ConversationListFragment_deleting_selected_conversations">Deleting selected conversations...</string> <string name="ConversationListFragment_deleting_selected_conversations">Deleting selected conversations...</string>
<string name="ConversationListFragment_conversations_archived">Conversations archived</string> <plurals name="ConversationListFragment_conversations_archived">
<item quantity="one">Conversation archived</item>
<item quantity="other">%d conversations archived</item>
</plurals>
<string name="ConversationListFragment_undo">UNDO</string> <string name="ConversationListFragment_undo">UNDO</string>
<string name="ConversationListFragment_moved_conversation_to_inbox">Moved conversation to inbox</string> <plurals name="ConversationListFragment_moved_conversations_to_inbox">
<string name="ConversationListFragment_conversation_archived">Conversation archived</string> <item quantity="one">Moved conversation to inbox</item>
<string name="ConversationListFragment_moved_conversations_to_inbox">Moved conversations to inbox</string> <item quantity="other">Moved %d conversations to inbox</item>
</plurals>
<!-- ConversationListItem --> <!-- ConversationListItem -->
<string name="ConversationListItem_key_exchange_message">Key exchange message...</string> <string name="ConversationListItem_key_exchange_message">Key exchange message...</string>

13
src/org/thoughtcrime/securesms/ConversationListFragment.java
View File

@ -201,10 +201,13 @@ public class ConversationListFragment extends Fragment
final Set<Long> selectedConversations = new HashSet<>(getListAdapter().getBatchSelections()); final Set<Long> selectedConversations = new HashSet<>(getListAdapter().getBatchSelections());
final boolean archive = this.archive; final boolean archive = this.archive;
String snackBarTitle; int snackBarTitleId;
if (archive) snackBarTitle = getString(R.string.ConversationListFragment_moved_conversations_to_inbox); if (archive) snackBarTitleId = R.plurals.ConversationListFragment_moved_conversations_to_inbox;
else snackBarTitle = getString(R.string.ConversationListFragment_conversations_archived); else snackBarTitleId = R.plurals.ConversationListFragment_conversations_archived;
int count = selectedConversations.size();
String snackBarTitle = getResources().getQuantityString(snackBarTitleId, count, count);
new SnackbarAsyncTask<Void>(getView(), snackBarTitle, new SnackbarAsyncTask<Void>(getView(), snackBarTitle,
getString(R.string.ConversationListFragment_undo), getString(R.string.ConversationListFragment_undo),
@ -438,7 +441,7 @@ public class ConversationListFragment extends Fragment
if (archive) { if (archive) {
new SnackbarAsyncTask<Long>(getView(), new SnackbarAsyncTask<Long>(getView(),
getString(R.string.ConversationListFragment_moved_conversation_to_inbox), getResources().getQuantityString(R.plurals.ConversationListFragment_moved_conversations_to_inbox, 1, 1),
getString(R.string.ConversationListFragment_undo), getString(R.string.ConversationListFragment_undo),
getResources().getColor(R.color.amber_500), getResources().getColor(R.color.amber_500),
Snackbar.LENGTH_LONG, false) Snackbar.LENGTH_LONG, false)
@ -455,7 +458,7 @@ public class ConversationListFragment extends Fragment
}.execute(threadId); }.execute(threadId);
} else { } else {
new SnackbarAsyncTask<Long>(getView(), new SnackbarAsyncTask<Long>(getView(),
getString(R.string.ConversationListFragment_conversation_archived), getResources().getQuantityString(R.plurals.ConversationListFragment_conversations_archived, 1, 1),
getString(R.string.ConversationListFragment_undo), getString(R.string.ConversationListFragment_undo),
getResources().getColor(R.color.amber_500), getResources().getColor(R.color.amber_500),
Snackbar.LENGTH_LONG, false) Snackbar.LENGTH_LONG, false)