TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-28 10:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #449 from Brice-W/translations-labels

Browse Source 
Hardcoded labels replaced with translations (Fixes #445 & #446)
This commit is contained in:
Niels Andriesse 2021-02-19 13:47:29 +11:00 committed by GitHub
commit d41725556d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -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());

4
app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
View File

@ -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)

2
app/src/main/res/values-fr/strings.xml
View File

@ -128,6 +128,8 @@
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Le destinataire n’est pas une adresse texto ou courriel valide !</string>
<string name="ConversationActivity_message_is_empty_exclamation">Le message est vide !</string>
<string name="ConversationActivity_group_members">Membres du groupe</string>
<string name="ConversationActivity_note_to_self">Note à mon intention</string>
<string name="ConversationActivity_message">Message</string>
<string name="ConversationActivity_invalid_recipient">Le destinataire est invalide !</string>
<string name="ConversationActivity_added_to_home_screen">Ajouté à l’écran d’accueil</string>
<string name="ConversationActivity_calls_not_supported">Appels non pris en charge</string>

2
app/src/main/res/values-ru/strings.xml
View File

@ -133,6 +133,8 @@
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Адрес получателя не является ни номером телефона, ни адресом электронной почты.</string>
<string name="ConversationActivity_message_is_empty_exclamation">Пустое сообщение!</string>
<string name="ConversationActivity_group_members">Участники группы</string>
<string name="ConversationActivity_note_to_self">Заметка для себя</string>
<string name="ConversationActivity_message">Соощение</string>
<string name="ConversationActivity_invalid_recipient">Неверный получатель!</string>
<string name="ConversationActivity_added_to_home_screen">Добавлено на главный экран</string>
<string name="ConversationActivity_calls_not_supported">Звонки не поддерживаются</string>

2
app/src/main/res/values/strings.xml
View File

@ -151,6 +151,8 @@
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Recipient is not a valid SMS or email address!</string>
<string name="ConversationActivity_message_is_empty_exclamation">Message is empty!</string>
<string name="ConversationActivity_group_members">Group members</string>
<string name="ConversationActivity_note_to_self">Note to self</string>
<string name="ConversationActivity_message">Message</string>
<string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
<string name="ConversationActivity_added_to_home_screen">Added to home screen</string>