From dbf77159771dd38310ddc0a6c045dfe38465fcdd Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 19 Feb 2021 10:05:24 +1100 Subject: [PATCH] missing translations (Fixes #445 & #446) --- .../securesms/conversation/ConversationActivity.java | 4 ++-- .../thoughtcrime/securesms/loki/activities/PathActivity.kt | 4 ++-- app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-ru/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 010eef08a1..deaaee2884 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -508,7 +508,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity DatabaseFactory.getLokiThreadDatabase(this).setDelegate(this); - inputPanel.setHint("Message"); + inputPanel.setHint(getResources().getString(R.string.ConversationActivity_message)); updateSessionRestoreBanner(); @@ -2624,7 +2624,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity if (recipient == null) { titleTextView.setText("Compose"); } else if (allUserDevices.contains(recipient.getAddress().toString().toLowerCase())) { - titleTextView.setText("Note to Self"); + titleTextView.setText(getResources().getString(R.string.note_to_self)); } else { boolean hasName = (recipient.getName() != null && !recipient.getName().isEmpty()); titleTextView.setText(hasName ? recipient.getName() : recipient.getAddress().toString()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt index 810cfbff52..0fc4c3d363 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt @@ -89,8 +89,8 @@ class PathActivity : PassphraseRequiredActionBarActivity() { val isGuardSnode = (OnionRequestAPI.guardSnodes.contains(snode)) getPathRow(snode, LineView.Location.Middle, index.toLong() * 1000 + 2000, dotAnimationRepeatInterval, isGuardSnode) } - val youRow = getPathRow("You", null, LineView.Location.Top, 1000, dotAnimationRepeatInterval) - val destinationRow = getPathRow("Destination", null, LineView.Location.Bottom, path.count().toLong() * 1000 + 2000, dotAnimationRepeatInterval) + val youRow = getPathRow(resources.getString(R.string.activity_path_device_row_title), null, LineView.Location.Top, 1000, dotAnimationRepeatInterval) + val destinationRow = getPathRow(resources.getString(R.string.activity_path_destination_row_title), null, LineView.Location.Bottom, path.count().toLong() * 1000 + 2000, dotAnimationRepeatInterval) val rows = listOf( youRow ) + pathRows + listOf( destinationRow ) for (row in rows) { pathRowsContainer.addView(row) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 518ae9d7c3..d562e0c62a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -128,6 +128,8 @@ Le destinataire n’est pas une adresse texto ou courriel valide ! Le message est vide ! Membres du groupe + Note à mon intention + Message Le destinataire est invalide ! Ajouté à l’écran d’accueil Appels non pris en charge diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4f8ad62386..a6fcf937f6 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -133,6 +133,8 @@ Адрес получателя не является ни номером телефона, ни адресом электронной почты. Пустое сообщение! Участники группы + Заметка для себя + Соощение Неверный получатель! Добавлено на главный экран Звонки не поддерживаются diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6737a7a7a2..0ff4e7f611 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -151,6 +151,8 @@ Recipient is not a valid SMS or email address! Message is empty! Group members + Note to self + Message Invalid recipient! Added to home screen