narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed #389

Browse source
This commit is contained in:
iNPUTmice 2014-08-29 10:24:25 +02:00
parent 37e87e7252
commit 33172246c9
6 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -93,7 +93,7 @@
</activity> </activity>
<activity <activity
android:name="eu.siacs.conversations.ui.PublishProfilePictureActivity" android:name="eu.siacs.conversations.ui.PublishProfilePictureActivity"
android:label="@string/publish_avatar" android:label="@string/mgmt_account_publish_avatar"
android:windowSoftInputMode="stateHidden" > android:windowSoftInputMode="stateHidden" >
</activity> </activity>
<activity <activity

2
res/layout/activity_publish_profile_picture.xml
View file

@ -69,7 +69,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:enabled="false" android:enabled="false"
android:text="@string/publish_avatar" android:text="@string/publish"
android:textColor="@color/secondarytext" /> android:textColor="@color/secondarytext" />
</LinearLayout> </LinearLayout>

2
res/values-de/strings.xml
View file

@ -265,7 +265,7 @@
<string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string> <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
<string name="add_back">Auch hinzufügen</string> <string name="add_back">Auch hinzufügen</string>
<string name="contact_has_read_up_to_this_point">%s hat bis zu diesem Punkt gelesen</string> <string name="contact_has_read_up_to_this_point">%s hat bis zu diesem Punkt gelesen</string>
<string name="publish_avatar">Veröffentlichen</string> <string name="publish">Veröffentlichen</string>
<string name="touch_to_choose_picture">Klicke hier, um einen Avatar auszuwählen</string> <string name="touch_to_choose_picture">Klicke hier, um einen Avatar auszuwählen</string>
<string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string> <string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string>
<string name="publishing">Veröffentliche&#8230;</string> <string name="publishing">Veröffentliche&#8230;</string>

2
res/values-es/strings.xml
View file

@ -265,7 +265,7 @@
<string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string> <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
<string name="add_back">Añadir contacto</string> <string name="add_back">Añadir contacto</string>
<string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string> <string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string>
<string name="publish_avatar">Publicar imagen</string> <string name="publish">Publicar</string>
<string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string> <string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
<string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string> <string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
<string name="publishing">Publicando&#8230;</string> <string name="publishing">Publicando&#8230;</string>

2
res/values/strings.xml
View file

@ -266,7 +266,7 @@
<string name="contact_added_you">Contact added you to contact list</string> <string name="contact_added_you">Contact added you to contact list</string>
<string name="add_back">Add back</string> <string name="add_back">Add back</string>
<string name="contact_has_read_up_to_this_point">%s has read up to this point</string> <string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
<string name="publish_avatar">Publish avatar</string> <string name="publish">Publish</string>
<string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string> <string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string>
<string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string> <string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
<string name="publishing">Publishing&#8230;</string> <string name="publishing">Publishing&#8230;</string>

6
src/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -201,7 +201,11 @@ public class EditAccountActivity extends XmppActivity {
this.mSaveButton.setEnabled(true); this.mSaveButton.setEnabled(true);
this.mSaveButton.setTextColor(getPrimaryTextColor()); this.mSaveButton.setTextColor(getPrimaryTextColor());
if (jidToEdit != null) { if (jidToEdit != null) {
this.mSaveButton.setText(R.string.connect); if (mAccount!= null && mAccount.getStatus() == Account.STATUS_ONLINE) {
this.mSaveButton.setText(R.string.save);
} else {
this.mSaveButton.setText(R.string.connect);
}
} else { } else {
this.mSaveButton.setText(R.string.next); this.mSaveButton.setText(R.string.next);
} }