Fix ru jobs (#367)

## About The Pull Request fixes #363 fixes #362
ss220club · Jul 13, 2024 · 4a1ac25 · 4a1ac25
1 parent 2178ddd
commit 4a1ac25
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/code/__DEFINES/bandastation/ru_jobs.dm b/code/__DEFINES/bandastation/ru_jobs.dm
@@ -119,3 +119,10 @@ GLOBAL_LIST_INIT(job_titles_ru, list(
 	if(job_ru_title)
 		return job_ru_title
 	return title
+
+/proc/job_title_ru_to_en(title)
+	GLOB.job_titles_ru.Find("")
+	for(var/en_title in GLOB.job_titles_ru)
+		if(GLOB.job_titles_ru[en_title] == title)
+			return en_title
+	return title
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
@@ -241,7 +241,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		if (id_card)
 			entry["name"] = id_card.registered_name
 			entry["assignment"] = id_card.assignment
-			var/trim_assignment = id_card.get_trim_assignment()
+			var/trim_assignment = job_title_ru_to_en(id_card.get_trim_assignment())
 			if (jobs[trim_assignment] != null)
 				entry["ijob"] = jobs[trim_assignment]
 

diff --git a/tgui/packages/tgui/bandastation/ru_jobs.tsx b/tgui/packages/tgui/bandastation/ru_jobs.tsx
@@ -40,6 +40,11 @@ export const JOBS_RU = {
   Psychologist: 'Психолог',
 };
 
+export function ReverseJobsRu(value: string) {
+  let keys = Object.keys(JOBS_RU).filter((x) => JOBS_RU[x] === value);
+  return keys[0] || value;
+}
+
 export const DEPARTMENTS_RU = {
   Command: 'Командование',
   Security: 'Безопасность',

diff --git a/tgui/packages/tgui/interfaces/Orbit/helpers.ts b/tgui/packages/tgui/interfaces/Orbit/helpers.ts
@@ -1,3 +1,4 @@
+import { ReverseJobsRu } from '../../bandastation/ru_jobs'; // BANDASTATION EDIT
 import { DEPARTMENT2COLOR, HEALTH, THREAT, VIEWMODE } from './constants';
 import { AntagGroup, Antagonist, Observable, ViewMode } from './types';
 
@@ -46,7 +47,7 @@ export function getDisplayName(full_name: string, nickname?: string): string {
 
 /** Returns the department the player is in */
 export function getDepartmentByJob(job: string): string | undefined {
-  const withoutParenthesis = job.replace(/ \(.*\)/, '');
+  const withoutParenthesis = ReverseJobsRu(job).replace(/ \(.*\)/, '');
 
   for (const department in DEPARTMENT2COLOR) {
     if (DEPARTMENT2COLOR[department].trims.includes(withoutParenthesis)) {

diff --git a/tgui/packages/tgui/interfaces/SecurityRecords/RecordTabs.tsx b/tgui/packages/tgui/interfaces/SecurityRecords/RecordTabs.tsx
@@ -12,6 +12,7 @@ import {
   Tabs,
 } from 'tgui/components';
 
+import { ReverseJobsRu } from '../../bandastation/ru_jobs'; // BANDASTATION EDIT
 import { JOB2ICON } from '../common/JobToIcon';
 import { CRIMESTATUS2COLOR } from './constants';
 import { isRecordMatch } from './helpers';
@@ -111,7 +112,7 @@ const CrewTab = (props: { record: SecurityRecord }) => {
       selected={isSelected}
     >
       <Box bold={isSelected} color={CRIMESTATUS2COLOR[wanted_status]}>
-        <Icon name={JOB2ICON[trim] || 'question'} /> {name}
+        <Icon name={JOB2ICON[ReverseJobsRu(trim)] || 'question'} /> {name}
       </Box>
     </Tabs.Tab>
   );