From 01bb5ae29d1a16527d79b15e0185ce91cea09a2e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 21 Dec 2018 10:27:49 +0300 Subject: localize special category feed titles --- .../java/org/fox/ttrss/FeedCategoriesFragment.java | 2 +- .../src/main/java/org/fox/ttrss/FeedsFragment.java | 25 ++++++++++++++++++++++ org.fox.ttrss/src/main/res/values/strings.xml | 4 ++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index d3f1f4db..7dcdc44e 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -117,7 +117,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt sortCats(); if (!specialCatFound) { - m_cats.add(0, new FeedCategory(-1, "Special", 0)); + m_cats.add(0, new FeedCategory(-1, getString(R.string.cat_special), 0)); } m_adapter.notifyDataSetChanged(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index c82e6aab..0660d339 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -115,6 +115,31 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi m_feeds.add(f); catUnread += f.unread; } + + // localize special feed names + // TODO: join with shortcut title lookup by id? + if (m_activeCategory != null && m_activeCategory.id == -1) { + switch (f.id) { + case -1: + f.title = getString(R.string.feed_starred_articles); + break; + case -2: + f.title = getString(R.string.feed_published_articles); + break; + case -3: + f.title = getString(R.string.fresh_articles); + break; + case -4: + f.title = getString(R.string.feed_all_articles); + break; + case -6: + f.title = getString(R.string.feed_recently_read); + break; + case 0: + f.title = getString(R.string.feed_archived_articles); + break; + } + } } sortFeeds(); diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index 86a0a97e..e788dcc5 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -205,7 +205,11 @@ Title Sort articles Fresh articles + Special Starred articles + Published articles + Archived articles + Recently read All articles Enable FAB Show floating action button when reading -- cgit v1.2.3