- Use strings in all config activity alert messages.

This commit is contained in:
Juha Heinanen
2019-08-31 11:00:30 +03:00
parent 385ec810b3
commit 29ae28b06f
3 changed files with 24 additions and 12 deletions

View File

@ -165,8 +165,8 @@ class ConfigActivity : AppCompatActivity() {
val listenAddr = listenAddr.text.toString().trim()
if (listenAddr != oldListenAddr) {
if ((listenAddr != "") && !Utils.checkIpPort(listenAddr)) {
Utils.alertView(this, "Notice",
"Invalid Listen Address '$listenAddr'")
Utils.alertView(this, getString(R.string.notice),
"${getString(R.string.invalid_listen_address)}: $listenAddr")
return false
}
Config.remove("sip_listen")
@ -186,8 +186,8 @@ class ConfigActivity : AppCompatActivity() {
val dnsServers = addMissingPorts(dnsServers.text.toString().trim().toLowerCase())
if (dnsServers != oldDnsServers) {
if (!checkDnsServers(dnsServers)) {
Utils.alertView(this, "Notice",
"Invalid DNS Servers: $dnsServers")
Utils.alertView(this, getString(R.string.notice),
"${getString(R.string.invalid_dns_servers)}: $dnsServers")
return false
}
Config.remove("dyn_dns")
@ -197,8 +197,8 @@ class ConfigActivity : AppCompatActivity() {
Config.add("dns_server", server)
Config.add("dyn_dns", "no")
if (Api.net_use_nameserver(dnsServers) != 0) {
Utils.alertView(this, "Notice",
"Failed to set DNS servers '$dnsServers'")
Utils.alertView(this, getString(R.string.error),
"${getString(R.string.failed_to_set_dns_servers)}: $dnsServers")
return false
}
} else {
@ -263,8 +263,8 @@ class ConfigActivity : AppCompatActivity() {
if (aec.isChecked) {
Config.add("module", "webrtc_aec.so")
if (Api.module_load("webrtc_aec.so") != 0) {
Utils.alertView(this, "Notice",
"Failed to load Acoustic Echo Cancellation module")
Utils.alertView(this, getString(R.string.error),
getString(R.string.failed_to_load_aec_module))
return false
}
} else {
@ -276,7 +276,8 @@ class ConfigActivity : AppCompatActivity() {
val opusBitRate = opusBitRate.text.toString().trim()
if (opusBitRate != oldOpusBitrate) {
if (!checkOpusBitRate(opusBitRate)) {
Utils.alertView(this, "Notice", "Invalid Opus Bit Rate: $opusBitRate")
Utils.alertView(this, getString(R.string.notice),
"${getString(R.string.invalid_opus_bitrate)}: $opusBitRate.")
return false
}
Config.remove("opus_bitrate")
@ -288,8 +289,8 @@ class ConfigActivity : AppCompatActivity() {
val opusPacketLoss = opusPacketLoss.text.toString().trim()
if (opusPacketLoss != oldOpusPacketLoss) {
if (!checkOpusPacketLoss(opusPacketLoss)) {
Utils.alertView(this, "Notice",
"Invalid Opus Packet Loss Percentage: $opusPacketLoss")
Utils.alertView(this, getString(R.string.notice),
"${getString(R.string.invalid_opus_packet_loss)}: $opusPacketLoss")
return false
}
Config.remove("opus_inbandfec")

View File

@ -175,6 +175,7 @@
jolloin baresip kuuntelee porttia 5060 kaikilla käytössä olevilla
osoitteilla.
</string>
<string name="invalid_listen_address">Virheellinen kuunteluosoite</string>
<string name="prefer_ipv6">Suosi IPv6-protokollaa</string>
<string name="prefer_ipv6_help">Jos merkitty, baresip suosii
IPv6-protokollaa, mikäli sekä IPv4 että IPv6 ovat käytettävissä.</string>
@ -185,8 +186,11 @@
on IPv6-osoite ja myös portti annetaan, pitää osoite kirjoittaa sulkujen [] sisään.
Esimerkiksi luettelo \'8.8.8.8:53,[2001:4860:4860::8888]:53\' osoittaa Googlen julkisiin
DNS-palvelijoihin.</string>
<string name="invalid_dns_servers">Virheelliset DNS-palvelimet</string>
<string name="failed_to_set_dns_servers">DNS-palvelinten asetus epäonnistui</string>
<string name="aec">Akustinen kaiun poisto</string>
<string name="aec_help">Jos merkitty, kaikua yritetään poistaa puheluiden aikana.</string>
<string name="failed_to_load_aec_module">Kaiunpoistomodulin lataaminen epäonnistui.</string>
<string name="opus_bit_rate">Opus-koodekin bittinopeus</string>
<string name="opus_bit_rate_help">Opus-koodekin käyttämä
keskimääräinen enimmäisnopeus. Mahdollisia arvoja ovat
@ -196,7 +200,8 @@
<string name="opus_packet_loss_help">Odotettu Opus audio virran pakettihäviö prosentteina.
Mahdolliset arvot ovat 0-100. Oletusarvo on 0, jolloin ennakoiva virheenkorjaus
ei ole käytössä.</string>
<string name="_0" translatable="false">0</string>
<string name="invalid_opus_bitrate">Virheellinen Opus-koodekin bittinopeus</string>
<string name="invalid_opus_packet_loss">Virheellinen Opus-koodekin odotettu pakettihäviö</string>
<string name="ice_lite_mode">ICE Lite-moodi</string>
<string name="ice_lite_mode_help">Jos merkitty, ICE Lite-moodi on
käytössä.

View File

@ -155,6 +155,7 @@ Check Apps → baresip → Permissions → Storage and that file \'accounts.bs\'
available addresses. If left empty (factory default), baresip listens at port 5060 of
all available addresses.
</string>
<string name="invalid_listen_address">Invalid Listen Address</string>
<string name="_0_0_0_0_5060" translatable="false">0.0.0.0:5060</string>
<string name="prefer_ipv6">Prefer IPv6</string>
<string name="prefer_ipv6_help">Prefer IPv6 if both IPv4 and IPv6 are available.</string>
@ -165,6 +166,8 @@ Check Apps → baresip → Permissions → Storage and that file \'accounts.bs\'
also port is given, ip must
be written inside brackets []. As an example, list \'8.8.8.8:53,[2001:4860:4860::8888]:53\'
points to IPv4 and IPv6 addresses of public Google DNS servers.</string>
<string name="invalid_dns_servers">Invalid DNS Servers</string>
<string name="failed_to_set_dns_servers">Failed to set DNS servers</string>
<string name="tls_certificate_file">TLS Certificate File</string>
<string name="tls_certificate_file_help">If checked, file \'cert.pem\' containing
TLS certificate and private key of this baresip instance has been or will be loaded from
@ -174,6 +177,7 @@ Check Apps → baresip → Permissions → Storage and that file \'accounts.bs\'
of Certificate Authorities has been or will be loaded from Download directory.</string>
<string name="aec">Acoustic Echo Cancellation</string>
<string name="aec_help">If checked, echo cancellation is attempted on call audio.</string>
<string name="failed_to_load_aec_module">Failed to load Acoustic Echo Cancellation module.</string>
<string name="opus_bit_rate">Opus Bit Rate</string>
<string name="opus_bit_rate_help">Average maximum bit rate used by Opus audio stream.
Valid values are 6000-510000. Factory default is 28000.</string>
@ -183,6 +187,8 @@ Check Apps → baresip → Permissions → Storage and that file \'accounts.bs\'
Valid values are 0-100. Factory default is 0, which disables Opus Forward Error
Correction (FEC).</string>
<string name="_0" translatable="false">0</string>
<string name="invalid_opus_bitrate">Invalid Opus bitrate</string>
<string name="invalid_opus_packet_loss">Invalid Opus Packet Loss Percentage</string>
<string name="ice_lite_mode">ICE Lite Mode</string>
<string name="ice_lite_mode_help">If checked, ICE Lite Mode is used.</string>
<string name="default_call_volume">Default Call Volume</string>