M core/routes.go => core/routes.go +6 -3
@@ 1360,7 1360,8 @@ func (s *Service) PopularLinkList(c echo.Context) error {
pd := localizer.NewPageData(lt.Translate("Bookmarks"))
pd.Data["bookmark"] = lt.Translate("bookmark")
pd.Data["popular"] = lt.Translate("Popular Bookmarks")
- pd.Data["no_links"] = lt.Translate("No Links")
+ pd.Data["no_links"] = lt.Translate(
+ "This ain't a popularity contest or anything but this is weird that there are no links!")
pLinks := result.PopularLinks
rssURL := c.Echo().Reverse(s.RouteName("popular_link_list_rss"))
@@ 1529,7 1530,9 @@ func (s *Service) UserFeed(c echo.Context) error {
pd.Data["by"] = lt.Translate("By")
pd.Data["tags"] = lt.Translate("Tags")
pd.Data["search"] = lt.Translate("Search")
- pd.Data["no_links"] = lt.Translate("No Links")
+ pd.Data["no_links"] = lt.Translate(
+ "Your feed is empty :( Go follow some people. Try the Popular or Recent " +
+ "feeds to find some interesting people to follow.")
pd.Data["advanced_search"] = lt.Translate("Advanced Search")
pd.Data["include_tags"] = lt.Translate("Include Tags")
pd.Data["exclude_tags"] = lt.Translate("Exclude Tags")
@@ 1847,7 1850,7 @@ func (s *Service) OrgLinksList(c echo.Context) error {
pd.Data["mark_as_unread"] = lt.Translate("Mark as unread")
pd.Data["mark_as_starred"] = lt.Translate("Star")
pd.Data["mark_as_non_starred"] = lt.Translate("Unstar")
- pd.Data["no_links"] = lt.Translate("No Links")
+ pd.Data["no_links"] = lt.Translate("This feed has no links. Booo!")
pd.Data["archive"] = lt.Translate("Archive")
pd.Data["advanced_search"] = lt.Translate("Advanced Search")
pd.Data["include_tags"] = lt.Translate("Include Tags")
M core/templates.go => core/templates.go +2 -2
@@ 23,7 23,7 @@ func AddGlobalTmpl(c echo.Context) gobwebs.Map {
lt := localizer.GetSessionLocalizer(c)
pd.Data["store_dashboard"] = lt.Translate("Store Dashboard")
pd.Data["tour"] = lt.Translate("Tour")
- pd.Data["bookmarks"] = lt.Translate("My Bookmarks")
+ pd.Data["bookmarks"] = lt.Translate("Bookmarks")
pd.Data["recent"] = lt.Translate("Recent")
pd.Data["popular"] = lt.Translate("Popular")
pd.Data["categories"] = lt.Translate("Categories")
@@ 43,7 43,7 @@ func AddGlobalTmpl(c echo.Context) gobwebs.Map {
pd.Data["manage_lists"] = lt.Translate("Lists")
pd.Data["manage_shorts"] = lt.Translate("Short Links")
pd.Data["admin"] = lt.Translate("Admin")
- pd.Data["my_feed"] = lt.Translate("My Feed")
+ pd.Data["my_feed"] = lt.Translate("Feed")
gmap["base_pd"] = pd
// serverVersion
serverVersion := strings.Split(strings.Split(gctx.Server.AppInfo(), " ")[1], "-")
M templates/base.html => templates/base.html +8 -8
@@ 71,14 71,6 @@
{{end}}
{{if .isAuthorized}}
<li>
- <a class="menu-item{{if eq .navFlag "bookmarks"}} menu-item--active{{end}}" href="{{reverse "core:home_link_list"}}">
- <svg class="menu-item__icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
- <path stroke-linecap="round" stroke-linejoin="round" d="M16.5 3.75V16.5L12 14.25 7.5 16.5V3.75m9 0H18A2.25 2.25 0 0120.25 6v12A2.25 2.25 0 0118 20.25H6A2.25 2.25 0 013.75 18V6A2.25 2.25 0 016 3.75h1.5m9 0h-9" />
- </svg>
- <span>{{.base_pd.Data.bookmarks}}</span>
- </a>
- </li>
- <li>
<a class="menu-item{{if eq .navFlag "feed"}} menu-item--active{{end}}" href="{{reverse "core:user_feed"}}">
<svg class="menu-item__icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6A2.25 2.25 0 0 1 6 3.75h2.25A2.25 2.25 0 0 1 10.5 6v2.25a2.25 2.25 0 0 1-2.25 2.25H6a2.25 2.25 0 0 1-2.25-2.25V6ZM3.75 15.75A2.25 2.25 0 0 1 6 13.5h2.25a2.25 2.25 0 0 1 2.25 2.25V18a2.25 2.25 0 0 1-2.25 2.25H6A2.25 2.25 0 0 1 3.75 18v-2.25ZM13.5 6a2.25 2.25 0 0 1 2.25-2.25H18A2.25 2.25 0 0 1 20.25 6v2.25A2.25 2.25 0 0 1 18 10.5h-2.25a2.25 2.25 0 0 1-2.25-2.25V6ZM13.5 15.75a2.25 2.25 0 0 1 2.25-2.25H18a2.25 2.25 0 0 1 2.25 2.25V18A2.25 2.25 0 0 1 18 20.25h-2.25A2.25 2.25 0 0 1 13.5 18v-2.25Z" />
@@ 87,6 79,14 @@
</a>
</li>
<li>
+ <a class="menu-item{{if eq .navFlag "bookmarks"}} menu-item--active{{end}}" href="{{reverse "core:home_link_list"}}">
+ <svg class="menu-item__icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+ <path stroke-linecap="round" stroke-linejoin="round" d="M16.5 3.75V16.5L12 14.25 7.5 16.5V3.75m9 0H18A2.25 2.25 0 0120.25 6v12A2.25 2.25 0 0118 20.25H6A2.25 2.25 0 013.75 18V6A2.25 2.25 0 016 3.75h1.5m9 0h-9" />
+ </svg>
+ <span>{{.base_pd.Data.bookmarks}}</span>
+ </a>
+ </li>
+ <li>
<a class="menu-item{{if eq .navFlag "addLink"}} menu-item--active{{end}}" href="{{reverse "core:link_create"}}">
<svg class="menu-item__icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M20.25 7.5l-.625 10.632a2.25 2.25 0 01-2.247 2.118H6.622a2.25 2.25 0 01-2.247-2.118L3.75 7.5M10 11.25h4M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125z" />
M values.go => values.go +1 -0
@@ 71,6 71,7 @@ var InvalidSlugs = []string{
"read",
"star",
"rss",
+ "feed",
}
// Interval used to display data in analytics engagement chart