Skip to content

Commit

Permalink
De-pluralize some strings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@greyson-signal
greyson-signal committed Mar 31, 2023
1 parent 36a8c4d commit d02f605
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 42 deletions.
28 changes: 14 additions & 14 deletions app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
View file
Expand Up @@ -1457,15 +1457,15 @@ public boolean onConversationLongClick(@NonNull Conversation conversation, @NonN
}

if (conversation.getThreadRecord().isPinned()) {
items.add(new ActionItem(R.drawable.symbol_pin_slash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin_plural, 1), () -> handleUnpin(id)));
items.add(new ActionItem(R.drawable.symbol_pin_slash_24, getResources().getString(R.string.ConversationListFragment_unpin), () -> handleUnpin(id)));
} else {
items.add(new ActionItem(R.drawable.symbol_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin_plural, 1), () -> handlePin(Collections.singleton(conversation))));
items.add(new ActionItem(R.drawable.symbol_pin_24, getResources().getString(R.string.ConversationListFragment_pin), () -> handlePin(Collections.singleton(conversation))));
}

if (conversation.getThreadRecord().getRecipient().live().get().isMuted()) {
items.add(new ActionItem(R.drawable.symbol_bell_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute_plural, 1), () -> handleUnmute(Collections.singleton(conversation))));
items.add(new ActionItem(R.drawable.symbol_bell_24, getResources().getString(R.string.ConversationListFragment_unmute), () -> handleUnmute(Collections.singleton(conversation))));
} else {
items.add(new ActionItem(R.drawable.symbol_bell_slash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, 1), () -> handleMute(Collections.singleton(conversation))));
items.add(new ActionItem(R.drawable.symbol_bell_slash_24, getResources().getString(R.string.ConversationListFragment_mute), () -> handleMute(Collections.singleton(conversation))));
}
}

Expand All @@ -1475,12 +1475,12 @@ public boolean onConversationLongClick(@NonNull Conversation conversation, @NonN
}));

if (conversation.getThreadRecord().isArchived()) {
items.add(new ActionItem(R.drawable.symbol_archive_android_up_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, 1), () -> handleArchive(id, false)));
items.add(new ActionItem(R.drawable.symbol_archive_android_up_24, getResources().getString(R.string.ConversationListFragment_unarchive), () -> handleArchive(id, false)));
} else {
items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, 1), () -> handleArchive(id, false)));
items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getString(R.string.ConversationListFragment_archive), () -> handleArchive(id, false)));
}

items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, 1), () -> handleDelete(id)));
items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getString(R.string.ConversationListFragment_delete), () -> handleDelete(id)));

activeContextMenu = new SignalContextMenu.Builder(view, list)
.offsetX(ViewUtil.dpToPx(12))
Expand Down Expand Up @@ -1572,23 +1572,23 @@ private void updateMultiSelectState() {
}

if (!isArchived() && hasUnpinned && canPin) {
items.add(new ActionItem(R.drawable.symbol_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin_plural, count), () -> handlePin(viewModel.currentSelectedConversations())));
items.add(new ActionItem(R.drawable.symbol_pin_24, getResources().getString(R.string.ConversationListFragment_pin), () -> handlePin(viewModel.currentSelectedConversations())));
} else if (!isArchived() && !hasUnpinned) {
items.add(new ActionItem(R.drawable.symbol_pin_slash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin_plural, count), () -> handleUnpin(selectionIds)));
items.add(new ActionItem(R.drawable.symbol_pin_slash_24, getResources().getString(R.string.ConversationListFragment_unpin), () -> handleUnpin(selectionIds)));
}

if (isArchived()) {
items.add(new ActionItem(R.drawable.symbol_archive_android_up_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, count), () -> handleArchive(selectionIds, true)));
items.add(new ActionItem(R.drawable.symbol_archive_android_up_24, getResources().getString(R.string.ConversationListFragment_unarchive), () -> handleArchive(selectionIds, true)));
} else {
items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, count), () -> handleArchive(selectionIds, true)));
items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getString(R.string.ConversationListFragment_archive), () -> handleArchive(selectionIds, true)));
}

items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, count), () -> handleDelete(selectionIds)));
items.add(new ActionItem(R.drawable.symbol_trash_24, getResources().getString(R.string.ConversationListFragment_delete), () -> handleDelete(selectionIds)));

if (hasUnmuted) {
items.add(new ActionItem(R.drawable.symbol_bell_slash_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, count), () -> handleMute(viewModel.currentSelectedConversations())));
items.add(new ActionItem(R.drawable.symbol_bell_slash_24, getResources().getString(R.string.ConversationListFragment_mute), () -> handleMute(viewModel.currentSelectedConversations())));
} else {
items.add(new ActionItem(R.drawable.symbol_bell_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute_plural, count), () -> handleUnmute(viewModel.currentSelectedConversations())));
items.add(new ActionItem(R.drawable.symbol_bell_24, getResources().getString(R.string.ConversationListFragment_unmute), () -> handleUnmute(viewModel.currentSelectedConversations())));
}

items.add(new ActionItem(R.drawable.symbol_check_circle_24, getString(R.string.ConversationListFragment_select_all), viewModel::onSelectAllClick));
Expand Down
35 changes: 7 additions & 28 deletions app/src/main/res/values/strings.xml
View file
Expand Up @@ -497,35 +497,14 @@
<item quantity="one">Unread</item>
<item quantity="other">Unread</item>
</plurals>
<plurals name="ConversationListFragment_pin_plural">
<item quantity="one">Pin</item>
<item quantity="other">Pin</item>
</plurals>
<plurals name="ConversationListFragment_unpin_plural">
<item quantity="one">Unpin</item>
<item quantity="other">Unpin</item>
</plurals>
<plurals name="ConversationListFragment_mute_plural">
<item quantity="one">Mute</item>
<item quantity="other">Mute</item>
</plurals>
<plurals name="ConversationListFragment_unmute_plural">
<item quantity="one">Unmute</item>
<item quantity="other">Unmute</item>
</plurals>
<string name="ConversationListFragment_pin">Pin</string>
<string name="ConversationListFragment_unpin">Unpin</string>
<string name="ConversationListFragment_mute">Mute</string>
<string name="ConversationListFragment_unmute">Unmute</string>
<string name="ConversationListFragment_select">Select</string>
<plurals name="ConversationListFragment_archive_plural">
<item quantity="one">Archive</item>
<item quantity="other">Archive</item>
</plurals>
<plurals name="ConversationListFragment_unarchive_plural">
<item quantity="one">Unarchive</item>
<item quantity="other">Unarchive</item>
</plurals>
<plurals name="ConversationListFragment_delete_plural">
<item quantity="one">Delete</item>
<item quantity="other">Delete</item>
</plurals>
<string name="ConversationListFragment_archive">Archive</string>
<string name="ConversationListFragment_unarchive">Unarchive</string>
<string name="ConversationListFragment_delete">Delete</string>
<string name="ConversationListFragment_select_all">Select all</string>
<plurals name="ConversationListFragment_s_selected">
<item quantity="one">%d selected</item>
Expand Down

0 comments on commit d02f605

Please sign in to comment.