From 0b6f1021b995a36b51832f84b5fc8283446548fe Mon Sep 17 00:00:00 2001 From: larentoun <31931237+larentoun@users.noreply.github.com> Date: Fri, 12 Jul 2024 14:07:29 +0300 Subject: [PATCH] remove ternary usage --- tgui/packages/tgui/interfaces/JobSelection.tsx | 10 +++------- tgui/packages/tgui/interfaces/NtosCrewManifest.jsx | 6 +----- .../tgui/interfaces/PreferencesMenu/JobsPage.tsx | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/tgui/packages/tgui/interfaces/JobSelection.tsx b/tgui/packages/tgui/interfaces/JobSelection.tsx index 70f7c239ffe87..5a2087bceeb85 100644 --- a/tgui/packages/tgui/interfaces/JobSelection.tsx +++ b/tgui/packages/tgui/interfaces/JobSelection.tsx @@ -86,11 +86,9 @@ export const JobEntry = (data: { <> {jobIcon && } {job.command ? ( - {JOBS_RU[jobName] ? JOBS_RU[jobName] : jobName} - ) : JOBS_RU[jobName] ? ( - JOBS_RU[jobName] + {JOBS_RU[jobName] || jobName} ) : ( - jobName + JOBS_RU[jobName] || jobName )} { - {DEPARTMENTS_RU[departmentName] - ? DEPARTMENTS_RU[departmentName] - : departmentName} + {DEPARTMENTS_RU[departmentName] || departmentName} {
{entries.map((entry) => ( diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx index 260a9657deb68..210601537577f 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/JobsPage.tsx @@ -238,7 +238,7 @@ const JobRow = (props: { className?: string; job: Job; name: string }) => { paddingLeft: '0.3em', }} > - {JOBS_RU[name] ? JOBS_RU[name] : name} + {JOBS_RU[name] || name} @@ -318,7 +318,7 @@ const JoblessRoleDropdown = (props) => { const options = [ { - displayText: `Присоединиться за ${JOBS_RU[data.overflow_role] ? JOBS_RU[data.overflow_role] : data.overflow_role} если не удалось войти`, + displayText: `Присоединиться за ${JOBS_RU[data.overflow_role] || data.overflow_role} если не удалось войти`, value: JoblessRole.BeOverflow, }, {