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

Fix translation issue with media preview. 

Fixes #12072
Closes #12092
fork-5.53.8
Sgn-32 2022-03-25 12:12:23 -04:00 zatwierdzone przez Greyson Parrelli
rodzic cb77165b53
commit 745dfc3fbb
2 zmienionych plików z 12 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
Wyświetl plik

@ -203,26 +203,25 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
else from = "";
if (showThread) {
String to = null;
String titleText = null;
Recipient threadRecipient = mediaItem.threadRecipient;
if (threadRecipient != null) {
if (mediaItem.outgoing || threadRecipient.isGroup()) {
if (threadRecipient.isSelf()) {
from = getString(R.string.note_to_self);
} else {
to = threadRecipient.getDisplayName(this);
if (mediaItem.outgoing) {
return getString(R.string.MediaPreviewActivity_you_to_s, to);
}
if (threadRecipient.isSelf()) {
titleText = getString(R.string.note_to_self);
} else {
titleText = getString(R.string.MediaPreviewActivity_you_to_s, threadRecipient.getDisplayName(this));
}
} else {
return getString(R.string.MediaPreviewActivity_s_to_you, from);
if (threadRecipient.isGroup()) {
titleText = getString(R.string.MediaPreviewActivity_s_to_s, from, threadRecipient.getDisplayName(this));
} else {
titleText = getString(R.string.MediaPreviewActivity_s_to_you, from);
}
}
return to != null ? getString(R.string.MediaPreviewActivity_s_to_s, from, to)
: from;
}
return titleText != null ? titleText : from;
} else {
return from;
}

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

@ -1850,8 +1850,8 @@
<string name="MediaPreviewActivity_s_to_s">%1$s to %2$s</string>
<!-- All media preview title when viewing media send by you to another recipient (allows changing of 'You' based on context) -->
<string name="MediaPreviewActivity_you_to_s">You to %1$s</string>
<!-- ALl media preview title when viewing media sent by another recipient to you (allows changing of 'You' based on context) -->
<string name="MediaPreviewActivity_s_to_you">%1$s to You</string>
<!-- All media preview title when viewing media sent by another recipient to you (allows changing of 'You' based on context) -->
<string name="MediaPreviewActivity_s_to_you">%1$s to you</string>
<string name="MediaPreviewActivity_media_no_longer_available">Media no longer available.</string>
<string name="MediaPreviewActivity_cant_find_an_app_able_to_share_this_media">Can\'t find an app able to share this media.</string>