From 9456ba6f569396d3e3040971a7a0480c59b2a7e5 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 3 Apr 2023 13:15:57 +0200 Subject: [PATCH] put timestamp in all call logs --- .../eu/siacs/conversations/ui/adapter/MessageAdapter.java | 6 +++--- src/main/res/values-bg/strings.xml | 2 -- src/main/res/values-ca/strings.xml | 2 -- src/main/res/values-cs/strings.xml | 2 -- src/main/res/values-da-rDK/strings.xml | 2 -- src/main/res/values-de/strings.xml | 2 -- src/main/res/values-el/strings.xml | 2 -- src/main/res/values-es/strings.xml | 2 -- src/main/res/values-fi/strings.xml | 2 -- src/main/res/values-fr/strings.xml | 2 -- src/main/res/values-gl/strings.xml | 2 -- src/main/res/values-hu/strings.xml | 2 -- src/main/res/values-it/strings.xml | 2 -- src/main/res/values-ja/strings.xml | 2 -- src/main/res/values-pl/strings.xml | 2 -- src/main/res/values-pt-rBR/strings.xml | 2 -- src/main/res/values-ro-rRO/strings.xml | 2 -- src/main/res/values-ru/strings.xml | 2 -- src/main/res/values-sk/strings.xml | 2 -- src/main/res/values-sq-rAL/strings.xml | 2 -- src/main/res/values-sv/strings.xml | 2 -- src/main/res/values-szl/strings.xml | 2 -- src/main/res/values-tr-rTR/strings.xml | 2 -- src/main/res/values-uk/strings.xml | 2 -- src/main/res/values-vi/strings.xml | 2 -- src/main/res/values-zh-rCN/strings.xml | 2 -- src/main/res/values-zh-rTW/strings.xml | 2 -- src/main/res/values/strings.xml | 5 +++-- 28 files changed, 6 insertions(+), 57 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index fb7aec14d..93b3dd303 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -696,7 +696,7 @@ public class MessageAdapter extends ArrayAdapter { final long duration = rtpSessionStatus.duration; if (received) { if (duration > 0) { - viewHolder.status_message.setText(activity.getString(R.string.incoming_call_duration, TimeFrameUtils.resolve(activity, duration))); + viewHolder.status_message.setText(activity.getString(R.string.incoming_call_duration_timestamp, TimeFrameUtils.resolve(activity, duration), UIHelper.readableTimeDifferenceFull(activity, message.getTimeSent()))); } else if (rtpSessionStatus.successful) { viewHolder.status_message.setText(R.string.incoming_call); } else { @@ -704,9 +704,9 @@ public class MessageAdapter extends ArrayAdapter { } } else { if (duration > 0) { - viewHolder.status_message.setText(activity.getString(R.string.outgoing_call_duration, TimeFrameUtils.resolve(activity, duration))); + viewHolder.status_message.setText(activity.getString(R.string.outgoing_call_duration_timestamp, TimeFrameUtils.resolve(activity, duration), UIHelper.readableTimeDifferenceFull(activity, message.getTimeSent()))); } else { - viewHolder.status_message.setText(R.string.outgoing_call); + viewHolder.status_message.setText(activity.getString(R.string.outgoing_call_timestamp, UIHelper.readableTimeDifferenceFull(activity, message.getTimeSent()))); } } viewHolder.indicatorReceived.setImageResource(RtpSessionStatus.getDrawable(received, rtpSessionStatus.successful, isDarkTheme)); diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 4e35dfeee..e0b7643ad 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -915,10 +915,8 @@ Текущо видео-обаждане Изключете Tor, за да правите обаждания Входящо обаждане - Входящо обаждане · %s Пропуснато обаждане · %s Изходящо обаждане - Изходящо обаждане · %s Пропуснато обаждане Гласово обаждане Видео обаждане diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 77aa21314..96fd125ff 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -893,9 +893,7 @@ que l\'administrador del servidor llegeixi els missatges, però pot ser l\'únic Trucada de vídeo en curs Desactivar Tor per a fer trucades Trucada entrant - Trucada entrant · %s Trucada sortint - Trucada sortint · %s Trucada perduda Trucada de veu Trucada de vídeo diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 0c260a207..6f80dfb63 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -922,10 +922,8 @@ Probíhající videohovor Zakázat hovory přes Tor Příchozí hovor - Příchozí hovor · %s Zmeškané volání · %s Odchozí hovor - Odchozí hovor · %s Zmeškané volání Hovor Videohovor diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml index 48348e0c5..10204f1b4 100644 --- a/src/main/res/values-da-rDK/strings.xml +++ b/src/main/res/values-da-rDK/strings.xml @@ -930,10 +930,8 @@ Forbinder igen videoopkald Deaktiver TOR for at lave opkald Indkommende opkald - Indkommende opkald · %s Mistet opkald · %s Udgående opkald - Udgående opkald · %s Mistet opkald %1$d mistet opkald fra %2$s diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 181b7f104..7118d09f4 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -932,10 +932,8 @@ Videoanruf erneut verbinden Deaktiviere Tor, um Anrufe zu tätigen Eingehender Anruf - Eingehender Anruf · %s Entgangener Anruf · %s Ausgehender Anruf - Ausgehender Anruf · %s Entgangener Anruf %1$d entgangener Anruf von %2$s diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 42fca0db9..9bc6fccf6 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -921,10 +921,8 @@ Επανασύνδεση βίντεοκλήσης Απενεργοποίηστε το Tor για να κάνετε κλήσεις Εισερχόμενη κλήση - Εισερχόμενη κλήση · %s Αναπάντηση κλήση · %s Εξερχόμενη κλήση - Εξερχόμενη κλήση · %s Αναπάντηση κλήση Κλήση ήχου Βιντεοκλήση diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index c87bb2601..1fddf94e8 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -941,10 +941,8 @@ Reconectando video llamada Deshabilitar Tor para hacer llamadas Llamada entrante - Llamada entrante · %s Llamada perdida · %s Llamada saliente - Video llamada saliente · %s Llamada perdida %1$d llamada perdida de %2$s diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 249bb7678..2df38d21f 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -864,10 +864,8 @@ Videopuhelu kesken Poista Tor käytöstä soittaaksesi puhelun Saapuva puhelu - Saapuva puhelu · %s Vastaamaton puhelu · %s Lähtevä puhelu - Lähtevä puhelu · %s Vastaamaton puhelu Äänipuhelu Videopuhelu diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 2193db65c..671c18098 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -922,10 +922,8 @@ En cours de reconnexion de l\'appel vidéo Désactivez Tor afin de passer des appels Appel entrant - Appel entrant · %s Appel manqué · %s Appel sortant - Appel sortant · %s Appel manqué Appel audio Appel vidéo diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 04fb3351e..5eb512676 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -935,10 +935,8 @@ Reconectando a videochamada Desactivar Tor para facer chamadas Chamada entrante - Conversa de · %s Chamada perdida · %s Chamada realizada - Conversa de · %s Chamada perdida %1$d chamada perdida de %2$s diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index 0b4c831f4..fe859309d 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -881,9 +881,7 @@ Kimenő videohívás Tor letiltása a hívások indításához Bejövő hívás - Bejövő hívás · %s Kimenő hívás - Kimenő hívás · %s Nem fogadott hívás Hanghívás Videohívás diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index f1b8b3520..9d9dad811 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -941,10 +941,8 @@ Riconnessione chiamata video Disattiva Tor per le chiamate Chiamata in arrivo - Chiamata in arrivo · %s Chiamata persa · %s Chiamata in uscita - Chiamata in uscita · %s Chiamata persa %1$d chiamata persa da %2$s diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 534485d03..53f0053f5 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -914,10 +914,8 @@ ビデオ通話再接続中 通話するのに Tor を無効化 着信通話 - 着信通話・%s 不在着信通話・%s 発信通話 - 発信通話・%s 不在着信通話 %2$sから%1$d件の不在着信 diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 09bfc9c19..d6b78d141 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -955,10 +955,8 @@ Ponowne łączenie rozmowy wideo Wyłącz Tor aby dzwonić Połączenie przychodzące - Połączenie przychodzące · %s Nieodebrane połączenie · %s Połączenie wychodzące - Połączenie wychodzące · %s Nieodebrane połączenie %1$d nieodebrana rozmowa od %2$s diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index cab778c91..d24843306 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -941,10 +941,8 @@ Reconectando a vídeo-chamada Desabilitar o Tor para fazer chamadas Chamada recebida - Chamada recebida · %s Chamada perdida · %s Chamada realizada - Chamada realizada · %s Chamada perdida %1$d chamada perdida para %2$s diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index 307e33901..5fcb2c025 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -949,10 +949,8 @@ Reconectare apel video Dezactivați Tor pentru a face apeluri Apel primit - Apel primit · %s Apel pierdut · %s Apel efectuat - Apel efectuat · %s Apel pierdut %1$d apel pierdut de la %2$s diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index b0f9d0884..b471ac8bf 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -930,10 +930,8 @@ Активный видеовызов Отключите Tor для совершения звонков Входящий вызов - Входящий вызов · %s Пропущенный вызов · %s Исходящий вызов - Исходящий вызов · %s Пропущен вызов Аудиовызов Видеовызов diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index e63f51f24..5a6e75329 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -511,10 +511,8 @@ Prebiehajúci hovor Prebiehajúci video hovor Prichádzajúci hovor - Prichádzajúci hovor - %s Zmeškaný hovor - %s Odchádzajúci hovor - Odchádzajúci hovor - %s Zmeškaný hovor Hlasový hovor Video hovor diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml index e9559056d..c27cbce88 100644 --- a/src/main/res/values-sq-rAL/strings.xml +++ b/src/main/res/values-sq-rAL/strings.xml @@ -727,10 +727,8 @@ Po rilidhet thirrje video Që të bëni thirrje, çaktivizoni Tor-in Thirrje ardhëse - Thirrje ardhëse · %s Thirrje e humbur · %s Thirrje për - Thirrje për · %s Thirrje e humbur %1$d thirrje e humbur, prej %2$s diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index c922e4dc8..ff3bc2798 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -877,10 +877,8 @@ Återansluter videosamtalet Inaktivera Tor för att ringa samtal Inkommande samtal - Inkommande samtal · %s Missat samtal · %s Utgående samtal - Pågående samtal · %s Missat samtal Röstsamtal Videosamtal diff --git a/src/main/res/values-szl/strings.xml b/src/main/res/values-szl/strings.xml index 2d65df8ab..532ca082c 100644 --- a/src/main/res/values-szl/strings.xml +++ b/src/main/res/values-szl/strings.xml @@ -964,10 +964,8 @@ Łōnczynie zaś Zastow Tor coby zwōnić Połōnczynie przichodzōnce - Połōnczynie przichodzōnce · %s Niyôdebrane · %s Połōnczynie wychodzōnce - Połōnczynie wychodzōnce · %s Niyôdebrane połōnczynie Połōnczynie audio Połōnczynie wideo diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml index 17fced25a..9ac08990e 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -924,10 +924,8 @@ Görüntülü aramaya tekrar bağlanılıyor Arama yapmak için Tor\'u devre dışı bırak Gelen arama - Gelen arama. %s Cevapsız çağrı. %s Yapılan arama - Yapılan arama. %s Cevapsız arama %2$s tarafından %1$d cevapsız çağrı diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 870ef1dbd..d856569db 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -895,9 +895,7 @@ Активний відеовиклик Вимкнути ToR для здійснення викликів Вхідний виклик - Вхідний виклик · %s Вихідний виклик - Вихідний виклик · %s Пропущені виклики Голосовий виклик Відеовиклик diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 761577f89..4d65268ba 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -905,10 +905,8 @@ Cuộc gọi video đang diễn ra Tắt Tor để tạo cuộc gọi Cuộc gọi đến - Cuộc gọi đến · %s Cuộc gọi nhỡ · %s Cuộc gọi đi - Cuộc gọi đi · %s Cuộc gọi nhỡ Cuộc gọi âm thanh Cuộc gọi video diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index ae4332ec1..70a64995a 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -928,10 +928,8 @@ 重连视频通话 禁用Tor以拨打电话 来电 - 来电 · %s 错过的通话 · %s 去电 - 去电 · %s 未接电话 %1$d 错过了来自 %2$s 的电话 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 2800f8a36..77c9c5da3 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -873,10 +873,8 @@ 視像通話重新連接中 關閉 Tor 以進行通話 來電 - 來電 %s 未接來電 %s 撥出通話 - 撥出通話 %s 未接來電 來自 %2$s 的 %1$d 個未接來電 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 27134c0ad..8945909dc 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -933,10 +933,11 @@ Reconnecting video call Disable Tor to make calls Incoming call - Incoming call · %s + Incoming call (%s) · %s + Outgoing call (%s) · %s Missed call · %s Outgoing call - Outgoing call · %s + Outgoing call · %s Missed call %1$d missed call from %2$s