diff options
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/activity/AddFeedActivity.java | 4 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/service/PlaybackService.java | 4 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/service/download/DownloadService.java | 12 |
4 files changed, 17 insertions, 9 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index e0bf13d14..d30526bce 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -75,6 +75,9 @@ <string name="download_error_malformed_url">Malformed URL</string> <string name="download_error_io_error">IO Error</string> <string name="download_error_device_not_found">External storage unavailable</string> + <string name="downloads_left">\u0020Downloads left</string> + <string name="download_notification_title">Downloading podcast data</string> + <string name="download_report_content">%1$d downloads succeeded, %2$d failed</string> <!-- Mediaplayer messages --> <string name="player_error_msg">Error!</string> @@ -87,7 +90,8 @@ <string name="no_media_playing_label">No media playing</string> <string name="position_default_label">00:00:00</string> <string name="player_buffering_msg">Buffering</string> - + <string name="playbackservice_notification_title">Playing podcast</string> + <string name="playbackservice_notification_content">Tap here for more info</string> <!-- Navigation --> <string name="show_download_log">Show Log</string> <string name="show_player_label">Show player</string> diff --git a/src/de/danoeh/antennapod/activity/AddFeedActivity.java b/src/de/danoeh/antennapod/activity/AddFeedActivity.java index 8fa9c75e0..1502ee13b 100644 --- a/src/de/danoeh/antennapod/activity/AddFeedActivity.java +++ b/src/de/danoeh/antennapod/activity/AddFeedActivity.java @@ -150,7 +150,7 @@ public class AddFeedActivity extends SherlockActivity { /** Start listening for any intents send by the DownloadService. */ private void observeDownload(Feed feed) { progDialog.show(); - progDialog.setMessage("Downloading Feed"); + progDialog.setMessage(getString(R.string.loading_label)); } private void handleDownloadError(int reason) { @@ -158,7 +158,7 @@ public class AddFeedActivity extends SherlockActivity { errorDialog.setTitle(R.string.error_label); errorDialog.setMessage(getString(R.string.error_msg_prefix) + " " + DownloadError.getErrorString(this, reason)); - errorDialog.setButton("OK", new DialogInterface.OnClickListener() { + errorDialog.setButton(getString(android.R.string.ok), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { errorDialog.dismiss(); diff --git a/src/de/danoeh/antennapod/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java index e2c334386..74a22b17d 100644 --- a/src/de/danoeh/antennapod/service/PlaybackService.java +++ b/src/de/danoeh/antennapod/service/PlaybackService.java @@ -722,8 +722,8 @@ public class PlaybackService extends Service { Bitmap icon = BitmapFactory.decodeResource(null, R.drawable.ic_stat_antenna); notificationBuilder = new NotificationCompat.Builder(this) - .setContentTitle("Mediaplayer Service") - .setContentText("Click here for more info").setOngoing(true) + .setContentTitle(getString(R.string.playbackservice_notification_title)) + .setContentText(getString(R.string.playbackservice_notification_content)).setOngoing(true) .setContentIntent(pIntent).setLargeIcon(icon) .setSmallIcon(R.drawable.ic_stat_antenna); diff --git a/src/de/danoeh/antennapod/service/download/DownloadService.java b/src/de/danoeh/antennapod/service/download/DownloadService.java index 04a628d23..fbfabdd7c 100644 --- a/src/de/danoeh/antennapod/service/download/DownloadService.java +++ b/src/de/danoeh/antennapod/service/download/DownloadService.java @@ -44,6 +44,7 @@ import android.util.Log; import android.webkit.URLUtil; import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.PodcastApp; +import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.DownloadActivity; import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.asynctask.DownloadStatus; @@ -204,9 +205,11 @@ public class DownloadService extends Service { Bitmap icon = BitmapFactory.decodeResource(null, android.R.drawable.stat_notify_sync_noanim); notificationBuilder = new NotificationCompat.Builder(this) - .setContentTitle("Downloading Podcast data") + .setContentTitle( + getString(R.string.download_notification_title)) .setContentText( - requester.getNumberOfDownloads() + " Downloads left") + requester.getNumberOfDownloads() + + getString(R.string.downloads_left)) .setOngoing(true).setContentIntent(pIntent).setLargeIcon(icon) .setSmallIcon(android.R.drawable.stat_notify_sync_noanim); @@ -451,8 +454,9 @@ public class DownloadService extends Service { .setContentTitle( getString(de.danoeh.antennapod.R.string.download_report_title)) .setContentText( - successfulDownloads + " Downloads succeeded, " - + failedDownloads + " failed") + String.format( + getString(R.string.download_report_content), + successfulDownloads, failedDownloads)) .setSmallIcon(android.R.drawable.stat_notify_sync) .setLargeIcon( BitmapFactory.decodeResource(null, |