Bluetooth: i18n for strings

res/values/strings.xml

@@ -383,6 +383,14 @@
 <string name="bt_error_disabled">Please enable Bluetooth!</string>
 <string name="bt_error_no_tnc">Please configure a Bluetooth TNC!</string>
 <string name="bt_error_connect">Could not connect to %s! Please turn on the device and close other Bluetooth connections.</string>
+<string name="bt_awaiting">Awaiting client…</string>
+<string name="bt_client_connected">Client %s connected.</string>
+<string name="bt_connecting_to_spp">Connecting to SPP service on %s…</string>
+<!-- connecting to [device name] channel [bluetooth channel id] -->
+<string name="bt_connecting_to_channel">Connecting to %s channel %d…</string>
+<string name="bt_connected">Connected to TNC.</string>
+<string name="bt_reconnecting">Reconnecting in 3s…</string>
+
 
 <string name="afsk_info_sco_req">Requesting bluetooth SCO link...</string>
 <string name="afsk_info_sco_est">Bluetooth SCO link established.</string>

src/backend/BluetoothTnc.scala

@@ -73,6 +73,9 @@ class BluetoothTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBack
 		def log(s : String) {
 			service.postAddPost(StorageDatabase.Post.TYPE_INFO, R.string.post_info, s)
 		}
+		def log(id : Integer, args : Object*) {
+			service.postAddPost(StorageDatabase.Post.TYPE_INFO, R.string.post_info, service.getString(id, args : _*))
+		}
 
 		def init_socket() {
 			Log.d(TAG, "init_socket()")
@@ -81,23 +84,23 @@ class BluetoothTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBack
 			}
 				if (tnc == null) {
 					// we are a host
-					log("Awaiting client...")
+					log(R.string.bt_awaiting)
 					socket = ba.listenUsingRfcommWithServiceRecord("SPP", SPP).accept(-1)
 					val dev = socket.getRemoteDevice()
 					val name = if (dev.getName() != null) dev.getName() else dev.getAddress()
-					log("Client %s connected.".format(name))
+					log(R.string.bt_client_connected, name)
 				} else
 				if (tncchannel == -1) {
-					log("Connecting to SPP service on %s...".format(tncmac))
+					log(R.string.bt_connecting_to_spp, tncmac)
 					socket = tnc.createRfcommSocketToServiceRecord(SPP)
 					socket.connect()
 				} else {
-					log("Connecting to channel %d...".format(tncchannel))
+					log(R.string.bt_connecting_to_channel, tncmac, new Integer(tncchannel))
 					val m = tnc.getClass().getMethod("createRfcommSocket", classOf[Int])
 					socket = m.invoke(tnc, tncchannel.asInstanceOf[AnyRef]).asInstanceOf[BluetoothSocket]
 					socket.connect()
 				}
-				log("Connected to TNC.")
+				log(R.string.bt_connected)
 
 			proto = AprsBackend.instanciateProto(service, socket.getInputStream(), socket.getOutputStream())
 			Log.d(TAG, "init_socket() done")
@@ -121,7 +124,7 @@ class BluetoothTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBack
 			while (running) {
 				try {
 					if (need_reconnect) {
-						log("Reconnecting in 3s...")
+						log(R.string.bt_reconnecting)
 						try {
 							Thread.sleep(3*1000)
 						} catch { case _ : InterruptedException => }