diff --git a/res/values/strings.xml b/res/values/strings.xml index 720150d71..3bfaac18c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -120,6 +120,10 @@ Unable to write to storage! Saving attachment Saving attachment to storage... + PENDING + PUSH + MMS + SMS Delete threads? diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 2e3863110..1843e02a3 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -198,10 +198,10 @@ public class ConversationFragment extends ListFragment String transport; - if (message.isPending()) transport = "pending"; - else if (message.isPush()) transport = "push"; - else if (message.isMms()) transport = "mms"; - else transport = "sms"; + if (message.isPending()) transport = getString(R.string.ConversationFragment_pending); + else if (message.isPush()) transport = getString(R.string.ConversationFragment_push); + else if (message.isMms()) transport = getString(R.string.ConversationFragment_mms); + else transport = getString(R.string.ConversationFragment_sms); SimpleDateFormat dateFormatter = new SimpleDateFormat("EEE MMM d, yyyy 'at' hh:mm:ss a zzz"); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); @@ -212,13 +212,13 @@ public class ConversationFragment extends ListFragment if (dateReceived == dateSent || message.isOutgoing()) { builder.setMessage(String.format(getActivity() .getString(R.string.ConversationFragment_transport_s_sent_received_s), - transport.toUpperCase(), + transport, dateFormatter.format(new Date(dateSent)))); } else { builder.setMessage(String.format(getActivity() .getString(R.string.ConversationFragment_sender_s_transport_s_sent_s_received_s), message.getIndividualRecipient().getNumber(), - transport.toUpperCase(), + transport, dateFormatter.format(new Date(dateSent)), dateFormatter.format(new Date(dateReceived)))); }