From 5dbe3945798695d96dc9a853bff58b1442d20f79 Mon Sep 17 00:00:00 2001 From: mrahmatu Date: Thu, 29 Aug 2024 14:36:21 +0300 Subject: [PATCH 1/2] changed lines 100-107 to avoid nesting --- src/admin/search.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/admin/search.js b/src/admin/search.js index a1ba466191..3996d6b163 100644 --- a/src/admin/search.js +++ b/src/admin/search.js @@ -96,18 +96,21 @@ async function buildNamespace(language, namespace) { if (!translations || !Object.keys(translations).length) { return await fallback(namespace); } - // join all translations into one string separated by newlines - let str = Object.keys(translations).map(key => translations[key]).join('\n'); + // Join all translations into one string separated by newlines + let str = Object.values(translations).join('\n'); str = sanitize(str); - let title = namespace; - title = title.match(/admin\/(.+?)\/(.+?)$/); - title = `[[admin/menu:section-${ - title[1] === 'development' ? 'advanced' : title[1] - }]]${title[2] ? (` > [[admin/menu:${ - title[1]}/${title[2]}]]`) : ''}`; + // Extract the section and subsection from the namespace + let title = namespace.match(/admin\/(.+?)\/(.+?)$/); - title = await translator.translate(title); + if (title) { + let section = title[1] === 'development' ? 'advanced' : title[1]; + let subsection = title[2] ? ` > [[admin/menu:${section}/${title[2]}]]` : ''; + title = `[[admin/menu:section-${section}]]${subsection}`; + + // Translate the title + title = await translator.translate(title); + } return { namespace: namespace, translations: `${str}\n${title}`, From 2bc56f1bf6f1c4e3e22459cb8cc9666031d79db4 Mon Sep 17 00:00:00 2001 From: mrahmatu Date: Thu, 29 Aug 2024 15:10:21 +0300 Subject: [PATCH 2/2] changed the variable to a constant --- src/admin/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/admin/search.js b/src/admin/search.js index 3996d6b163..73afa29bfe 100644 --- a/src/admin/search.js +++ b/src/admin/search.js @@ -104,8 +104,8 @@ async function buildNamespace(language, namespace) { let title = namespace.match(/admin\/(.+?)\/(.+?)$/); if (title) { - let section = title[1] === 'development' ? 'advanced' : title[1]; - let subsection = title[2] ? ` > [[admin/menu:${section}/${title[2]}]]` : ''; + const section = title[1] === 'development' ? 'advanced' : title[1]; + const subsection = title[2] ? ` > [[admin/menu:${section}/${title[2]}]]` : ''; title = `[[admin/menu:section-${section}]]${subsection}`; // Translate the title