From c2fc33f89e5aaf928356d905a9ae2b8ea9eb2c6f Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Fri, 8 Oct 2010 14:56:05 -0700
Subject: [PATCH] Fixing translation issues and translation test

---
 astrid/res/values-it/strings.xml                  |  2 +-
 astrid/res/values-pl/strings.xml                  |  2 +-
 .../com/todoroo/andlib/test/TranslationTests.java | 15 +++++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 244ac9ea0..234706825 100644
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -84,7 +84,7 @@
   <string name="import_summary_title">Ripristina sommario</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Il File% s contiene %s. \n\ n% s importati,\n %s esiste già \n % s contiene errori \n</string>
+  <string name="import_summary_message">Il File %s contiene %s.\n\n %s importati\n %s esiste già\n %s contiene errori\n</string>
   
   <!-- Progress Dialog Title for importing -->    
   <string name="import_progress_title">Importazione in corso...</string>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index bab4149c9..d6aca5d7d 100644
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -292,7 +292,7 @@
   <string name="FLA_search_hint">Szukaj zadań</string>
   
   <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Pasujących do</string>
+  <string name="FLA_search_filter">Pasujących do: %s</string>
   
   <!-- Toast: created shortcut (%s => label) -->
   <string name="FLA_toast_onCreateShortcut">Utworzono skrót: %s</string>
diff --git a/tests/src/com/todoroo/andlib/test/TranslationTests.java b/tests/src/com/todoroo/andlib/test/TranslationTests.java
index c5041320b..dad134ab6 100644
--- a/tests/src/com/todoroo/andlib/test/TranslationTests.java
+++ b/tests/src/com/todoroo/andlib/test/TranslationTests.java
@@ -131,12 +131,19 @@ abstract public class TranslationTests extends TodorooTestCase {
         final int[] strings = getResourceIds(getStringResources());
         final FormatStringData[] formatStrings = new FormatStringData[strings.length];
 
+        final StringBuilder failures = new StringBuilder();
+
         for(int i = 0; i < strings.length; i++) {
-            String string = r.getString(strings[i]);
-            formatStrings[i] = new FormatStringData(string);
+            try {
+                String string = r.getString(strings[i]);
+                formatStrings[i] = new FormatStringData(string);
+            } catch (Exception e) {
+                String name = r.getResourceName(strings[i]);
+                failures.append(String.format("error opening %s: %s\n",
+                        name, e.getMessage()));
+            }
         }
 
-        final StringBuilder failures = new StringBuilder();
 
         forEachLocale(new Runnable() {
             public void run() {
@@ -159,7 +166,7 @@ abstract public class TranslationTests extends TodorooTestCase {
             }
         });
 
-        assertEquals(failures.toString(), 0, errorCount(failures));
+        assertTrue(failures.toString(), errorCount(failures) == 0);
     }
 
     /**