moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-30 20:52:21 -05:00
Code Issues Releases Wiki Activity

put more string into strings.xml

Browse Source
This commit is contained in:
Daniel Gultsch 2014-04-16 23:58:53 +02:00 committed by Andreas Straub
parent 0de0cb90a0
commit 8006931f80
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/menu/conversations.xml
View File

@ -19,7 +19,7 @@
android:orderInCategory="30" android:orderInCategory="30"
android:showAsAction="ifRoom" android:showAsAction="ifRoom"
android:icon="@drawable/ic_action_new_attachment" android:icon="@drawable/ic_action_new_attachment"
android:title="@string/action_attach_file" /> android:title="@string/attach_file" />
<item <item
android:id="@+id/action_contact_details" android:id="@+id/action_contact_details"

8
res/values/strings.xml
View File

@ -47,7 +47,7 @@
<string name="problem_connecting_to_account">Unable to connect to account</string> <string name="problem_connecting_to_account">Unable to connect to account</string>
<string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string> <string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string>
<string name="touch_to_fix">Touch here to manage your accounts</string> <string name="touch_to_fix">Touch here to manage your accounts</string>
<string name="action_attach_file">Attach file</string> <string name="attach_file">Attach file</string>
<string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string> <string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string>
<string name="add_contact">Add contact</string> <string name="add_contact">Add contact</string>
<string name="send_failed">unsuccessful delivery</string> <string name="send_failed">unsuccessful delivery</string>
@ -59,4 +59,10 @@
<string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string> <string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string>
<string name="delete_messages">Delete messages</string> <string name="delete_messages">Delete messages</string>
<string name="also_end_conversation">End this conversations afterwards</string> <string name="also_end_conversation">End this conversations afterwards</string>
<string name="choose_presence">Choose presence to contact</string>
<string name="send_message_to_conference">Send message to conference</string>
<string name="send_plain_text_message">Send plain text message</string>
<string name="send_otr_message">Send OTR encrypted message</string>
<string name="send_pgp_message">Send openPGP encrypted message</string>
<string name="your_nick_has_been_changed">Your nickname has been changed</string>
</resources> </resources>

4
src/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -287,7 +287,7 @@ public class ConversationActivity extends XmppActivity {
Intent attachFileIntent = new Intent(); Intent attachFileIntent = new Intent();
attachFileIntent.setType("image/*"); attachFileIntent.setType("image/*");
attachFileIntent.setAction(Intent.ACTION_GET_CONTENT); attachFileIntent.setAction(Intent.ACTION_GET_CONTENT);
Intent chooser = Intent.createChooser(attachFileIntent, "Attach File"); Intent chooser = Intent.createChooser(attachFileIntent, getString(R.string.attach_file));
startActivityForResult(chooser, ATTACH_FILE); startActivityForResult(chooser, ATTACH_FILE);
} }
} }
@ -557,7 +557,7 @@ public class ConversationActivity extends XmppActivity {
listener.onPresenceSelected(true, presence); listener.onPresenceSelected(true, presence);
} else { } else {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Choose Presence"); builder.setTitle(getString(R.string.choose_presence));
final String[] presencesArray = new String[presences.size()]; final String[] presencesArray = new String[presences.size()];
presences.keySet().toArray(presencesArray); presences.keySet().toArray(presencesArray);
builder.setItems(presencesArray, builder.setItems(presencesArray,

14
src/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -124,20 +124,20 @@ public class ConversationFragment extends Fragment {
public void updateChatMsgHint() { public void updateChatMsgHint() {
if (conversation.getMode() == Conversation.MODE_MULTI) { if (conversation.getMode() == Conversation.MODE_MULTI) {
chatMsg.setHint("Send message to conference"); chatMsg.setHint(getString(R.string.send_message_to_conference));
} else { } else {
switch (conversation.nextMessageEncryption) { switch (conversation.nextMessageEncryption) {
case Message.ENCRYPTION_NONE: case Message.ENCRYPTION_NONE:
chatMsg.setHint("Send plain text message"); chatMsg.setHint(getString(R.string.send_plain_text_message));
break; break;
case Message.ENCRYPTION_OTR: case Message.ENCRYPTION_OTR:
chatMsg.setHint("Send OTR encrypted message"); chatMsg.setHint(getString(R.string.send_otr_message));
break; break;
case Message.ENCRYPTION_PGP: case Message.ENCRYPTION_PGP:
chatMsg.setHint("Send openPGP encryted messeage"); chatMsg.setHint(getString(R.string.send_pgp_message));
break; break;
case Message.ENCRYPTION_DECRYPTED: case Message.ENCRYPTION_DECRYPTED:
chatMsg.setHint("Send openPGP encryted messeage"); chatMsg.setHint(getString(R.string.send_pgp_message));
break; break;
default: default:
break; break;
@ -403,11 +403,11 @@ public class ConversationFragment extends Fragment {
if (success) { if (success) {
Toast.makeText( Toast.makeText(
getActivity(), getActivity(),
"Your nickname has been changed", getString(R.string.your_nick_has_been_changed),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} else { } else {
Toast.makeText(getActivity(), Toast.makeText(getActivity(),
"Nichname is already in use", getString(R.string.nick_in_use),
Toast.LENGTH_SHORT).show(); Toast.LENGTH_SHORT).show();
} }
} }