From d8ad6ddccb0204523aab1b97b2d36dac8cea1333 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 17 Nov 2018 14:33:53 -0700
Subject: [PATCH] Update site sidebar

---
 .../views/site/partial/sidebar.blade.php      | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/resources/views/site/partial/sidebar.blade.php b/resources/views/site/partial/sidebar.blade.php
index 360d7d037..8a2ce7b3e 100644
--- a/resources/views/site/partial/sidebar.blade.php
+++ b/resources/views/site/partial/sidebar.blade.php
@@ -1,27 +1,23 @@
   <div class="col-12 col-md-3 py-3" style="border-right:1px solid #ccc;">
     <ul class="nav flex-column settings-nav">
       <li class="nav-item pl-3 {{request()->is('site/about')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('site.about')}}">About</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('site.about')}}">{{__('site.about')}}</a>
       </li>
-      {{--
-        <li class="nav-item pl-3 {{request()->is('site/features')?'active':''}}">
-          <a class="nav-link lead text-muted" href="{{route('site.features')}}">Features</a>
-        </li>
-      --}}
-      <li class="nav-item pl-3 {{request()->is('site/help')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('site.help')}}">Help</a>
+      
+      <li class="nav-item pl-3 {{request()->is(['site/help','site/kb*'])?'active':''}}">
+        <a class="nav-link font-weight-light text-muted" href="{{route('site.help')}}">{{__('site.help')}}</a>
       </li>
       <li class="nav-item pl-3 {{request()->is('site/language')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('site.language')}}">Language</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('site.language')}}">{{__('site.language')}}</a>
       </li>
       <li class="nav-item">
         <hr>
       </li>
       <li class="nav-item pl-3 {{request()->is('site/fediverse')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('site.fediverse')}}">Fediverse</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('site.fediverse')}}">{{__('site.fediverse')}}</a>
       </li>
       <li class="nav-item pl-3 {{request()->is('site/open-source')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('site.opensource')}}">Open Source</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('site.opensource')}}">{{__('site.opensource')}}</a>
       </li>
       {{-- <li class="nav-item pl-3 {{request()->is('site/banned-instances')?'active':''}}">
         <a class="nav-link lead text-muted" href="{{route('site.bannedinstances')}}">Banned Content</a>
@@ -33,10 +29,10 @@
         <hr>
       </li>
       <li class="nav-item pl-3 {{request()->is('site/terms')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('site.terms')}}">Terms</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('site.terms')}}">{{__('site.terms')}}</a>
       </li>
       <li class="nav-item pl-3 {{request()->is('site/privacy')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('site.privacy')}}">Privacy</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('site.privacy')}}">{{__('site.privacy')}}</a>
       </li>
       {{--
         <li class="nav-item pl-3 {{request()->is('site/platform')?'active':''}}">