Merge pull request #20513 from wordpress-mobile/issue/20297-reader-up…

…date-strings-follow-tags

[Reader] Use `"follow"` for tag strings instead of `"subscribe"`

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java

@@ -300,7 +300,7 @@ private void addAsTag(final String entry) {
         }
 
         if (ReaderTagTable.isFollowedTagName(entry)) {
-            showInfoSnackbar(getString(R.string.reader_toast_err_tag_already_subscribed));
+            showInfoSnackbar(getString(R.string.reader_toast_err_tag_already_following));
             return;
         }
 
@@ -561,7 +561,7 @@ private class SubsPageAdapter extends FragmentPagerAdapter {
         public CharSequence getPageTitle(int position) {
             switch (position) {
                 case TAB_IDX_FOLLOWED_TAGS:
-                    return getString(R.string.reader_page_followed_tags_title);
+                    return getString(R.string.reader_page_followed_tags_text_title);
                 case TAB_IDX_FOLLOWED_BLOGS:
                     return getString(R.string.reader_page_followed_blogs_title);
                 default:

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderTagFragment.java

@@ -72,7 +72,7 @@ private void checkEmptyView() {
         }
 
         actionableEmptyView.image.setVisibility(View.GONE);
-        actionableEmptyView.title.setText(R.string.reader_no_followed_tags_title);
+        actionableEmptyView.title.setText(R.string.reader_no_followed_tags_text_title);
         actionableEmptyView.subtitle.setText(R.string.reader_empty_subscribed_tags_subtitle);
         actionableEmptyView.subtitle.setVisibility(View.VISIBLE);
         actionableEmptyView.setVisibility(hasTagAdapter() && getTagAdapter().isEmpty() ? View.VISIBLE : View.GONE);

WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModel.kt

@@ -560,14 +560,14 @@ class ReaderDiscoverViewModel @Inject constructor(
 
             data class ShowNoFollowedTagsUiState(override val action: () -> Unit) : EmptyUiState() {
                 override val titleResId = R.string.reader_discover_empty_title
-                override val subTitleRes = R.string.reader_discover_empty_subtitle_subscribe
+                override val subTitleRes = R.string.reader_discover_empty_subtitle_follow
                 override val buttonResId = R.string.reader_discover_empty_button_text
             }
 
             data class ShowNoPostsUiState(override val action: () -> Unit) : EmptyUiState() {
                 override val titleResId = R.string.reader_discover_no_posts_title
-                override val buttonResId = R.string.reader_discover_no_posts_button_tags_text
-                override val subTitleRes = R.string.reader_discover_no_posts_subscribe_subtitle
+                override val buttonResId = R.string.reader_discover_no_posts_button_tags_text_follow
+                override val subTitleRes = R.string.reader_discover_no_posts_follow_subtitle
                 override val illustrationResId = R.drawable.illustration_reader_empty
             }
         }

WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/SubfilterPageViewModel.kt

@@ -58,7 +58,7 @@ class SubfilterPageViewModel @Inject constructor(
                 )
             } else {
                 VisibleEmptyUiState.Button(
-                    text = UiStringRes(R.string.reader_filter_empty_tags_action_subscribe),
+                    text = UiStringRes(R.string.reader_filter_empty_tags_action_follow),
                     action = ActionType.OpenSubsAtPage(ReaderSubsActivity.TAB_IDX_FOLLOWED_TAGS)
                 )
             }
@@ -80,7 +80,7 @@ class SubfilterPageViewModel @Inject constructor(
                         }
                     } else {
                         if (accountStore.hasAccessToken()) {
-                            R.string.reader_filter_empty_tags_list_text
+                            R.string.reader_filter_empty_tags_list_follow_text
                         } else {
                             R.string.reader_filter_self_hosted_empty_tags_list
                         }

WordPress/src/main/res/layout/reader_activity_subs.xml

@@ -74,7 +74,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_toStartOf="@+id/btn_add"
-            android:hint="@string/reader_hint_add_tag_or_url_subscribe"
+            android:hint="@string/reader_hint_add_tag_or_url_follow"
             android:minHeight="@dimen/min_touch_target_sz"
             android:paddingStart="@dimen/margin_large"
             android:paddingEnd="@dimen/margin_medium"

WordPress/src/main/res/layout/reader_discover_fragment_layout.xml

@@ -34,9 +34,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        app:aevButton="@string/reader_discover_no_posts_button_tags_text"
+        app:aevButton="@string/reader_discover_no_posts_button_tags_text_follow"
         app:aevImage="@drawable/illustration_reader_empty"
-        app:aevSubtitle="@string/reader_discover_no_posts_subscribe_subtitle"
+        app:aevSubtitle="@string/reader_discover_no_posts_follow_subtitle"
         app:aevTitle="@string/reader_discover_no_posts_title"
         app:aevButtonStyle="reader"
         tools:visibility="visible" />

WordPress/src/main/res/layout/subfilter_page_fragment.xml

@@ -42,7 +42,7 @@
             android:layout_width="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/margin_extra_extra_medium_large"
-            android:text="@string/reader_filter_empty_tags_list_text"
+            android:text="@string/reader_filter_empty_tags_list_follow_text"
             app:fixWidowWords="true" />
 
         <com.google.android.material.button.MaterialButton
@@ -66,7 +66,7 @@
             android:layout_gravity="center_horizontal"
             android:minHeight="@dimen/default_dialog_button_height"
             android:visibility="visible"
-            android:text="@string/reader_filter_empty_tags_action_subscribe" />
+            android:text="@string/reader_filter_empty_tags_action_follow" />
 
     </LinearLayout>
 </RelativeLayout>

WordPress/src/main/res/values-ar/strings.xml

@@ -28,7 +28,6 @@ Language: ar
     <string name="reader_empty_followed_blogs_button_subscriptions">الانتقال إلى الاشتراكات</string>
     <string name="reader_empty_followed_blogs_subscribed_no_recent_posts_description">لم تنشر المدونات التي اشتركتَ فيها أي شيء مؤخرًا</string>
     <string name="reader_no_followed_blogs_description_subs">اشترك في المدونات ضمن \"اكتشاف\" أو ابحث عن مدونة تنال إعجابك بالفعل.</string>
-    <string name="reader_no_followed_tags_title">لا توجد وسوم تم الاشتراك فيها</string>
     <string name="reader_no_posts_with_this_tag">لا توجد تدوينات تحمل هذا الوسم</string>
     <string name="reader_toast_err_unable_to_block_blog">يتعذر حظر هذه المدونة</string>
     <string name="reader_toast_posts_from_this_blog_blocked">لن تظهر التدوينات الواردة من هذه المدونة بعد الآن</string>
@@ -38,20 +37,17 @@ Language: ar
     <string name="reader_no_recommended_blogs_title">لا توجد مدونات موصى بها</string>
     <string name="reader_toast_err_already_follow_this_blog">لقد اشتركت في هذه المدونة بالفعل</string>
     <string name="reader_toast_err_show_blog">يتعذر إظهار هذه المدونة</string>
-    <string name="reader_toast_err_tag_already_subscribed">أنت مشترك بالفعل في هذه المدونة</string>
     <string name="reader_label_choose_interests">اختيار اهتماماتك</string>
     <string name="reader_label_subscribers_count_single">مشترك واحد</string>
     <string name="reader_label_subscribers_count">%s من المشتركين</string>
     <string name="reader_label_subscribe_count">%,d من المشتركين</string>
     <string name="reader_label_blog_subscribed">تم الاشتراك في المدونة</string>
     <string name="reader_hint_search_subscribed_blogs">البحث عن المدونات التي تم الاشتراك فيها</string>
-    <string name="reader_hint_add_tag_or_url_subscribe">إدخال عنوان URL أو وسم للاشتراك فيها</string>
     <string name="reader_btn_subscribed">مشترك</string>
     <string name="reader_btn_subscribe">اشترك</string>
     <string name="reader_menu_block_this_blog">حظر هذه المدونة</string>
     <string name="reader_menu_tags_and_blogs">تحرير الوسوم والمدونات</string>
     <string name="reader_page_followed_blogs_title">المدونات التي تم الاشتراك فيها</string>
-    <string name="reader_page_followed_tags_title">الوسوم التي تم الاشتراك فيها</string>
     <string name="reader_title_tags">اتباع الوسوم</string>
     <string name="reader_activity_title_manage_tags_blogs">إدارة الوسوم والمدونات</string>
     <string name="reader_activity_title_tag_preview">الوسم</string>
@@ -69,20 +65,14 @@ Language: ar
     <string name="reader_dropdown_menu_subscriptions">الاشتراكات</string>
     <string name="reader_dropdown_menu_discover">اكتشاف</string>
     <string name="reader_search_content_description">البحث</string>
-    <string name="reader_discover_no_posts_button_tags_text">الاشتراك في الوسوم</string>
-    <string name="reader_discover_no_posts_subscribe_subtitle">محاولة الاشتراك في مزيد من الوسوم لتوسيع نطاق البحث</string>
-    <string name="reader_discover_empty_subtitle_subscribe">الاشتراك في الوسوم لاكتشاف مدونات جديدة</string>
     <string name="reader_discover_recommended_blogs_to_subscribe_header">المدونات المطلوب الاشتراك فيها</string>
-    <string name="reader_filter_empty_tags_action_subscribe">الاشتراك في وسم</string>
     <string name="reader_filter_empty_tags_action_suggested">الوسوم المقترحة</string>
     <string name="reader_filter_empty_blogs_action_search">البحث في مدونة</string>
-    <string name="reader_filter_empty_tags_list_text">اشترك في وسم وستتمكن من الاطلاع على أفضل التدوينات الواردة منه هنا.</string>
     <string name="reader_dropdown_menu_automattic">Automattic</string>
     <string name="reader_filter_empty_tags_list_title">لا توجد وسوم</string>
     <string name="reader_filter_empty_blogs_list_text">اشترك في المدونات ضمن \"اكتشاف\" وسترى أحدث تدوينات فيها هنا. أو ابحث عن مدونة تنال إعجابك بالفعل.</string>
     <string name="reader_filter_empty_blogs_list_title">لا توجد اشتراكات في المدونة</string>
     <string name="reader_filter_empty_blogs_action">الاشتراك في المدونة</string>
-    <string name="reader_filter_empty_tags_list_subscribe">يمكنك الاشتراك في التدوينات الموجودة حول موضوع معيَّن عن طريق إضافة وسم</string>
     <string name="reader_filter_by_tag_title">التصفية حسب الوسم</string>
     <string name="reader_filter_by_blog_title">التصفية حسب المدونة</string>
     <string name="stats_timeframe_by_year">حسب العام</string>

WordPress/src/main/res/values-de/strings.xml

@@ -29,7 +29,6 @@ Language: de
     <string name="reader_empty_followed_blogs_subscribed_no_recent_posts_description">Die Blogs, die du abonniert hast, haben in letzter Zeit nichts veröffentlicht</string>
     <string name="reader_no_followed_blogs_description_subs">Abonniere Blogs in Entdecken oder suche nach einem Blog, den du bereits magst.</string>
     <string name="reader_no_recommended_blogs_title">Keine empfohlenen Blogs</string>
-    <string name="reader_no_followed_tags_title">Keine abonnierten Schlagwörter</string>
     <string name="reader_no_posts_with_this_tag">Keine Beiträge mit diesem Schlagwort</string>
     <string name="reader_toast_err_unable_to_block_blog">Dieser Blog kann nicht blockiert werden</string>
     <string name="reader_toast_posts_from_this_blog_blocked">Beiträge aus diesem Blog werden nicht mehr angezeigt</string>
@@ -38,20 +37,17 @@ Language: de
     <string name="reader_toast_err_unable_to_follow_blog">Dieser Blog kann nicht abonniert werden</string>
     <string name="reader_toast_err_already_follow_this_blog">Du hast diesen Blog bereits abonniert</string>
     <string name="reader_toast_err_show_blog">Dieser Blog kann nicht angezeigt werden</string>
-    <string name="reader_toast_err_tag_already_subscribed">Du hast dieses Schlagwort bereits abonniert</string>
     <string name="reader_label_choose_interests">Wähle deine Interessengebiete</string>
     <string name="reader_label_subscribers_count_single">1 Abonnent</string>
     <string name="reader_label_subscribers_count">%s Abonnenten</string>
     <string name="reader_label_subscribe_count">%,d Abonnenten</string>
     <string name="reader_label_blog_subscribed">Blog abonniert</string>
     <string name="reader_hint_search_subscribed_blogs">Suche in abonnierten Blogs</string>
-    <string name="reader_hint_add_tag_or_url_subscribe">Gib eine URL oder ein Schlagwort ein, das du abonnieren möchtest</string>
     <string name="reader_btn_subscribed">Abonniert</string>
     <string name="reader_btn_subscribe">Abonnieren</string>
     <string name="reader_menu_block_this_blog">Dieses Blog blockieren</string>
     <string name="reader_menu_tags_and_blogs">Schlagwörter und Blogs bearbeiten</string>
     <string name="reader_page_followed_blogs_title">Abonnierte Blogs</string>
-    <string name="reader_page_followed_tags_title">Abonnierte Schlagwörter</string>
     <string name="reader_title_tags">Schlagwörtern folgen</string>
     <string name="reader_activity_title_manage_tags_blogs">Schlagwörter und Blogs verwalten</string>
     <string name="reader_activity_title_tag_preview">Schlagwort</string>
@@ -70,19 +66,13 @@ Language: de
     <string name="reader_dropdown_menu_subscriptions">Abonnements</string>
     <string name="reader_dropdown_menu_discover">Entdecken</string>
     <string name="reader_search_content_description">Suche</string>
-    <string name="reader_discover_no_posts_button_tags_text">Schlagwörter abonnieren</string>
-    <string name="reader_discover_no_posts_subscribe_subtitle">Versuche, mehr Schlagwörter zu abonnieren, um die Suche zu erweitern</string>
-    <string name="reader_discover_empty_subtitle_subscribe">Abonniere Schlagwörter, um neue Blogs zu entdecken</string>
     <string name="reader_discover_recommended_blogs_to_subscribe_header">Blogs, die du abonnieren kannst</string>
-    <string name="reader_filter_empty_tags_action_subscribe">Ein Schlagwort abonnieren</string>
     <string name="reader_filter_empty_tags_action_suggested">Vorgeschlagene Schlagwörter</string>
     <string name="reader_filter_empty_blogs_action_search">Suche nach einem Blog</string>
-    <string name="reader_filter_empty_tags_list_text">Abonniere ein Schlagwort und du siehst hier die besten Beiträge dazu.</string>
     <string name="reader_filter_empty_tags_list_title">Keine Schlagwörter</string>
     <string name="reader_filter_empty_blogs_list_text">Abonniere Blogs in Entdecken und die neuesten Beiträge werden hier angezeigt. Oder suche nach einem Blog, den du bereits magst.</string>
     <string name="reader_filter_empty_blogs_list_title">Keine Blog-Abonnements</string>
     <string name="reader_filter_empty_blogs_action">Einen Blog abonnieren</string>
-    <string name="reader_filter_empty_tags_list_subscribe">Du kannst Beiträge zu einem bestimmten Thema abonnieren, indem du ein Schlagwort hinzufügst</string>
     <string name="reader_filter_empty_blogs_list">Sieh dir die neuesten Beiträge der Blogs an, die du abonniert hast</string>
     <string name="reader_filter_by_tag_title">Nach Schlagwort filtern</string>
     <string name="reader_filter_by_blog_title">Nach Blog filtern</string>

WordPress/src/main/res/values-en-rCA/strings.xml

@@ -28,7 +28,6 @@ Language: en_CA
     <string name="site_monitoring_tab_title_metrics">Metrics</string>
     <string name="site_monitoring_tab_title_php_logs">PHP Logs</string>
     <string name="site_monitoring_tab_title_web_server_logs">Web Server Logs</string>
-    <string name="reader_no_followed_tags_title">No subscribed tags</string>
     <string name="reader_no_posts_with_this_tag">No posts with this tag</string>
     <string name="reader_no_recommended_blogs_title">No recommended blogs</string>
     <string name="reader_toast_err_follow_not_authorized_to_access_blog">You are not authorized to access this blog</string>
@@ -40,26 +39,20 @@ Language: en_CA
     <string name="reader_label_subscribers_count_single">1 subscriber</string>
     <string name="reader_toast_err_already_follow_this_blog">You are already subscribed to this blog</string>
     <string name="reader_toast_err_show_blog">Unable to show this blog</string>
-    <string name="reader_toast_err_tag_already_subscribed">You\'re already subscribed to this tag</string>
     <string name="reader_activity_title_blog_preview">Reader Blog</string>
     <string name="reader_activity_title_manage_tags_blogs">Manage Tags &amp; Blogs</string>
     <string name="reader_activity_title_tag_preview">Tag</string>
     <string name="reader_btn_subscribe">Subscribe</string>
     <string name="reader_btn_subscribed">Subscribed</string>
-    <string name="reader_hint_add_tag_or_url_subscribe">Enter a URL or tag to subscribe to</string>
     <string name="reader_hint_search_subscribed_blogs">Search subscribed blogs</string>
     <string name="reader_label_blog_subscribed">Blog subscribed</string>
     <string name="reader_label_subscribe_count">%,d Subscribers</string>
     <string name="reader_label_subscribers_count">%s subscribers</string>
     <string name="reader_menu_block_this_blog">Block this blog</string>
     <string name="reader_menu_tags_and_blogs">Edit tags and blogs</string>
     <string name="reader_page_followed_blogs_title">Subscribed blogs</string>
-    <string name="reader_page_followed_tags_title">Subscribed tags</string>
     <string name="reader_subscribed_display_name">Subscribed</string>
     <string name="reader_title_tags">Follow tags</string>
-    <string name="reader_discover_empty_subtitle_subscribe">Subscribe to tags to discover new blogs</string>
-    <string name="reader_discover_no_posts_button_tags_text">Subscribe to tags</string>
-    <string name="reader_discover_no_posts_subscribe_subtitle">Try subscribing to more tags to broaden the search</string>
     <string name="reader_discover_recommended_blogs_to_subscribe_header">Blogs to subscribe to</string>
     <string name="reader_dropdown_menu_automattic">Automattic</string>
     <string name="reader_dropdown_menu_discover">Discover</string>
@@ -74,9 +67,7 @@ Language: en_CA
     <string name="reader_filter_chip_tag_other">%d Tags</string>
     <string name="reader_filter_chip_tag_zero">0 Tags</string>
     <string name="reader_filter_empty_blogs_action_search">Search for a blog</string>
-    <string name="reader_filter_empty_tags_action_subscribe">Subscribe to a tag</string>
     <string name="reader_filter_empty_tags_action_suggested">Suggested tags</string>
-    <string name="reader_filter_empty_tags_list_text">Subscribe to a tag and you’ll be able to see the best posts from it here.</string>
     <string name="reader_search_content_description">Search</string>
     <string name="reader_filter_empty_blogs_list_text">Subscribe to blogs in Discover and you’ll see their latest posts here. Or search for a blog that you like already.</string>
     <string name="reader_filter_empty_tags_list_title">No tags</string>
@@ -85,7 +76,6 @@ Language: en_CA
     <string name="reader_filter_empty_blogs_action">Subscribe to a blog</string>
     <string name="reader_filter_empty_blogs_list">See the newest posts from blogs you\'re subscribed to</string>
     <string name="reader_filter_empty_blogs_list_title">No blog subscriptions</string>
-    <string name="reader_filter_empty_tags_list_subscribe">You can subscribe to posts on a specific subject by adding a tag</string>
     <string name="stats_timeframe_by_day">By day</string>
     <string name="stats_timeframe_by_month">By month</string>
     <string name="stats_timeframe_by_week">By week</string>