Merge branch 'charlesmchen/labelSignalCallsAsSuch'

Signal/src/view controllers/CallViewController.swift

@@ -549,7 +549,10 @@ class CallViewController: UIViewController, CallObserver, CallServiceObserver, R
 
     func updateCallStatusLabel(callState: CallState) {
         assert(Thread.isMainThread)
-        self.callStatusLabel.text = localizedTextForCallState(callState)
+
+        let text = String(format:NSLocalizedString("CALL_STATUS_FORMAT", comment: "Format for call status label"),
+                      localizedTextForCallState(callState))
+        self.callStatusLabel.text = text
     }
 
     func updateCallUI(callState: CallState) {
@@ -672,7 +675,11 @@ class CallViewController: UIViewController, CallObserver, CallServiceObserver, R
 
         guard let call = self.call else {
             Logger.error("\(TAG) call was unexpectedly nil. Terminating call.")
-            self.callStatusLabel.text = NSLocalizedString("END_CALL_UNCATEGORIZED_FAILURE", comment: "Call setup status label")
+
+            let text = String(format:NSLocalizedString("CALL_STATUS_FORMAT", comment: "Format for call status label"),
+                              NSLocalizedString("END_CALL_UNCATEGORIZED_FAILURE", comment: "Call setup status label"))
+            self.callStatusLabel.text = text
+
             DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
                 self.dismiss(animated: true)
             }

Signal/translations/en.lproj/Localizable.strings

@@ -73,6 +73,9 @@
 /* Accessibilty label for placing call button */
 "CALL_LABEL" = "Call";
 
+/* Format for call status label */
+"CALL_STATUS_FORMAT" = "Signal %@";
+
 /* notification action */
 "CALLBACK_BUTTON_TITLE" = "Call back";
 
@@ -711,7 +714,7 @@
 /* Alert body after invite succeeded */
 "SEND_INVITE_SUCCESS" = "You've invited your friend to use Signal!";
 
-/* Text for button to send a Signal invite via SMS */
+/* Text for button to send a Signal invite via SMS. %@ is placeholder for the receipient's phone number. */
 "SEND_INVITE_VIA_SMS_BUTTON_FORMAT" = "Send Invite via SMS to: %@";
 
 /* No comment provided by engineer. */