mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix conflict between plural and normal string keys.

fork-5.53.8
Greyson Parrelli 2021-10-25 08:34:51 -04:00
rodzic fae21e4dbb
commit ced05fe579
3 zmienionych plików z 31 dodań i 32 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

36
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
Wyświetl plik

@ -1078,21 +1078,21 @@ public class ConversationListFragment extends MainFragment implements ActionMode
if (!conversation.getThreadRecord().isArchived()) { if (!conversation.getThreadRecord().isArchived()) {
if (conversation.getThreadRecord().isRead()) { if (conversation.getThreadRecord().isRead()) {
items.add(new ActionItem(R.drawable.ic_unread_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unread, 1), () -> handleMarkAsUnread(id))); items.add(new ActionItem(R.drawable.ic_unread_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unread_plural, 1), () -> handleMarkAsUnread(id)));
} else { } else {
items.add(new ActionItem(R.drawable.ic_read_24, getResources().getQuantityString(R.plurals.ConversationListFragment_read, 1), () -> handleMarkAsRead(id))); items.add(new ActionItem(R.drawable.ic_read_24, getResources().getQuantityString(R.plurals.ConversationListFragment_read_plural, 1), () -> handleMarkAsRead(id)));
} }
if (conversation.getThreadRecord().isPinned()) { if (conversation.getThreadRecord().isPinned()) {
items.add(new ActionItem(R.drawable.ic_unpin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin, 1), () -> handleUnpin(id))); items.add(new ActionItem(R.drawable.ic_unpin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin_plural, 1), () -> handleUnpin(id)));
} else { } else {
items.add(new ActionItem(R.drawable.ic_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin, 1), () -> handlePin(Collections.singleton(conversation)))); items.add(new ActionItem(R.drawable.ic_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin_plural, 1), () -> handlePin(Collections.singleton(conversation))));
} }
if (conversation.getThreadRecord().getRecipient().live().get().isMuted()) { if (conversation.getThreadRecord().getRecipient().live().get().isMuted()) {
items.add(new ActionItem(R.drawable.ic_unmute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute, 1), () -> handleUnmute(Collections.singleton(conversation)))); items.add(new ActionItem(R.drawable.ic_unmute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute_plural, 1), () -> handleUnmute(Collections.singleton(conversation))));
} else { } else {
items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute, 1), () -> handleMute(Collections.singleton(conversation)))); items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, 1), () -> handleMute(Collections.singleton(conversation))));
} }
} }
@ -1103,12 +1103,12 @@ public class ConversationListFragment extends MainFragment implements ActionMode
})); }));
if (conversation.getThreadRecord().isArchived()) { if (conversation.getThreadRecord().isArchived()) {
items.add(new ActionItem(R.drawable.ic_unarchive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive, 1), () -> handleArchive(id, false))); items.add(new ActionItem(R.drawable.ic_unarchive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, 1), () -> handleArchive(id, false)));
} else { } else {
items.add(new ActionItem(R.drawable.ic_archive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive, 1), () -> handleArchive(id, false))); items.add(new ActionItem(R.drawable.ic_archive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, 1), () -> handleArchive(id, false)));
} }
items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete, 1), () -> handleDelete(id))); items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, 1), () -> handleDelete(id)));
new SignalContextMenu.Builder(view, list) new SignalContextMenu.Builder(view, list)
.offsetX(ViewUtil.dpToPx(12)) .offsetX(ViewUtil.dpToPx(12))
@ -1185,30 +1185,30 @@ public class ConversationListFragment extends MainFragment implements ActionMode
List<ActionItem> items = new ArrayList<>(); List<ActionItem> items = new ArrayList<>();
if (hasUnread) { if (hasUnread) {
items.add(new ActionItem(R.drawable.ic_read_24, getResources().getQuantityString(R.plurals.ConversationListFragment_read, count), () -> handleMarkAsRead(defaultAdapter.getBatchSelectionIds()))); items.add(new ActionItem(R.drawable.ic_read_24, getResources().getQuantityString(R.plurals.ConversationListFragment_read_plural, count), () -> handleMarkAsRead(defaultAdapter.getBatchSelectionIds())));
} else { } else {
items.add(new ActionItem(R.drawable.ic_unread_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unread, count), () -> handleMarkAsUnread(defaultAdapter.getBatchSelectionIds()))); items.add(new ActionItem(R.drawable.ic_unread_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unread_plural, count), () -> handleMarkAsUnread(defaultAdapter.getBatchSelectionIds())));
} }
if (!isArchived() && hasUnpinned && canPin) { if (!isArchived() && hasUnpinned && canPin) {
items.add(new ActionItem(R.drawable.ic_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin, count), () -> handlePin(defaultAdapter.getBatchSelection()))); items.add(new ActionItem(R.drawable.ic_pin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_pin_plural, count), () -> handlePin(defaultAdapter.getBatchSelection())));
} else if (!isArchived() && !hasUnpinned) { } else if (!isArchived() && !hasUnpinned) {
items.add(new ActionItem(R.drawable.ic_unpin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin, count), () -> handleUnpin(defaultAdapter.getBatchSelectionIds()))); items.add(new ActionItem(R.drawable.ic_unpin_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unpin_plural, count), () -> handleUnpin(defaultAdapter.getBatchSelectionIds())));
} }
if (isArchived()) { if (isArchived()) {
items.add(new ActionItem(R.drawable.ic_unarchive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive, count), () -> handleArchive(defaultAdapter.getBatchSelectionIds(), true))); items.add(new ActionItem(R.drawable.ic_unarchive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, count), () -> handleArchive(defaultAdapter.getBatchSelectionIds(), true)));
} else { } else {
items.add(new ActionItem(R.drawable.ic_archive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive, count), () -> handleArchive(defaultAdapter.getBatchSelectionIds(), true))); items.add(new ActionItem(R.drawable.ic_archive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, count), () -> handleArchive(defaultAdapter.getBatchSelectionIds(), true)));
} }
items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete, count), () -> handleDelete(defaultAdapter.getBatchSelectionIds()))); items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, count), () -> handleDelete(defaultAdapter.getBatchSelectionIds())));
if (hasUnmuted) { if (hasUnmuted) {
items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute, count), () -> handleMute(defaultAdapter.getBatchSelection()))); items.add(new ActionItem(R.drawable.ic_mute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_mute_plural, count), () -> handleMute(defaultAdapter.getBatchSelection())));
} else { } else {
items.add(new ActionItem(R.drawable.ic_unmute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute, count), () -> handleUnmute(defaultAdapter.getBatchSelection()))); items.add(new ActionItem(R.drawable.ic_unmute_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unmute_plural, count), () -> handleUnmute(defaultAdapter.getBatchSelection())));
} }
items.add(new ActionItem(R.drawable.ic_select_24, getString(R.string.ConversationListFragment_select_all), this::handleSelectAllThreads)); items.add(new ActionItem(R.drawable.ic_select_24, getString(R.string.ConversationListFragment_select_all), this::handleSelectAllThreads));

4
app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewPageFragment.java
Wyświetl plik

@ -320,13 +320,13 @@ public final class MediaOverviewPageFragment extends Fragment
int selectionCount = getListAdapter().getSectionCount(); int selectionCount = getListAdapter().getSectionCount();
bottomActionBar.setItems(Arrays.asList( bottomActionBar.setItems(Arrays.asList(
new ActionItem(R.drawable.ic_save_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_save, selectionCount), () -> { new ActionItem(R.drawable.ic_save_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_save_plural, selectionCount), () -> {
MediaActions.handleSaveMedia(MediaOverviewPageFragment.this, MediaActions.handleSaveMedia(MediaOverviewPageFragment.this,
getListAdapter().getSelectedMedia(), getListAdapter().getSelectedMedia(),
this::exitMultiSelect); this::exitMultiSelect);
}), }),
new ActionItem(R.drawable.ic_select_24, getString(R.string.MediaOverviewActivity_select_all), this::handleSelectAllMedia), new ActionItem(R.drawable.ic_select_24, getString(R.string.MediaOverviewActivity_select_all), this::handleSelectAllMedia),
new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_delete, selectionCount), () -> { new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.MediaOverviewActivity_delete_plural, selectionCount), () -> {
MediaActions.handleDeleteMedia(requireContext(), getListAdapter().getSelectedMedia()); MediaActions.handleDeleteMedia(requireContext(), getListAdapter().getSelectedMedia());
exitMultiSelect(); exitMultiSelect();
}) })

23
app/src/main/res/values/strings.xml
Wyświetl plik

@ -364,41 +364,40 @@
<item quantity="one">Moved conversation to inbox</item> <item quantity="one">Moved conversation to inbox</item>
<item quantity="other">Moved %d conversations to inbox</item> <item quantity="other">Moved %d conversations to inbox</item>
</plurals> </plurals>
<string name="ConversationListFragment_read">Read</string> <plurals name="ConversationListFragment_read_plural">
<plurals name="ConversationListFragment_read">
<item quantity="one">Read</item> <item quantity="one">Read</item>
<item quantity="other">Read</item> <item quantity="other">Read</item>
</plurals> </plurals>
<plurals name="ConversationListFragment_unread"> <plurals name="ConversationListFragment_unread_plural">
<item quantity="one">Unread</item> <item quantity="one">Unread</item>
<item quantity="other">Unread</item> <item quantity="other">Unread</item>
</plurals> </plurals>
<plurals name="ConversationListFragment_pin"> <plurals name="ConversationListFragment_pin_plural">
<item quantity="one">Pin</item> <item quantity="one">Pin</item>
<item quantity="other">Pin</item> <item quantity="other">Pin</item>
</plurals> </plurals>
<plurals name="ConversationListFragment_unpin"> <plurals name="ConversationListFragment_unpin_plural">
<item quantity="one">Unpin</item> <item quantity="one">Unpin</item>
<item quantity="other">Unpin</item> <item quantity="other">Unpin</item>
</plurals> </plurals>
<plurals name="ConversationListFragment_mute"> <plurals name="ConversationListFragment_mute_plural">
<item quantity="one">Mute</item> <item quantity="one">Mute</item>
<item quantity="other">Mute</item> <item quantity="other">Mute</item>
</plurals> </plurals>
<plurals name="ConversationListFragment_unmute"> <plurals name="ConversationListFragment_unmute_plural">
<item quantity="one">Unmute</item> <item quantity="one">Unmute</item>
<item quantity="other">Unmute</item> <item quantity="other">Unmute</item>
</plurals> </plurals>
<string name="ConversationListFragment_select">Select</string> <string name="ConversationListFragment_select">Select</string>
<plurals name="ConversationListFragment_archive"> <plurals name="ConversationListFragment_archive_plural">
<item quantity="one">Archive</item> <item quantity="one">Archive</item>
<item quantity="other">Archive</item> <item quantity="other">Archive</item>
</plurals> </plurals>
<plurals name="ConversationListFragment_unarchive"> <plurals name="ConversationListFragment_unarchive_plural">
<item quantity="one">Unarchive</item> <item quantity="one">Unarchive</item>
<item quantity="other">Unarchive</item> <item quantity="other">Unarchive</item>
</plurals> </plurals>
<plurals name="ConversationListFragment_delete"> <plurals name="ConversationListFragment_delete_plural">
<item quantity="one">Delete</item> <item quantity="one">Delete</item>
<item quantity="other">Delete</item> <item quantity="other">Delete</item>
</plurals> </plurals>
@ -973,11 +972,11 @@
<string name="MediaOverviewActivity_List_view_description">List view</string> <string name="MediaOverviewActivity_List_view_description">List view</string>
<string name="MediaOverviewActivity_Selected_description">Selected</string> <string name="MediaOverviewActivity_Selected_description">Selected</string>
<string name="MediaOverviewActivity_select_all">Select all</string> <string name="MediaOverviewActivity_select_all">Select all</string>
<plurals name="MediaOverviewActivity_save"> <plurals name="MediaOverviewActivity_save_plural">
<item quantity="one">Save</item> <item quantity="one">Save</item>
<item quantity="other">Save</item> <item quantity="other">Save</item>
</plurals> </plurals>
<plurals name="MediaOverviewActivity_delete"> <plurals name="MediaOverviewActivity_delete_plural">
<item quantity="one">Delete</item> <item quantity="one">Delete</item>
<item quantity="other">Delete</item> <item quantity="other">Delete</item>
</plurals> </plurals>