WIP

session-foundation · Jul 26, 2024 · 4bc9d09 · 4bc9d09
1 parent 3cee4bc
commit 4bc9d09
Show file tree

Hide file tree

Showing 113 changed files with 7 additions and 385 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
@@ -318,7 +318,7 @@ fun PreviewMessageDetails(
         MessageDetails(
             state = MessageDetailsState(
                 nonImageAttachmentFileDetails = listOf(
-                    TitledText(R.string.message_details_header__file_id, "Screen Shot 2023-07-06 at 11.35.50 am.png"),
+                    TitledText(R.string.attachmentsFileId, "Screen Shot 2023-07-06 at 11.35.50 am.png"),
                     TitledText(R.string.attachmentsFileType, "image/png"),
                     TitledText(R.string.attachmentsFileSize, "195.6kB"),
                     TitledText(R.string.attachmentsResolution, "342x312"),

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
@@ -90,7 +90,7 @@ class MessageDetailsViewModel @Inject constructor(
 
     private val Slide.details: List<TitledText>
         get() = listOfNotNull(
-            fileName.orNull()?.let { TitledText(R.string.message_details_header__file_id, it) },
+            fileName.orNull()?.let { TitledText(R.string.attachmentsFileId, it) },
             TitledText(R.string.attachmentsFileType, asAttachment().contentType),
             TitledText(R.string.attachmentsFileSize, Util.getPrettyFileSize(fileSize)),
             takeIf { it is ImageSlide }

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt
@@ -149,10 +149,8 @@ object DateUtils : android.text.format.DateUtils() {
     ): String {
         return if (isToday(timestamp)) {
             getLocalisedRelativeDayString(RelativeDay.TODAY)
-            //context.getString(R.string.DateUtils_today) // ACL REMOVE WHEN HAPPY
         } else if (isYesterday(timestamp)) {
             getLocalisedRelativeDayString(RelativeDay.YESTERDAY)
-            //context.getString(R.string.DateUtils_yesterday) // ACL REMOVE WHEN HAPPY
         } else {
             getFormattedDateTime(timestamp, "EEE, MMM d, yyyy", locale)
         }

diff --git a/app/src/main/res/menu/menu_apply.xml b/app/src/main/res/menu/menu_apply.xml
@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="@string/menu_apply_button"
+        android:title="@string/set"
         android:id="@+id/applyButton"
         android:icon="?menu_accept_icon"
         app:showAsAction="always|withText"/>

diff --git a/app/src/main/res/menu/menu_edit_closed_group.xml b/app/src/main/res/menu/menu_edit_closed_group.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_apply"
-        android:title="@string/menu_apply_button"
+        android:title="@string/set"
         android:contentDescription="@string/AccessibilityId_apply_changes"
         app:showAsAction="always|withText" />
 

diff --git a/libsession/src/main/res/values-ar-rSA/strings.xml b/libsession/src/main/res/values-ar-rSA/strings.xml
@@ -38,7 +38,6 @@
     <string name="none">لا شيء </string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">الآن</string>
-    <string name="DateUtils_yesterday">البارحة</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -74,7 +73,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session غير مقفول</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">أنت</string>
     <string name="draft">مسودة:</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">اعتبرها مقروءة</string>
@@ -133,7 +131,6 @@
     <string name="notificationsMute2Hours">كتم لمدة ساعتين</string>
     <string name="notificationsMute1Day">كتم لمدة يوم</string>
     <string name="notificationsContentShowNameOnly">الاسم فقط</string>
-    <string name="arrays__images">صور</string>
     <string name="audio">صوت</string>
     <string name="video">فيديو</string>
     <string name="max">الأقصى</string>
@@ -219,7 +216,6 @@
     <string name="qrCode">رمز QR</string>
     <string name="contactsContacts">متصلين</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">طبِق</string>
     <string name="done">تم</string>
     <string name="groupEdit">عَدِل المجموعة</string>
     <string name="contactSelect">اِختر متصلين</string>

diff --git a/libsession/src/main/res/values-ar/strings.xml b/libsession/src/main/res/values-ar/strings.xml
@@ -38,7 +38,6 @@
     <string name="none">لا شيء </string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">الآن</string>
-    <string name="DateUtils_yesterday">البارحة</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -74,7 +73,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session غير مقفول</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">أنت</string>
     <string name="draft">مسودة:</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">اعتبرها مقروءة</string>
@@ -133,7 +131,6 @@
     <string name="notificationsMute2Hours">كتم لمدة ساعتين</string>
     <string name="notificationsMute1Day">كتم لمدة يوم</string>
     <string name="notificationsContentShowNameOnly">الاسم فقط</string>
-    <string name="arrays__images">صور</string>
     <string name="audio">صوت</string>
     <string name="video">فيديو</string>
     <string name="max">الأقصى</string>
@@ -219,7 +216,6 @@
     <string name="qrCode">رمز QR</string>
     <string name="contactsContacts">متصلين</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">طبِق</string>
     <string name="done">تم</string>
     <string name="groupEdit">عَدِل المجموعة</string>
     <string name="contactSelect">اِختر متصلين</string>

diff --git a/libsession/src/main/res/values-az-rAZ/strings.xml b/libsession/src/main/res/values-az-rAZ/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Heç biri</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">İndi</string>
-    <string name="DateUtils_yesterday">Dünən</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session-ın kilidi açıldı</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Siz</string>
     <string name="draft">Qaralama</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Oxundu olaraq işarələ</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 saatlıq səssizə al</string>
     <string name="notificationsMute1Day">1 günlük səssizə al</string>
     <string name="notificationsContentShowNameOnly">Yalnız ad</string>
-    <string name="arrays__images">Təsvirlər</string>
     <string name="audio">Səs</string>
     <string name="video">Video</string>
     <string name="max">Maksimum</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR Kod</string>
     <string name="contactsContacts">Əlaqələr</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Tətbiq et</string>
     <string name="done">Bitdi</string>
     <string name="groupEdit">Qrupa düzəliş et</string>
     <string name="contactSelect">Əlaqələri seç</string>

diff --git a/libsession/src/main/res/values-az/strings.xml b/libsession/src/main/res/values-az/strings.xml
@@ -34,7 +34,6 @@
     <string name="none">Heç biri</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">İndi</string>
-    <string name="DateUtils_yesterday">Dünən</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -70,7 +69,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session-ın kilidi açıldı</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Siz</string>
     <string name="draft">Qaralama</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Oxundu olaraq işarələ</string>
@@ -129,7 +127,6 @@
     <string name="notificationsMute2Hours">2 saatlıq səssizə al</string>
     <string name="notificationsMute1Day">1 günlük səssizə al</string>
     <string name="notificationsContentShowNameOnly">Yalnız ad</string>
-    <string name="arrays__images">Təsvirlər</string>
     <string name="audio">Səs</string>
     <string name="video">Video</string>
     <string name="max">Maksimum</string>
@@ -215,7 +212,6 @@
     <string name="qrCode">QR Kod</string>
     <string name="contactsContacts">Əlaqələr</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Tətbiq et</string>
     <string name="done">Bitdi</string>
     <string name="groupEdit">Qrupa düzəliş et</string>
     <string name="contactSelect">Əlaqələri seç</string>

diff --git a/libsession/src/main/res/values-bal-rBA/strings.xml b/libsession/src/main/res/values-bal-rBA/strings.xml
@@ -27,7 +27,6 @@
     <string name="none">Kosong</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Sekarang</string>
-    <string name="DateUtils_yesterday">Kemarin</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -63,7 +62,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session tidak terkunci</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Anda</string>
     <string name="draft">Draf</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Tandai sudah dibaca</string>
@@ -118,7 +116,6 @@
     <string name="notificationsMute2Hours">Bisukan selama 2 jam</string>
     <string name="notificationsMute1Day">Bisukan selama 1 hari</string>
     <string name="notificationsContentShowNameOnly">Nama saja</string>
-    <string name="arrays__images">Gambar</string>
     <string name="max">Maks</string>
     <!-- plurals.xml -->
     <!-- preferences.xml -->

diff --git a/libsession/src/main/res/values-bal/strings.xml b/libsession/src/main/res/values-bal/strings.xml
@@ -27,7 +27,6 @@
     <string name="none">Kosong</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Sekarang</string>
-    <string name="DateUtils_yesterday">Kemarin</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -63,7 +62,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session tidak terkunci</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Anda</string>
     <string name="draft">Draf</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Tandai sudah dibaca</string>
@@ -118,7 +116,6 @@
     <string name="notificationsMute2Hours">Bisukan selama 2 jam</string>
     <string name="notificationsMute1Day">Bisukan selama 1 hari</string>
     <string name="notificationsContentShowNameOnly">Nama saja</string>
-    <string name="arrays__images">Gambar</string>
     <string name="max">Maks</string>
     <!-- plurals.xml -->
     <!-- preferences.xml -->

diff --git a/libsession/src/main/res/values-bg-rBG/strings.xml b/libsession/src/main/res/values-bg-rBG/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Нищо</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Току що</string>
-    <string name="DateUtils_yesterday">Вчера</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session е отключен</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ти</string>
     <string name="draft">Чернова</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Прочетено</string>
@@ -125,7 +123,6 @@
     <string name="notificationsMute2Hours">Тих режим за 2 часа</string>
     <string name="notificationsMute1Day">Тих режим за 1 ден</string>
     <string name="notificationsContentShowNameOnly">Само име</string>
-    <string name="arrays__images">Изображения</string>
     <string name="audio">Аудио</string>
     <string name="video">Видео</string>
     <string name="max">Максимално</string>

diff --git a/libsession/src/main/res/values-bg/strings.xml b/libsession/src/main/res/values-bg/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Нищо</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Току що</string>
-    <string name="DateUtils_yesterday">Вчера</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session е отключен</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Ти</string>
     <string name="draft">Чернова</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Прочетено</string>
@@ -125,7 +123,6 @@
     <string name="notificationsMute2Hours">Тих режим за 2 часа</string>
     <string name="notificationsMute1Day">Тих режим за 1 ден</string>
     <string name="notificationsContentShowNameOnly">Само име</string>
-    <string name="arrays__images">Изображения</string>
     <string name="audio">Аудио</string>
     <string name="video">Видео</string>
     <string name="max">Максимално</string>

diff --git a/libsession/src/main/res/values-ca-rES/strings.xml b/libsession/src/main/res/values-ca-rES/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Cap</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Ara</string>
-    <string name="DateUtils_yesterday">Ahir</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">S\'ha desblocat el Session</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Jo</string>
     <string name="draft">Esborrany</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marca\'l com a llegit</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">Silencia-ho durant 2 hores</string>
     <string name="notificationsMute1Day">Silencia-ho durant 1 dia</string>
     <string name="notificationsContentShowNameOnly">Només el nom</string>
-    <string name="arrays__images">Imatges</string>
     <string name="audio">Àudio</string>
     <string name="video">Vídeo</string>
     <string name="max">Màxima</string>
@@ -210,7 +207,6 @@
     <string name="qrCode">Codi QR</string>
     <string name="contactsContacts">Contactes</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Aplica</string>
     <string name="done">Fet</string>
     <string name="groupEdit">Edita el Grup</string>
     <string name="contactSelect">Selecciona contactes</string>

diff --git a/libsession/src/main/res/values-ca/strings.xml b/libsession/src/main/res/values-ca/strings.xml
@@ -33,7 +33,6 @@
     <string name="none">Cap</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Ara</string>
-    <string name="DateUtils_yesterday">Ahir</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -69,7 +68,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">S\'ha desblocat el Session</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Jo</string>
     <string name="draft">Esborrany</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Marca\'l com a llegit</string>
@@ -128,7 +126,6 @@
     <string name="notificationsMute2Hours">Silencia-ho durant 2 hores</string>
     <string name="notificationsMute1Day">Silencia-ho durant 1 dia</string>
     <string name="notificationsContentShowNameOnly">Només el nom</string>
-    <string name="arrays__images">Imatges</string>
     <string name="audio">Àudio</string>
     <string name="video">Vídeo</string>
     <string name="max">Màxima</string>
@@ -210,7 +207,6 @@
     <string name="qrCode">Codi QR</string>
     <string name="contactsContacts">Contactes</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Aplica</string>
     <string name="done">Fet</string>
     <string name="groupEdit">Edita el Grup</string>
     <string name="contactSelect">Selecciona contactes</string>

diff --git a/libsession/src/main/res/values-cs-rCZ/strings.xml b/libsession/src/main/res/values-cs-rCZ/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Nic</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Teď</string>
-    <string name="DateUtils_yesterday">Včera</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session je odemčen</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vy</string>
     <string name="draft">Koncept</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Označit jako přečtené</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Ztišit na 2 hodiny</string>
     <string name="notificationsMute1Day">Ztišit na 1 den</string>
     <string name="notificationsContentShowNameOnly">Pouze jméno</string>
-    <string name="arrays__images">Obrázky</string>
     <string name="audio">Zvuk</string>
     <string name="video">Video</string>
     <string name="max">Maximum</string>
@@ -217,7 +214,6 @@
     <string name="qrCode">QR kód</string>
     <string name="contactsContacts">Kontakty</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Použít</string>
     <string name="done">Hotovo</string>
     <string name="groupEdit">Upravit skupinu</string>
     <string name="contactSelect">Vyber kontakty</string>

diff --git a/libsession/src/main/res/values-cs/strings.xml b/libsession/src/main/res/values-cs/strings.xml
@@ -36,7 +36,6 @@
     <string name="none">Nic</string>
     <!-- DateUtils -->
     <string name="DateUtils_just_now">Teď</string>
-    <string name="DateUtils_yesterday">Včera</string>
     <!-- DeviceListItem -->
     <!-- DocumentView -->
     <!-- GiphyActivity -->
@@ -72,7 +71,6 @@
     <!-- KeyCachingService -->
     <string name="lockAppUnlocked">Session je odemčen</string>
     <!-- MediaPreviewActivity -->
-    <string name="onionRoutingPathYou">Vy</string>
     <string name="draft">Koncept</string>
     <!-- MessageNotifier -->
     <string name="messageMarkRead">Označit jako přečtené</string>
@@ -131,7 +129,6 @@
     <string name="notificationsMute2Hours">Ztišit na 2 hodiny</string>
     <string name="notificationsMute1Day">Ztišit na 1 den</string>
     <string name="notificationsContentShowNameOnly">Pouze jméno</string>
-    <string name="arrays__images">Obrázky</string>
     <string name="audio">Zvuk</string>
     <string name="video">Video</string>
     <string name="max">Maximum</string>
@@ -217,7 +214,6 @@
     <string name="qrCode">QR kód</string>
     <string name="contactsContacts">Kontakty</string>
     <!-- Next round of translation -->
-    <string name="menu_apply_button">Použít</string>
     <string name="done">Hotovo</string>
     <string name="groupEdit">Upravit skupinu</string>
     <string name="contactSelect">Vyber kontakty</string>