Merge pull request #191 from StingerAJ/aj_bugfixes_20120731

Fixed http://astrid.com/home#filter-all/task-peo60
pull/14/head
sbosley 12 years ago
commit 3e4a938199

@ -700,7 +700,6 @@ public class EditPeopleControlSet extends PopupControlSet {
return false;
boolean dirty = false;
String sharedToast = null;
try {
JSONObject userJson = null;
TextView assignedView = null;
@ -760,12 +759,6 @@ public class EditPeopleControlSet extends PopupControlSet {
task.setValue(Task.USER, user);
String assignedName = userJson.optString("name", userEmail);
if(task.getTransitory(TaskService.TRANS_TAGS) == null ||
((HashSet<String>)task.getTransitory(TaskService.TRANS_TAGS)).size() == 0) {
sharedToast = activity.getString(R.string.actfm_EPA_assigned_toast, assignedName,
assignedName);
}
}
JSONObject sharedWith = sharedWithContainer.parseSharedWithAndTags(activity, false);
@ -816,8 +809,6 @@ public class EditPeopleControlSet extends PopupControlSet {
else if (task.getValue(Task.USER_ID) != Task.USER_ID_SELF)
StatisticsService.reportEvent(StatisticsConstants.TASK_ASSIGNED_PICKER);
if(sharedToast != null)
toast = (toast != null) ? toast + "\n" + sharedToast : sharedToast + "\n";
showSaveToast(toast);
return true;

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Personalitzat…</string>
<string name="actfm_EPA_share_with">Comparteix amb:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">Share with Friends</string>
<string name="actfm_EPA_list">List: %s</string>
<string name="actfm_EPA_assigned_hint">Contact Name</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Custom...</string>
<string name="actfm_EPA_share_with">Přidat spolupracovníky:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">Share with Friends</string>
<string name="actfm_EPA_list">List: %s</string>
<string name="actfm_EPA_assigned_hint">Contact Name</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Brugerdefineret...</string>
<string name="actfm_EPA_share_with">Del med:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">Del med venner</string>
<string name="actfm_EPA_list">List: %s</string>
<string name="actfm_EPA_assigned_hint">Contact Name</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">deligiere es.</string>
<string name="actfm_EPA_assign_custom">Benutzerdefiniert …</string>
<string name="actfm_EPA_share_with">Teilen mit:</string>
<string name="actfm_EPA_assigned_toast">Zugewiesen an %1$s (Du kannst es in der mit %2$s geteilten Liste sehen)</string>
<string name="actfm_EPA_collaborators_header">Mit Freunden teilen</string>
<string name="actfm_EPA_list">Liste: %s</string>
<string name="actfm_EPA_assigned_hint">Kontaktperson</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Personalizado…</string>
<string name="actfm_EPA_share_with">Compartir con:</string>
<string name="actfm_EPA_assigned_toast">Enviado a %1$s (Puedes verla en la lista entre tu y %2$s).</string>
<string name="actfm_EPA_collaborators_header">Compartir con amigos</string>
<string name="actfm_EPA_list">Lista: %s</string>
<string name="actfm_EPA_assigned_hint">Nombre del contacto</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Sous-traitez le !</string>
<string name="actfm_EPA_assign_custom">Personnalisé...</string>
<string name="actfm_EPA_share_with">Partager avec :</string>
<string name="actfm_EPA_assigned_toast">Envoyez a %1$s (vous pouvez la voir dans la liste partagée entre vous et %2$s).</string>
<string name="actfm_EPA_collaborators_header">Partager avec des amis</string>
<string name="actfm_EPA_list">Liste : %s</string>
<string name="actfm_EPA_assigned_hint">Nom du contact</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Custom...</string>
<string name="actfm_EPA_share_with">Share with:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">Share with Friends</string>
<string name="actfm_EPA_list">List: %s</string>
<string name="actfm_EPA_assigned_hint">Contact Name</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Personalizza...</string>
<string name="actfm_EPA_share_with">Condividi con:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">Share with Friends</string>
<string name="actfm_EPA_list">Elenco: %s</string>
<string name="actfm_EPA_assigned_hint">Nome del contatto</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Custom...</string>
<string name="actfm_EPA_share_with">共有者:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">ともだちと共有する</string>
<string name="actfm_EPA_list">リスト: %s</string>
<string name="actfm_EPA_assigned_hint">連絡先名</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Custom...</string>
<string name="actfm_EPA_share_with">Share with:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">Share with Friends</string>
<string name="actfm_EPA_list">List: %s</string>
<string name="actfm_EPA_assigned_hint">Contact Name</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Custom...</string>
<string name="actfm_EPA_share_with">Share with:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">Share with Friends</string>
<string name="actfm_EPA_list">List: %s</string>
<string name="actfm_EPA_assigned_hint">Contact Name</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Besteed dit uit!</string>
<string name="actfm_EPA_assign_custom">Aangepast...</string>
<string name="actfm_EPA_share_with">Deel met:</string>
<string name="actfm_EPA_assigned_toast">Naar %1$s gestuurd (je kan dit zien in de lijst die je deelt met %2$s).</string>
<string name="actfm_EPA_collaborators_header">Deel met Vrienden</string>
<string name="actfm_EPA_list">Lijst: %s</string>
<string name="actfm_EPA_assigned_hint">Naam van contactpersoon</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Zleć to!</string>
<string name="actfm_EPA_assign_custom">Inny...</string>
<string name="actfm_EPA_share_with">Podziel się z:</string>
<string name="actfm_EPA_assigned_toast">Wyślij do %1$s (możesz to zobaczyć w liście między Tobą i %2$s).</string>
<string name="actfm_EPA_collaborators_header">Podziel się z przyjaciółmi</string>
<string name="actfm_EPA_list">Lista: %s</string>
<string name="actfm_EPA_assigned_hint">Nazwa kontaktu</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Delegar!</string>
<string name="actfm_EPA_assign_custom">Personalizado...</string>
<string name="actfm_EPA_share_with">Compartilhar com:</string>
<string name="actfm_EPA_assigned_toast">Enviada para %1$s (você pode vê-la na lista entre você e %2$s).</string>
<string name="actfm_EPA_collaborators_header">Compartilhar com Amigos</string>
<string name="actfm_EPA_list">Lista: %s</string>
<string name="actfm_EPA_assigned_hint">Nome do contato</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Custom...</string>
<string name="actfm_EPA_share_with">Partilhar com:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">Share with Friends</string>
<string name="actfm_EPA_list">List: %s</string>
<string name="actfm_EPA_assigned_hint">Nome de Contacto</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Свой...</string>
<string name="actfm_EPA_share_with">Опубликовать для:</string>
<string name="actfm_EPA_assigned_toast">Отправлено %1$s (вы можете увидеть его в списке между вами и %2$s)</string>
<string name="actfm_EPA_collaborators_header">Опубликовать для друзей</string>
<string name="actfm_EPA_list">Список: %s</string>
<string name="actfm_EPA_assigned_hint">Имя контакта</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Lägg ut det på någon annan!</string>
<string name="actfm_EPA_assign_custom">Anpassad...</string>
<string name="actfm_EPA_share_with">Dela med:</string>
<string name="actfm_EPA_assigned_toast">Skickat till %1$s (du kan se det i listan mellan dig och %2$s).</string>
<string name="actfm_EPA_collaborators_header">Dela med vänner</string>
<string name="actfm_EPA_list">Lista: %s</string>
<string name="actfm_EPA_assigned_hint">Kontaktnamn</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">Custom...</string>
<string name="actfm_EPA_share_with">Share with:</string>
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<string name="actfm_EPA_collaborators_header">Share with Friends</string>
<string name="actfm_EPA_list">List: %s</string>
<string name="actfm_EPA_assigned_hint">Contact Name</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Dış kaynak kullan!</string>
<string name="actfm_EPA_assign_custom">Özel...</string>
<string name="actfm_EPA_share_with">Şununla paylaş:</string>
<string name="actfm_EPA_assigned_toast">Gönderilen yer: %1$s (bunu sen ve %2$s arasındaki listede görebilirsin).</string>
<string name="actfm_EPA_collaborators_header">Arkadaşlarla paylaş</string>
<string name="actfm_EPA_list">Liste: %s</string>
<string name="actfm_EPA_assigned_hint">Kişi Adı</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">将任务外包</string>
<string name="actfm_EPA_assign_custom">自定义...</string>
<string name="actfm_EPA_share_with">共享给:</string>
<string name="actfm_EPA_assigned_toast">发送给%1$s你可以在你与%2$s的列表中查看到</string>
<string name="actfm_EPA_collaborators_header">与朋友分享</string>
<string name="actfm_EPA_list">列表:%s</string>
<string name="actfm_EPA_assigned_hint">联系人姓名</string>

@ -48,7 +48,6 @@
<string name="actfm_EPA_task_rabbit">Outsource it!</string>
<string name="actfm_EPA_assign_custom">自訂…</string>
<string name="actfm_EPA_share_with">加入合作者:</string>
<string name="actfm_EPA_assigned_toast">已傳送給 %1$s。 (你能在你和 %2$s 的清單中找到這工作)</string>
<string name="actfm_EPA_collaborators_header">與朋友分享</string>
<string name="actfm_EPA_list">清單:%s</string>
<string name="actfm_EPA_assigned_hint">聯絡人名稱</string>

@ -161,9 +161,6 @@
<!-- task sharing dialog: shared with label -->
<string name="actfm_EPA_share_with">Share with:</string>
<!-- Toast when assigning a task -->
<string name="actfm_EPA_assigned_toast">Sent to %1$s (you can see it in the list between you and %2$s).</string>
<!-- task sharing dialog: shared with label -->
<string name="actfm_EPA_collaborators_header">Share with Friends</string>

Loading…
Cancel
Save