improve error message formatting

VREMSoftwareDevelopment · VREMSoftwareDevelopment · commit 23cff9c3d08f · 2025-06-28T14:55:45.000-04:00
diff --git a/app/build.properties b/app/build.properties
@@ -1,6 +1,6 @@
 #Build Properties
-#Sat Jun 28 09:44:44 EDT 2025
-version_build=3
+#Sat Jun 28 14:53:31 EDT 2025
+version_build=4
 version_major=3
 version_minor=2
 version_patch=1
diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingAdapter.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingAdapter.kt
@@ -122,13 +122,15 @@ class ChannelRatingAdapter(
     }
 
     private fun errorMessage(wiFiBand: WiFiBand): String = with(context.resources) {
-        getText(R.string.channel_rating_best_none).toString() +
-            if (WiFiBand.GHZ2 == wiFiBand) {
-                getText(R.string.channel_rating_best_alternative).toString() +
-                    " " + getString(WiFiBand.GHZ5.textResource)
-            } else {
-                String.EMPTY
-            }
+        if (WiFiBand.GHZ2 == wiFiBand) {
+            String.format(
+                getString(R.string.channel_rating_best_alternative),
+                getString(R.string.channel_rating_best_none),
+                getString(WiFiBand.GHZ5.textResource)
+            )
+        } else {
+            getString(R.string.channel_rating_best_none)
+        }
     }
 
     private fun create(parent: ViewGroup): ChannelRatingDetailsBinding =
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
@@ -50,7 +50,7 @@
 
     <string name="channel_rating_best">"Най-добри канали:"</string>
     <string name="channel_rating_best_none">"Няма"</string>
-    <string name="channel_rating_best_alternative">", пробвай алтернативен Wi-Fi диапазон"</string>
+    <string name="channel_rating_best_alternative">"%s, пробвай алтернативен Wi-Fi диапазон %s"</string>
     <string name="channel_rating_heading_rating">"Оценка на канала"</string>
     <string name="channel_rating_heading_number">"Номер на канала"</string>
     <string name="channel_rating_heading_count">"Брой точки за достъп"</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"Beste Kanäle:"</string>
     <string name="channel_rating_best_none">"Keine"</string>
-    <string name="channel_rating_best_alternative">", probiere ein anderes WLAN-Frequenzband"</string>
+    <string name="channel_rating_best_alternative">"%s, probiere ein anderes WLAN-Frequenzband %s"</string>
     <string name="channel_rating_heading_rating">"Kanalbewertung"</string>
     <string name="channel_rating_heading_number">"Kanal"</string>
     <string name="channel_rating_heading_count">"Anzahl Access Points"</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"Βέλτιστα κανάλια:"</string>
     <string name="channel_rating_best_none">"Κανένα"</string>
-    <string name="channel_rating_best_alternative">", δοκιμάστε εναλλακτική ζώνη Wi-Fi"</string>
+    <string name="channel_rating_best_alternative">"%s, δοκιμάστε εναλλακτική ζώνη Wi-Fi %s"</string>
     <string name="channel_rating_heading_rating">"Ταξινόμηση καναλιού"</string>
     <string name="channel_rating_heading_number">"Αριθμός καναλιού"</string>
     <string name="channel_rating_heading_count">"Πλήθος σημείων πρόσβασης"</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"Mejores canales:"</string>
     <string name="channel_rating_best_none">"Ninguno"</string>
-    <string name="channel_rating_best_alternative">", tratar Banda Wi-Fi alternativa"</string>
+    <string name="channel_rating_best_alternative">"%s, tratar Banda Wi-Fi alternativa %s"</string>
     <string name="channel_rating_heading_rating">"Clasificación de Canal"</string>
     <string name="channel_rating_heading_number">"Número de Canal"</string>
     <string name="channel_rating_heading_count">"Cantidad de Puntos de Acceso"</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"Meilleurs canaux:"</string>
     <string name="channel_rating_best_none">"Aucun"</string>
-    <string name="channel_rating_best_alternative">", essayez une autre fréquence"</string>
+    <string name="channel_rating_best_alternative">"%s, essayez une autre fréquence %s"</string>
     <string name="channel_rating_heading_rating">"Qualité du canal"</string>
     <string name="channel_rating_heading_number">"Numéro de canal"</string>
     <string name="channel_rating_heading_count">"Nombre de points d\'accès"</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"Canali Migliori:"</string>
     <string name="channel_rating_best_none">"Nessuno"</string>
-    <string name="channel_rating_best_alternative">", prova un altra banda Wi-Fi"</string>
+    <string name="channel_rating_best_alternative">"%s, prova un altra banda Wi-Fi %s"</string>
     <string name="channel_rating_heading_rating">"Qualità Canale"</string>
     <string name="channel_rating_heading_number">"Numero Canale"</string>
     <string name="channel_rating_heading_count">"Numero di Access Point"</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -50,7 +50,7 @@
 
     <string name="channel_rating_best">"最適なチャンネル:"</string>
     <string name="channel_rating_best_none">"なし"</string>
-    <string name="channel_rating_best_alternative">"、 Wi-Fi バンドを代替して試す"</string>
+    <string name="channel_rating_best_alternative">"%s、 Wi-Fi バンドを代替して試す %s"</string>
     <string name="channel_rating_heading_rating">"チャンネルの評価"</string>
     <string name="channel_rating_heading_number">"チャンネルの番号"</string>
     <string name="channel_rating_heading_count">"アクセスポイントの数"</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -47,7 +47,7 @@
 
     <string name="channel_rating_best">"Beste kanalen:"</string>
     <string name="channel_rating_best_none">"Geen"</string>
-    <string name="channel_rating_best_alternative">", probeer alternatieve wifi-band"</string>
+    <string name="channel_rating_best_alternative">"%s, probeer alternatieve wifi-band %s"</string>
     <string name="channel_rating_heading_rating">"Kanaalbeoordeling"</string>
     <string name="channel_rating_heading_number">"Kanaalnummer"</string>
     <string name="channel_rating_heading_count">"Aantal toegangspunten"</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"Najlepsze kanały:"</string>
     <string name="channel_rating_best_none">"Brak"</string>
-    <string name="channel_rating_best_alternative">", spróbuj alternatywne pasmo Wi-Fi"</string>
+    <string name="channel_rating_best_alternative">"%s, spróbuj alternatywne pasmo Wi-Fi %s"</string>
     <string name="channel_rating_heading_rating">"Ocena kanału"</string>
     <string name="channel_rating_heading_number">"Numer kanału"</string>
     <string name="channel_rating_heading_count">"Liczba punktów dostępu"</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"Canais melhores:"</string>
     <string name="channel_rating_best_none">"Nenhum"</string>
-    <string name="channel_rating_best_alternative">", tente a frequência de"</string>
+    <string name="channel_rating_best_alternative">"%s, tente a frequência de %s"</string>
     <string name="channel_rating_heading_rating">"Avaliação"</string>
     <string name="channel_rating_heading_number">"Número"</string>
     <string name="channel_rating_heading_count">"Redes"</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"Canais melhores:"</string>
     <string name="channel_rating_best_none">"Nenhum"</string>
-    <string name="channel_rating_best_alternative">", tente a frequência de"</string>
+    <string name="channel_rating_best_alternative">"%s, tente a frequência de %s"</string>
     <string name="channel_rating_heading_rating">"Avaliação"</string>
     <string name="channel_rating_heading_number">"Número"</string>
     <string name="channel_rating_heading_count">"Contagem de pontos de acesso"</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"Лучшие каналы:"</string>
     <string name="channel_rating_best_none">"Нет"</string>
-    <string name="channel_rating_best_alternative">", попробуйте альтернативный Wi-Fi диапазон"</string>
+    <string name="channel_rating_best_alternative">"%s, попробуйте альтернативный Wi-Fi диапазон %s"</string>
     <string name="channel_rating_heading_rating">"Оценка каналов"</string>
     <string name="channel_rating_heading_number">"Номер канала"</string>
     <string name="channel_rating_heading_count">"Число точек доступа"</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -50,7 +50,7 @@
 
     <string name="channel_rating_best">"En İyi Kanallar:"</string>
     <string name="channel_rating_best_none">"Hiçbiri"</string>
-    <string name="channel_rating_best_alternative">", alternatif Wi-Fi Bandını deneyin"</string>
+    <string name="channel_rating_best_alternative">"%s, alternatif Wi-Fi Bandını deneyin %s"</string>
     <string name="channel_rating_heading_rating">"Kanal Derecesi"</string>
     <string name="channel_rating_heading_number">"Kanal Numarası"</string>
     <string name="channel_rating_heading_count">"Erişim Noktası Sayısı"</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -47,7 +47,7 @@
 
     <string name="channel_rating_best">"Кращі канали:"</string>
     <string name="channel_rating_best_none">"Немає"</string>
-    <string name="channel_rating_best_alternative">", спробуйте альтернативний діапазон Wi-Fi "</string>
+    <string name="channel_rating_best_alternative">"%s, спробуйте альтернативний діапазон Wi-Fi %s"</string>
     <string name="channel_rating_heading_rating">"Оцінка каналів"</string>
     <string name="channel_rating_heading_number">"Номер каналу"</string>
     <string name="channel_rating_heading_count">"Число точок доступу"</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"最佳信道："</string>
     <string name="channel_rating_best_none">"无"</string>
-    <string name="channel_rating_best_alternative">", 尝试其他 Wi-Fi 频段"</string>
+    <string name="channel_rating_best_alternative">"%s, 尝试其他 Wi-Fi 频段 %s"</string>
     <string name="channel_rating_heading_rating">"信道评级"</string>
     <string name="channel_rating_heading_number">"信道编号"</string>
     <string name="channel_rating_heading_count">"接入点数量"</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -48,7 +48,7 @@
 
     <string name="channel_rating_best">"最佳頻道："</string>
     <string name="channel_rating_best_none">"無"</string>
-    <string name="channel_rating_best_alternative">"，嘗試其他 Wi-Fi 頻段"</string>
+    <string name="channel_rating_best_alternative">"%s，嘗試其他 Wi-Fi 頻段 %s"</string>
     <string name="channel_rating_heading_rating">"頻道評分"</string>
     <string name="channel_rating_heading_number">"頻道數"</string>
     <string name="channel_rating_heading_count">"存取點計數"</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -57,7 +57,7 @@
 
     <string name="channel_rating_best">"Best Channels:"</string>
     <string name="channel_rating_best_none">"None"</string>
-    <string name="channel_rating_best_alternative">", try alternative Wi-Fi Band"</string>
+    <string name="channel_rating_best_alternative">"%s, try alternative Wi-Fi Band %s"</string>
     <string name="channel_rating_heading_rating">"Channel Rating"</string>
     <string name="channel_rating_heading_number">"Channel Number"</string>
     <string name="channel_rating_heading_count">"Access Point Count"</string>
diff --git a/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingAdapterTest.kt b/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingAdapterTest.kt
@@ -115,9 +115,10 @@ class ChannelRatingAdapterTest {
     fun bestChannelsGHZ2WithErrorMessage() {
         // setup
         val resources = mainActivity.resources
-        val expected = (resources.getText(R.string.channel_rating_best_none).toString()
-            + resources.getText(R.string.channel_rating_best_alternative)
-            + " " + resources.getString(WiFiBand.GHZ5.textResource))
+        val expected = String.format(
+                resources.getString(R.string.channel_rating_best_alternative),
+                resources.getString(R.string.channel_rating_best_none),
+                resources.getString(WiFiBand.GHZ5.textResource))
         val expectedColor = ContextCompat.getColor(mainActivity, R.color.error)
         val wiFiChannels: List<WiFiChannel> = listOf()
         val channelAPCounts: List<ChannelAPCount> = listOf()
