From 63cd69d06be983ee2575d941f33efa0fc0190f35 Mon Sep 17 00:00:00 2001
From: Hanno Zulla <hanno.zulla@epublica.de>
Date: Tue, 16 Apr 2013 15:49:32 +0200
Subject: [PATCH] removed a_moment_ago (looks silly and is hard to translate
 properly)

---
 res/values-de/strings.xml                    |  1 -
 res/values/strings.xml                       |  1 -
 src/de/danoeh/antennapod/util/Converter.java | 11 +++--------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 949a51cd7..be723effe 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,7 +21,6 @@
   <!--Playback history-->
   <string name="clear_history_label">Chronik löschen</string>
   <!--Other-->
-  <string name="a_moment_ago">Vor Kurzem</string>
   <string name="confirm_label">Bestätigen</string>
   <string name="cancel_label">Abbrechen</string>
   <string name="author_label">Autor</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 42d08735f..5101e410e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -44,7 +44,6 @@
     <string name="processing_label">Processing</string>
     <string name="loading_label">Loading...</string>
     <string name="image_of_prefix">Image of:\u0020</string>
-    <string name="a_moment_ago">a moment ago</string>
 
     <!-- 'Add Feed' Activity labels -->
     <string name="feedurl_label">Feed URL</string>
diff --git a/src/de/danoeh/antennapod/util/Converter.java b/src/de/danoeh/antennapod/util/Converter.java
index 7ca291919..995eed119 100644
--- a/src/de/danoeh/antennapod/util/Converter.java
+++ b/src/de/danoeh/antennapod/util/Converter.java
@@ -82,15 +82,10 @@ public final class Converter {
     	return String.format("%02d:%02d", h, m);
     }
     
-    /** Converts milliseconds to a relative time span,
-     * will return "a moment ago" if it's less than a minute ago */
+    /** Converts milliseconds to a relative time span, */
     public static String getRelativeTimeSpanString(Context context, long millis) {
     	long now = System.currentTimeMillis();
-    	if (now - millis <= 60 * 1000) {
-    		return context.getString(R.string.a_moment_ago);
-    	} else {
-    		return DateUtils.getRelativeTimeSpanString(
-    				millis, now, 0, 0).toString();
-    	}
+    	return DateUtils.getRelativeTimeSpanString(
+    			millis, now, 0, 0).toString();
     }
 }