mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-30 13:35:18 +00:00
Replaced hard-coded 'Session' with '{app_name}' in 'callsSessionCall'
This commit is contained in:
parent
621094ebe4
commit
a8ee5c9f3b
@ -17,6 +17,7 @@ import android.view.MenuItem
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewOutlineProvider
|
import android.view.ViewOutlineProvider
|
||||||
import android.view.WindowManager
|
import android.view.WindowManager
|
||||||
|
import android.widget.TextView
|
||||||
import androidx.activity.viewModels
|
import androidx.activity.viewModels
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
@ -24,6 +25,7 @@ import androidx.lifecycle.lifecycleScope
|
|||||||
import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
import com.bumptech.glide.load.engine.DiskCacheStrategy
|
||||||
|
import com.squareup.phrase.Phrase
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
@ -34,6 +36,7 @@ import network.loki.messenger.databinding.ActivityWebrtcBinding
|
|||||||
import org.apache.commons.lang3.time.DurationFormatUtils
|
import org.apache.commons.lang3.time.DurationFormatUtils
|
||||||
import org.session.libsession.avatars.ProfileContactPhoto
|
import org.session.libsession.avatars.ProfileContactPhoto
|
||||||
import org.session.libsession.messaging.contacts.Contact
|
import org.session.libsession.messaging.contacts.Contact
|
||||||
|
import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
|
||||||
import org.session.libsession.utilities.TextSecurePreferences
|
import org.session.libsession.utilities.TextSecurePreferences
|
||||||
import org.session.libsession.utilities.truncateIdForDisplay
|
import org.session.libsession.utilities.truncateIdForDisplay
|
||||||
import org.session.libsignal.utilities.Log
|
import org.session.libsignal.utilities.Log
|
||||||
@ -212,6 +215,11 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity() {
|
|||||||
update()
|
update()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Substitute "Session" into the "{app_name} Call" text
|
||||||
|
val sessionCallTV = findViewById<TextView>(R.id.sessionCallText)
|
||||||
|
sessionCallTV?.text = Phrase.from(this, R.string.callsSessionCall).put(APP_NAME_KEY, getString(R.string.app_name)).format()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -223,7 +223,6 @@
|
|||||||
<string name="messageRequestsNew">شما درخواست پیام جدیدی دارید</string>
|
<string name="messageRequestsNew">شما درخواست پیام جدیدی دارید</string>
|
||||||
<string name="callsInProgress">در حال تماس...</string>
|
<string name="callsInProgress">در حال تماس...</string>
|
||||||
<string name="callsEnd">پایان تماس</string>
|
<string name="callsEnd">پایان تماس</string>
|
||||||
<string name="callsSessionCall">تماس Session</string>
|
|
||||||
<string name="callsReconnecting">در حال اتصال دوباره...</string>
|
<string name="callsReconnecting">در حال اتصال دوباره...</string>
|
||||||
<string name="dismiss">رد کردن</string>
|
<string name="dismiss">رد کردن</string>
|
||||||
<string name="appearancePrimaryColor">رنگ اولیه</string>
|
<string name="appearancePrimaryColor">رنگ اولیه</string>
|
||||||
|
@ -232,7 +232,6 @@
|
|||||||
<string name="messageRequestsNew">Vous avez une nouvelle demande de message</string>
|
<string name="messageRequestsNew">Vous avez une nouvelle demande de message</string>
|
||||||
<string name="callsInProgress">Appel en cours</string>
|
<string name="callsInProgress">Appel en cours</string>
|
||||||
<string name="callsEnd">Raccrocher</string>
|
<string name="callsEnd">Raccrocher</string>
|
||||||
<string name="callsSessionCall">Appel Session</string>
|
|
||||||
<string name="callsReconnecting">Reconnexion…</string>
|
<string name="callsReconnecting">Reconnexion…</string>
|
||||||
<string name="dismiss">Rejeter</string>
|
<string name="dismiss">Rejeter</string>
|
||||||
<string name="appearancePrimaryColor">Couleur principale</string>
|
<string name="appearancePrimaryColor">Couleur principale</string>
|
||||||
|
@ -236,7 +236,6 @@
|
|||||||
<string name="messageRequestsNew">Vous avez une nouvelle demande de message</string>
|
<string name="messageRequestsNew">Vous avez une nouvelle demande de message</string>
|
||||||
<string name="callsInProgress">Appel en cours</string>
|
<string name="callsInProgress">Appel en cours</string>
|
||||||
<string name="callsEnd">Raccrocher</string>
|
<string name="callsEnd">Raccrocher</string>
|
||||||
<string name="callsSessionCall">Appel Session</string>
|
|
||||||
<string name="callsReconnecting">Reconnexion…</string>
|
<string name="callsReconnecting">Reconnexion…</string>
|
||||||
<string name="dismiss">Rejeter</string>
|
<string name="dismiss">Rejeter</string>
|
||||||
<string name="appearancePrimaryColor">Couleur principale</string>
|
<string name="appearancePrimaryColor">Couleur principale</string>
|
||||||
|
@ -192,7 +192,7 @@
|
|||||||
<string name="callsPermissionsRequiredDescription">You can enable the \"Voice and Video Calls\" permission in Privacy Settings.</string>
|
<string name="callsPermissionsRequiredDescription">You can enable the \"Voice and Video Calls\" permission in Privacy Settings.</string>
|
||||||
<string name="callsReconnecting">Reconnecting…</string>
|
<string name="callsReconnecting">Reconnecting…</string>
|
||||||
<string name="callsRinging">Ringing...</string>
|
<string name="callsRinging">Ringing...</string>
|
||||||
<string name="callsSessionCall">Session Call</string>
|
<string name="callsSessionCall">{app_name} Call</string>
|
||||||
<string name="callsSettings">Calls (Beta)</string>
|
<string name="callsSettings">Calls (Beta)</string>
|
||||||
<string name="callsVoiceAndVideo">Voice and Video Calls</string>
|
<string name="callsVoiceAndVideo">Voice and Video Calls</string>
|
||||||
<string name="callsVoiceAndVideoBeta">Voice and Video Calls (Beta)</string>
|
<string name="callsVoiceAndVideoBeta">Voice and Video Calls (Beta)</string>
|
||||||
|
Loading…
Reference in New Issue
Block a user