From dc2972954fbd36bc63cf23973acd7a3559973242 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 9 Dec 2011 17:14:29 -0800
Subject: [PATCH] Fixed some strings and some broken unit tests

---
 astrid/res/values-nl/strings.xml                              | 2 +-
 astrid/res/values/strings-core.xml                            | 2 +-
 tests/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java    | 2 +-
 .../todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java    | 2 +-
 .../astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java      | 4 +++-
 .../com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java    | 4 ++--
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index 36f7951a0..72f4e2751 100644
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -2081,7 +2081,7 @@
   <string name="TEA_no_tags_modified">Niets gewijzigd</string>
 
   <!-- Toast notification that a tag has been deleted -->
-  <string name="TEA_tags_deleted">De lijst %1 is verwijderd, van invloed op %2$d taken</string>
+  <string name="TEA_tags_deleted">De lijst %1$s is verwijderd, van invloed op %2$d taken</string>
 
   <!-- Toast notification that a tag has been renamed -->
   <string name="TEA_tags_renamed">Taak %1$s hernoemd naar %2$s voor %3$d taken</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 5d0afb950..2d4eff17e 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -425,7 +425,7 @@
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
   <!-- Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be displayed in quick action bar</string>  
+  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Notes will always be displayed</string>
   
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java
index a42f9ce19..9d3f145e6 100644
--- a/tests/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java
@@ -446,7 +446,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     private com.google.api.services.tasks.model.Task refetchRemoteTask(com.google.api.services.tasks.model.Task remoteTask) throws Exception {
-        return gtasksService.getGtask(GtasksApiUtilities.extractListIdFromSelfLink(remoteTask), remoteTask.getId());
+        return gtasksService.getGtask(DEFAULT_LIST, remoteTask.getId());
     }
 
     private long localIdForTask(com.google.api.services.tasks.model.Task remoteTask) {
diff --git a/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
index 9c849f241..0ec9d50c3 100644
--- a/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
+++ b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
@@ -37,7 +37,7 @@ public class RepeatTestsGtasksSync extends NewRepeatTests<com.google.api.service
     @Autowired GtasksPreferenceService gtasksPreferenceService;
 
     private static final String TEST_ACCOUNT = "sync_tester2@astrid.com";
-    private static final String DEFAULT_LIST = "@default";
+    public static final String DEFAULT_LIST = "@default";
 
     private static boolean initialized = false;
     protected static GtasksService gtasksService;
diff --git a/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java
index 87889e5ce..2474d4ea7 100644
--- a/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java
+++ b/tests/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java
@@ -1,5 +1,7 @@
 package com.todoroo.astrid.sync.repeats;
 
+import static com.todoroo.astrid.sync.repeats.RepeatTestsGtasksSync.DEFAULT_LIST;
+
 import java.io.IOException;
 import java.util.Date;
 
@@ -24,7 +26,7 @@ public class RepeatTestsGtasksSyncRemote extends RepeatTestsGtasksSync {
         remoteModel.setCompleted(GtasksApiUtilities.unixTimeToGtasksCompletionTime(completionDate));
         remoteModel.setStatus("completed");
         try {
-            gtasksService.updateGtask(GtasksApiUtilities.extractListIdFromSelfLink(remoteModel), remoteModel);
+            gtasksService.updateGtask(DEFAULT_LIST, remoteModel);
         } catch (IOException e) {
             e.printStackTrace();
             fail("Exception in gtasks service");
diff --git a/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java b/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java
index 9f0271508..3043d557b 100644
--- a/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java
+++ b/tests/src/com/todoroo/astrid/upgrade/Astrid2To3UpgradeTests.java
@@ -11,8 +11,8 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.TestDependencyInjector;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.astrid.dao.MetadataDao;
-import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
+import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
@@ -25,11 +25,11 @@ import com.todoroo.astrid.legacy.data.sync.SyncDataController;
 import com.todoroo.astrid.legacy.data.sync.SyncMapping;
 import com.todoroo.astrid.legacy.data.tag.TagController;
 import com.todoroo.astrid.legacy.data.tag.TagIdentifier;
+import com.todoroo.astrid.legacy.data.task.AbstractTaskModel.RepeatInfo;
 import com.todoroo.astrid.legacy.data.task.TaskController;
 import com.todoroo.astrid.legacy.data.task.TaskIdentifier;
 import com.todoroo.astrid.legacy.data.task.TaskModelForEdit;
 import com.todoroo.astrid.legacy.data.task.TaskModelForSync;
-import com.todoroo.astrid.legacy.data.task.AbstractTaskModel.RepeatInfo;
 import com.todoroo.astrid.service.Astrid2To3UpgradeHelper;
 import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TagService.Tag;