Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
skublik committed Nov 22, 2023
2 parents 41ce3c5 + 4c1c753 commit 4b1d033
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;

import com.evolveum.midpoint.gui.api.util.LocalizationUtil;

import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.AttributeModifier;
Expand Down Expand Up @@ -583,7 +585,7 @@ private IModel<String> createColumnDisplayModel(GuiObjectColumnType customColumn
DisplayType displayType = customColumn.getDisplay();
PolyStringType label = displayType != null ? displayType.getLabel() : null;
if (label != null) {
return createStringResource(label);
return createStringResource(LocalizationUtil.translatePolyString(label));
}

return createStringResource(getItemDisplayName(customColumn));
Expand Down

0 comments on commit 4b1d033

Please sign in to comment.