refactor to only use mark safe once

src/peoplefinder/models.py

@@ -802,13 +802,12 @@ def get_workdays_display(self) -> str:
     def get_office_location_display(self) -> Optional[str]:
         if self.international_building:
             return self.international_building
-        if self.uk_office_location:
-            location_display = self.uk_office_location.name
-            if self.location_in_building:
-                location_display += "<br>" + strip_tags(self.location_in_building)
-            return mark_safe(location_display)  # noqa: S308
-        return None
-
+        if self.uk_office_location and not self.location_in_building:
+            return self.uk_office_location.name
+        return mark_safe(
+            self.uk_office_location.name + "<br>" + strip_tags(self.location_in_building)
+        )
+
     def get_manager_display(self) -> Optional[str]:
         if self.manager:
             return mark_safe(  # noqa: S308