Merge branch 'master' of git://github.com/hzulla/AntennaPod into hzulla-master

res/values-ca/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">L\'emmagatzemament extern no està disponible. Assegureu-vos que està muntat per què l\'aplicació funcioni correctament.</string>
   <string name="chapters_label">Capítols</string>
   <string name="shownotes_label">Notes del programa</string>
-  <string name="last_update_prefix">Darrera actualització:\u0020</string>
   <string name="episodes_suffix">\u0020episodis</string>
   <string name="published_prefix">Publicat:\u0020</string>
   <string name="length_prefix">Durada:\u0020</string>

res/values-da/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">Ingen ekstern harddisk er tilgængelig. Vær venlig at sørge for at den eksterne hukommelse er monteret så app\'en kan fungere korrekt.</string>
   <string name="chapters_label">Kapitler</string>
   <string name="shownotes_label">Afsnitsnoter</string>
-  <string name="last_update_prefix">Sidste opdateringer:\u0020</string>
   <string name="episodes_suffix">\u0020episoder</string>
   <string name="published_prefix">Offentliggjort:\u0020</string>
   <string name="length_prefix">Længde:\u0020</string>

res/values-de/strings.xml

@@ -32,7 +32,7 @@
   <string name="external_storage_error_msg">Der externe Speicher ist nicht verfügbar. Bitte stelle sicher, dass das externe Speichermedium eingelegt ist, damit die App funktioniert.</string>
   <string name="chapters_label">Kapitel</string>
   <string name="shownotes_label">Notizen</string>
-  <string name="last_update_prefix">Letztes Update:\u0020</string>
+  <string name="most_recent_prefix">Letzte Episode:\u0020</string>
   <string name="episodes_suffix">\u0020Episoden</string>
   <string name="published_prefix">Veröffentlicht:\u0020</string>
   <string name="length_prefix">Länge:\u0020</string>

res/values-es-rES/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">No se encuentra un almacenamiento externo. Asegúrese de que su almacenamiento externo esté montado para que la aplicación funcione correctamente.</string>
   <string name="chapters_label">Capítulos</string>
   <string name="shownotes_label">Notas del programa</string>
-  <string name="last_update_prefix">Última actualización:\u0020</string>
   <string name="episodes_suffix">\u0020episodios</string>
   <string name="published_prefix">Publicado:\u0020</string>
   <string name="length_prefix">Duración:\u0020</string>

res/values-es/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">No se encuentra un almacenamiento externo. Asegúrese de que su almacenamiento externo esté montado para que la aplicación funcione correctamente.</string>
   <string name="chapters_label">Capítulos</string>
   <string name="shownotes_label">Notas del programa</string>
-  <string name="last_update_prefix">Última actualización:\u0020</string>
   <string name="episodes_suffix">\u0020episodios</string>
   <string name="published_prefix">Publicado:\u0020</string>
   <string name="length_prefix">Duración:\u0020</string>

res/values-fr/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">Aucun stockage externe n\'est disponible. Merci de connecter un  volume de stockage externe pour que l\'application puisse fonctionner correctement.</string>
   <string name="chapters_label">Chapitres</string>
   <string name="shownotes_label">Notes d\'épisode</string>
-  <string name="last_update_prefix">Dernière mise à jour :\u0020</string>
   <string name="episodes_suffix">\u0020épisodes</string>
   <string name="published_prefix">Publié :\u0020</string>
   <string name="length_prefix">Durée :\u0020</string>

res/values-it-rIT/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">Non risulta disponibile lo spazio di archiviazione esterno. Assicurati che lo spazio di archiviazione sia montato per permettere all\'applicazione di funzionare correttamente.</string>
   <string name="chapters_label">Capitoli</string>
   <string name="shownotes_label">Note dell\'episodio</string>
-  <string name="last_update_prefix">Ultimo aggiornamento:\u0020</string>
   <string name="episodes_suffix">\u0020episodi</string>
   <string name="published_prefix">Pubblicato:\u0020</string>
   <string name="length_prefix">Durata:\u0020</string>

res/values-pt-rBR/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">Não há dispositivos de armazenamento disponíveis. Por favor, certifique-se de que um dispositivo de armazenamento externo está montado para que o aplicativo possa funcionar adequadamente.</string>
   <string name="chapters_label">Capítulos</string>
   <string name="shownotes_label">Notas do podcast</string>
-  <string name="last_update_prefix">Última atualização:\u0020</string>
   <string name="episodes_suffix">\u0020episódios</string>
   <string name="published_prefix">Publicado:\u0020</string>
   <string name="length_prefix">Duração:\u0020</string>

res/values-ro-rRO/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">Nu exista stocare externă. Asigurați-vă că stocarea externă este conectată pentru ca aplicația să funcționeze corespunzător.</string>
   <string name="chapters_label">Capitole</string>
   <string name="shownotes_label">Notițe</string>
-  <string name="last_update_prefix">Ultima actualizare:\u0020</string>
   <string name="episodes_suffix">\u0020episoade</string>
   <string name="published_prefix">Publicat:\u0020</string>
   <string name="length_prefix">Durată:\u0020</string>

res/values-ru/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">Внешний носитель данных недоступен. Убедитесь что внешний носитель смонтирован, иначе это приложение не сможет нормально работать.</string>
   <string name="chapters_label">Разделы</string>
   <string name="shownotes_label">Описание</string>
-  <string name="last_update_prefix">Последнее обновление:\u0020</string>
   <string name="episodes_suffix">\u0020 выпуск(ов)</string>
   <string name="published_prefix">Опубликовано:\u0020</string>
   <string name="length_prefix">Продолжительность:\u0020</string>

res/values-uk-rUA/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">Немає доступної флешки. Зовнішній носій потрібен для коректної роботи додатку</string>
   <string name="chapters_label">Глави</string>
   <string name="shownotes_label">Нотатки до епізода</string>
-  <string name="last_update_prefix">Останнє оновлення:\u0020</string>
   <string name="episodes_suffix">\u0020епізодів</string>
   <string name="published_prefix">Опубліковано:\u0020</string>
   <string name="length_prefix">Довжина:\u0020</string>

res/values-zh-rCN/strings.xml

@@ -32,7 +32,6 @@
   <string name="external_storage_error_msg">没有可用的外部存储. 请确保安装外部存储器, 这样本应用才可以正常工作.</string>
   <string name="chapters_label">章节</string>
   <string name="shownotes_label">笔记</string>
-  <string name="last_update_prefix">最后更新:\u0020</string>
   <string name="episodes_suffix">\u0020 曲</string>
   <string name="published_prefix">发表:\u0020</string>
   <string name="length_prefix">长度:\u0020</string>

res/values/strings.xml

@@ -36,7 +36,7 @@
     <string name="external_storage_error_msg">No external storage is available. Please make sure that external storage is mounted so that the app can work properly.</string>
     <string name="chapters_label">Chapters</string>
     <string name="shownotes_label">Shownotes</string>
-    <string name="last_update_prefix">Last Update:\u0020</string>
+    <string name="most_recent_prefix">Most Recent Episode:\u0020</string>
     <string name="episodes_suffix">\u0020episodes</string>
     <string name="published_prefix">Published:\u0020</string>
     <string name="length_prefix">Length:\u0020</string>

src/de/danoeh/antennapod/adapter/DefaultFeedItemlistAdapter.java

@@ -1,7 +1,5 @@
 package de.danoeh.antennapod.adapter;
 
-import java.text.DateFormat;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.text.format.DateUtils;
@@ -75,10 +73,9 @@ public class DefaultFeedItemlistAdapter extends BaseAdapter {
 			holder.title.setText(item.getTitle());
 			holder.published.setText(convertView.getResources().getString(
 					R.string.published_prefix)
-					+ DateUtils.formatSameDayTime(item.getPubDate().getTime(),
-							System.currentTimeMillis(), DateFormat.MEDIUM,
-							DateFormat.SHORT));
-
+					+ DateUtils.getRelativeTimeSpanString(
+							item.getPubDate().getTime(),
+							System.currentTimeMillis(), 0, 0));
 			if (item.getMedia() == null) {
 				holder.type.setVisibility(View.GONE);
 				holder.lenSize.setVisibility(View.GONE);

src/de/danoeh/antennapod/adapter/DownloadLogAdapter.java

@@ -1,7 +1,5 @@
 package de.danoeh.antennapod.adapter;
 
-import java.text.DateFormat;
-
 import android.content.Context;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
@@ -60,9 +58,9 @@ public class DownloadLogAdapter extends BaseAdapter {
 		} else {
 			holder.title.setText(R.string.download_log_title_unknown);
 		}
-		holder.date.setText(DateUtils.formatSameDayTime(status
-				.getCompletionDate().getTime(), System.currentTimeMillis(),
-				DateFormat.SHORT, DateFormat.SHORT));
+		holder.date.setText(DateUtils.getRelativeTimeSpanString(
+				status.getCompletionDate().getTime(),
+				System.currentTimeMillis(), 0, 0));
 		if (status.isSuccessful()) {
 			holder.successful.setTextColor(convertView.getResources().getColor(
 					R.color.download_success_green));

src/de/danoeh/antennapod/adapter/FeedlistAdapter.java

@@ -1,7 +1,5 @@
 package de.danoeh.antennapod.adapter;
 
-import java.text.DateFormat;
-
 import android.content.Context;
 import android.text.format.DateUtils;
 import android.view.LayoutInflater;
@@ -77,16 +75,19 @@ public class FeedlistAdapter extends BaseAdapter {
 		}
 
 		holder.title.setText(feed.getTitle());
+		int numOfItems = feed.getNumOfItems(true);
 		if (DownloadRequester.getInstance().isDownloadingFile(feed)) {
 			holder.lastUpdate.setText(R.string.refreshing_label);
 		} else {
-			holder.lastUpdate.setText(convertView.getResources().getString(
-					R.string.last_update_prefix)
-					+ DateUtils.formatSameDayTime(feed.getLastUpdate()
-							.getTime(), System.currentTimeMillis(),
-							DateFormat.MEDIUM, DateFormat.SHORT));
+			if (numOfItems > 0) {
+				holder.lastUpdate.setText(convertView.getResources().getString(
+						R.string.most_recent_prefix)
+						+ DateUtils.getRelativeTimeSpanString(
+								feed.getItemAtIndex(true, 0).getPubDate().getTime(),
+								System.currentTimeMillis(), 0, 0));
+			}
 		}
-		holder.numberOfEpisodes.setText(feed.getNumOfItems(true)
+		holder.numberOfEpisodes.setText(numOfItems
 				+ convertView.getResources()
 						.getString(R.string.episodes_suffix));
 

src/de/danoeh/antennapod/adapter/InternalFeedItemlistAdapter.java

@@ -1,7 +1,5 @@
 package de.danoeh.antennapod.adapter;
 
-import java.text.DateFormat;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.text.format.DateUtils;
@@ -122,9 +120,9 @@ public class InternalFeedItemlistAdapter extends DefaultFeedItemlistAdapter {
 
 			holder.published.setText(convertView.getResources().getString(
 					R.string.published_prefix)
-					+ DateUtils.formatSameDayTime(item.getPubDate().getTime(),
-							System.currentTimeMillis(), DateFormat.MEDIUM,
-							DateFormat.SHORT));
+					+ DateUtils.getRelativeTimeSpanString(
+							item.getPubDate().getTime(),
+							System.currentTimeMillis(), 0, 0));
 
 			FeedMedia media = item.getMedia();
 			if (media == null) {

src/de/danoeh/antennapod/adapter/MiroGuideItemlistAdapter.java

@@ -1,6 +1,5 @@
 package de.danoeh.antennapod.adapter;
 
-import java.text.DateFormat;
 import java.util.List;
 
 import android.content.Context;
@@ -42,9 +41,8 @@ public class MiroGuideItemlistAdapter extends ArrayAdapter<MiroGuideItem> {
 
 		holder.title.setText(item.getName());
 		if (item.getDate() != null) {
-			holder.date.setText(DateUtils.formatSameDayTime(item.getDate()
-					.getTime(), System.currentTimeMillis(), DateFormat.SHORT,
-					DateFormat.SHORT));
+			holder.date.setText(DateUtils.getRelativeTimeSpanString(
+					item.getDate().getTime(), System.currentTimeMillis(), 0, 0));
 			holder.date.setVisibility(View.VISIBLE);
 		} else {
 			holder.date.setVisibility(View.GONE);

src/de/danoeh/antennapod/util/Converter.java

@@ -78,4 +78,5 @@ public final class Converter {
     	
     	return String.format("%02d:%02d", h, m);
     }
+    
 }