diff options
| author | Tom Hennen <tom.hennen@gmail.com> | 2015-09-07 21:29:24 -0400 |
|---|---|---|
| committer | Tom Hennen <tom.hennen@gmail.com> | 2015-09-07 21:29:24 -0400 |
| commit | d3d59c5c06287380d23bd74f0523f8bf67c12f19 (patch) | |
| tree | 2fe8c0524185d40fde7952d5b743733af6f86833 | |
| parent | b7ad88d70ff03880c4613608dc6a40d198133430 (diff) | |
| download | AntennaPod-d3d59c5c06287380d23bd74f0523f8bf67c12f19.zip | |
update re-use old string, update tests
3 files changed, 2 insertions, 3 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java index 4fcdbeb8e..8f32f86bb 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PlaybackTest.java @@ -87,7 +87,7 @@ public class PlaybackTest extends ActivityInstrumentationTestCase2<MainActivity> private void startLocalPlayback() { openNavDrawer(); solo.clickOnText(solo.getString(R.string.episodes_label)); - solo.clickOnText(solo.getString(R.string.all_episodes_label)); + solo.clickOnText(solo.getString(R.string.all_episodes_short_label)); final List<FeedItem> episodes = DBReader.getRecentlyPublishedEpisodes(context, 10); assertTrue(solo.waitForView(solo.getView(R.id.butSecondaryAction))); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java index 231c161a2..e234d95ad 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java @@ -106,7 +106,7 @@ public class EpisodesFragment extends Fragment { case POS_ALL_EPISODES: return resources.getString(R.string.all_episodes_short_label); case POS_NEW_EPISODES: - return resources.getString(R.string.new_episodes_short_label); + return resources.getString(R.string.new_label); default: return super.getPageTitle(position); } diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 5f05e7b2d..7634322ab 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -12,7 +12,6 @@ <string name="episodes_label">Episodes</string> <string name="new_episodes_label">New Episodes</string> <string name="all_episodes_label">All Episodes</string> - <string name="new_episodes_short_label">New</string> <string name="all_episodes_short_label">All</string> <string name="new_label">New</string> <string name="waiting_list_label">Waiting List</string> |