From fd59ddd05bdfebf2f9a55a0fa5915485929e7de6 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 10 Jan 2023 19:54:10 -0400 Subject: don't pass around fullKey where unneeded --- src/util/urls.js | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'src/util') diff --git a/src/util/urls.js b/src/util/urls.js index ead6c769..0733ce04 100644 --- a/src/util/urls.js +++ b/src/util/urls.js @@ -213,24 +213,14 @@ export function getURLsFromRoot({ export function getPagePathname({ baseDirectory, device = false, - fullKey, + pageSubKey, urlArgs, urls, }) { - const [groupKey, subKey] = fullKey.split('.'); - - const toKey = device ? 'toDevice' : 'to'; - - return (groupKey === 'localized' && baseDirectory - ? urls - .from('shared.root')[toKey]( - 'localizedWithBaseDirectory.' + subKey, - baseDirectory, - ...urlArgs) - : urls - .from('shared.root')[toKey]( - fullKey, - ...urlArgs)); + const to = urls.from('shared.root')[device ? 'toDevice' : 'to']; + return (baseDirectory + ? to('localizedWithBaseDirectory.' + pageSubKey, baseDirectory, ...urlArgs) + : to('localized.' + pageSubKey, ...urlArgs)); } export function getPagePathnameAcrossLanguages({ @@ -249,7 +239,7 @@ export function getPagePathnameAcrossLanguages({ (language === defaultLanguage ? '' : language.code), - fullKey: 'localized.' + pageSubKey, + pageSubKey, urlArgs, urls, }), -- cgit 1.3.0-6-gf8a5