blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #76 from thoughtbox/Localisation-change 

Support translation of 'FWD' prefix.
master
Moxie Marlinspike 2012-10-12 19:22:36 -07:00
parent 82f8ba3584 73bde7accd
commit 7beb8e489b
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ tests
lint.xml
local.properties
ant.properties
.DS_Store

1
res/values/strings.xml
View File

@ -72,6 +72,7 @@
<string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sorry, the selected audio exceeds message size restrictions.</string>
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Recipient is not a valid SMS or email address!</string>
<string name="ConversationActivity_message_is_empty_exclamation">Message is empty!</string>
<string name="ConversationActivity_forward_message_prefix">FWD</string>
<!-- ConversationFragment -->
<string name="ConversationFragment_message_details">Message details</string>

2
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -411,7 +411,7 @@ public class ConversationActivity extends SherlockFragmentActivity
registerForContextMenu(sendButton);
if (getIntent().getStringExtra("forwarded_message") != null)
composeText.setText("FWD: " + getIntent().getStringExtra("forwarded_message"));
composeText.setText(R.string.ConversationActivity_forward_message_prefix+": " + getIntent().getStringExtra("forwarded_message"));
}
private void initializeRecipientsInput() {