diff --git a/public/language/en-GB/admin/menu.json b/public/language/en-GB/admin/menu.json index 397cf87a62..1c5ea73b4f 100644 --- a/public/language/en-GB/admin/menu.json +++ b/public/language/en-GB/admin/menu.json @@ -1,7 +1,6 @@ { - "dashboard": "Dashboard", - - "section-dashboard": "Dashboard", + "section-dashboard": "Dashboards", + "dashboard/overview": "Overview", "dashboard/logins": "Logins", "dashboard/users": "Users", "dashboard/topics": "Topics", diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js index caf1a81a88..bdc6afb35f 100644 --- a/public/src/admin/admin.js +++ b/public/src/admin/admin.js @@ -109,10 +109,7 @@ var mainTitle; var pageTitle; - if (/admin\/general\/dashboard$/.test(url)) { - pageTitle = '[[admin/menu:general/dashboard]]'; - mainTitle = pageTitle; - } else if (/admin\/plugins\//.test(url)) { + if (/admin\/plugins\//.test(url)) { mainTitle = fallback; pageTitle = '[[admin/menu:section-plugins]] > ' + mainTitle; } else { @@ -126,8 +123,8 @@ mainTitle = translator.compile('admin/menu:settings.page-title', mainTitle); } } else { - mainTitle = '[[admin/menu:dashboard]]'; - pageTitle = '[[admin/menu:dashboard]]'; + mainTitle = '[[admin/menu:section-dashboard]]'; + pageTitle = '[[admin/menu:section-dashboard]]'; } } diff --git a/src/admin/search.js b/src/admin/search.js index be20c1594b..a1ba466191 100644 --- a/src/admin/search.js +++ b/src/admin/search.js @@ -101,15 +101,11 @@ async function buildNamespace(language, namespace) { str = sanitize(str); let title = namespace; - if (/admin\/general\/dashboard$/.test(title)) { - title = '[[admin/menu:dashboard]]'; - } else { - title = title.match(/admin\/(.+?)\/(.+?)$/); - title = `[[admin/menu:section-${ - title[1] === 'development' ? 'advanced' : title[1] - }]]${title[2] ? (` > [[admin/menu:${ - title[1]}/${title[2]}]]`) : ''}`; - } + title = title.match(/admin\/(.+?)\/(.+?)$/); + title = `[[admin/menu:section-${ + title[1] === 'development' ? 'advanced' : title[1] + }]]${title[2] ? (` > [[admin/menu:${ + title[1]}/${title[2]}]]`) : ''}`; title = await translator.translate(title); return { diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl index 160c9ae69e..f519ecd475 100644 --- a/src/views/admin/partials/menu.tpl +++ b/src/views/admin/partials/menu.tpl @@ -177,8 +177,14 @@