From b0543430bef74de12dcca2381df4409c2166c6cc Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 7 Feb 2012 17:21:29 -0800
Subject: [PATCH] Updated copy on filter by unassigned in tag view

---
 .../com/todoroo/astrid/actfm/TagViewFragment.java     | 11 +++++++----
 astrid/res/values/strings-actfm.xml                   |  5 ++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index 290ccd9b8..b07a9fb32 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -280,8 +280,8 @@ public class TagViewFragment extends TaskListFragment {
                 addImageForMember(membersView, owner);
 
                 JSONObject unassigned = new JSONObject();
-                unassigned.put("id", Task.USER_ID_UNASSIGNED);
-                unassigned.put("name", getActivity().getString(R.string.actfm_EPA_unassigned));
+                unassigned.put("id", Task.USER_ID_UNASSIGNED); //$NON-NLS-1$
+                unassigned.put("name", getActivity().getString(R.string.actfm_EPA_unassigned)); //$NON-NLS-1$
                 addImageForMember(membersView, unassigned);
             }
         } catch (JSONException e) {
@@ -340,14 +340,17 @@ public class TagViewFragment extends TaskListFragment {
                     if (currentId == ActFmPreferenceService.userId())
                         assignedCriterion = Criterion.or(Task.USER_ID.eq(0), Task.USER_ID.eq(id));
                     else if (currentId == Task.USER_ID_EMAIL && !TextUtils.isEmpty(email))
-                        assignedCriterion = Task.USER.like("%" + email + "%"); //$NON-NLS-1$
+                        assignedCriterion = Task.USER.like("%" + email + "%"); //$NON-NLS-1$ //$NON-NLS-2$
                     else
                         assignedCriterion = Task.USER_ID.eq(id);
                     Criterion assigned = Criterion.and(TaskCriteria.activeAndVisible(), assignedCriterion);
                     filter = TagFilterExposer.filterFromTag(getActivity(), new Tag(tagData), assigned);
                     TextView filterByAssigned = (TextView) getView().findViewById(R.id.filter_assigned);
                     filterByAssigned.setVisibility(View.VISIBLE);
-                    filterByAssigned.setText(getString(R.string.actfm_TVA_filtered_by_assign, displayName));
+                    if (id == Task.USER_ID_UNASSIGNED)
+                        filterByAssigned.setText(getString(R.string.actfm_TVA_filter_by_unassigned));
+                    else
+                        filterByAssigned.setText(getString(R.string.actfm_TVA_filtered_by_assign, displayName));
                     setUpTaskList();
                 }
             }
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 2250b942b..2eeba7e3f 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -69,6 +69,9 @@
   
   <!-- Tag View: filtered by assigned to user (%s => user name) -->
   <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
+  
+  <!-- Tag View: filter by unassigned tasks -->
+  <string name="actfm_TVA_filter_by_unassigned">Unassigned tasks. Tap for all.</string>
 
   <!-- Tag View: list is private, no members -->
   <string name="actfm_TVA_no_members_alert">Private: tap to share or edit</string>
@@ -125,7 +128,7 @@
   <string name="actfm_EPA_assign_me">Me</string>
   
   <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Anyone</string>
+  <string name="actfm_EPA_unassigned">Unassigned</string>
   
   <!-- task sharing dialog: custom email assignment -->
   <string name="actfm_EPA_assign_custom">Custom...</string>