Merge branch 'GREG-178-ou-eng' into 'master'

Add fallback to OU names in frontend

See merge request !250

frontend/src/routes/sponsor/guest/newGuestRole/index.tsx

@@ -154,11 +154,20 @@ function NewGuestRole({ guest, reloadGuestInfo }: NewGuestRoleProps) {
       {i18n.language === 'en' ? roleType.name_en : roleType.name_nb}
     </MenuItem>
   )
-  const ouToItem = (ou: OuData) => (
-    <MenuItem key={ou.id.toString()} value={ou.id}>
-      {i18n.language === 'en' ? ou.en : ou.nb} ({ou.id})
-    </MenuItem>
-  )
+  // Show ou name in correct language if present. If not use other.
+  const ouToItem = (ou: OuData) => {
+    let name = ''
+    if (i18n.language === 'en') {
+      name = ou.en ? ou.en : ou.nb
+    } else {
+      name = ou.nb ? ou.nb : ou.en
+    }
+    return (
+      <MenuItem key={ou.id.toString()} value={ou.id}>
+        {name} ({ou.id})
+      </MenuItem>
+    )
+  }
 
   return (
     <Page>