Search bar: Display suggestion when starting by @ or #

2 files changed, 6 insertions, 2 deletions

diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 310edb0d4..2d31e6059 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -522,9 +522,8 @@ public class Helper {
         long months = days / 30;
         long years = days / 365;
 
-        String format = DateFormat.getDateInstance(DateFormat.SHORT).format(date);
         if (years > 0) {
-            return format;
+            return DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault()).format(date);
         } else if (months > 0 || days > 7) {
             //Removes the year depending of the locale from DateFormat.SHORT format
             SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
diff --git a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
index f95e42c38..7a39946da 100644
--- a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
@@ -464,6 +464,11 @@ public class PinnedTimelineHelper {
                                 break;
                             case NITTER:
                                 item.setIcon(R.drawable.nitter);
+                                if (pinnedTimeline.remoteInstance.displayName.trim().length() > 0) {
+                                    item.setTitle(pinnedTimeline.remoteInstance.displayName);
+                                } else {
+                                    item.setTitle(pinnedTimeline.remoteInstance.host);
+                                }
                                 break;
                         }
                         break;