TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 22:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added l10n for message details

Browse Source 
//FREEBIE

Closes #2173
This commit is contained in:
McLoo 2014-12-02 09:37:02 +01:00 committed by Moxie Marlinspike
parent 715b1ea10d
commit b44acd82e6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@ -120,6 +120,10 @@
<string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Unable to write to storage!</string> <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Unable to write to storage!</string>
<string name="ConversationFragment_saving_attachment">Saving attachment</string> <string name="ConversationFragment_saving_attachment">Saving attachment</string>
<string name="ConversationFragment_saving_attachment_to_sd_card">Saving attachment to storage...</string> <string name="ConversationFragment_saving_attachment_to_sd_card">Saving attachment to storage...</string>
<string name="ConversationFragment_pending">PENDING</string>
<string name="ConversationFragment_push">PUSH</string>
<string name="ConversationFragment_mms">MMS</string>
<string name="ConversationFragment_sms">SMS</string>
<!-- ConversationListFragment --> <!-- ConversationListFragment -->
<string name="ConversationListFragment_delete_threads_question">Delete threads?</string> <string name="ConversationListFragment_delete_threads_question">Delete threads?</string>

12
src/org/thoughtcrime/securesms/ConversationFragment.java
View File

@ -198,10 +198,10 @@ public class ConversationFragment extends ListFragment
String transport; String transport;
if (message.isPending()) transport = "pending"; if (message.isPending()) transport = getString(R.string.ConversationFragment_pending);
else if (message.isPush()) transport = "push"; else if (message.isPush()) transport = getString(R.string.ConversationFragment_push);
else if (message.isMms()) transport = "mms"; else if (message.isMms()) transport = getString(R.string.ConversationFragment_mms);
else transport = "sms"; else transport = getString(R.string.ConversationFragment_sms);
SimpleDateFormat dateFormatter = new SimpleDateFormat("EEE MMM d, yyyy 'at' hh:mm:ss a zzz"); SimpleDateFormat dateFormatter = new SimpleDateFormat("EEE MMM d, yyyy 'at' hh:mm:ss a zzz");
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@ -212,13 +212,13 @@ public class ConversationFragment extends ListFragment
if (dateReceived == dateSent || message.isOutgoing()) { if (dateReceived == dateSent || message.isOutgoing()) {
builder.setMessage(String.format(getActivity() builder.setMessage(String.format(getActivity()
.getString(R.string.ConversationFragment_transport_s_sent_received_s), .getString(R.string.ConversationFragment_transport_s_sent_received_s),
transport.toUpperCase(), transport,
dateFormatter.format(new Date(dateSent)))); dateFormatter.format(new Date(dateSent))));
} else { } else {
builder.setMessage(String.format(getActivity() builder.setMessage(String.format(getActivity()
.getString(R.string.ConversationFragment_sender_s_transport_s_sent_s_received_s), .getString(R.string.ConversationFragment_sender_s_transport_s_sent_s_received_s),
message.getIndividualRecipient().getNumber(), message.getIndividualRecipient().getNumber(),
transport.toUpperCase(), transport,
dateFormatter.format(new Date(dateSent)), dateFormatter.format(new Date(dateSent)),
dateFormatter.format(new Date(dateReceived)))); dateFormatter.format(new Date(dateReceived))));
} }