projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve localisation
[gpl/argeo-suite.git]
/
swt
/
org.argeo.app.ui
/
src
/
org
/
argeo
/
app
/
ui
/
people
/
UserColumn.java
diff --git
a/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UserColumn.java
b/swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UserColumn.java
index c8c4ae1f560c9e4767536fce129196691e20000b..9dae8a4f7e51da22aeb55616ad33e87de649bb4c 100644
(file)
--- a/
swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UserColumn.java
+++ b/
swt/org.argeo.app.ui/src/org/argeo/app/ui/people/UserColumn.java
@@
-1,10
+1,12
@@
package org.argeo.app.ui.people;
import org.argeo.api.acr.Content;
package org.argeo.app.ui.people;
import org.argeo.api.acr.Content;
+import org.argeo.api.acr.ldap.LdapAcrUtils;
import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.api.acr.ldap.LdapObj;
import org.argeo.api.cms.ux.CmsIcon;
import org.argeo.app.ui.SuiteIcon;
import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.api.acr.ldap.LdapObj;
import org.argeo.api.cms.ux.CmsIcon;
import org.argeo.app.ui.SuiteIcon;
+import org.argeo.cms.CurrentUser;
import org.argeo.cms.auth.UserAdminUtils;
import org.argeo.cms.ux.widgets.Column;
import org.osgi.service.useradmin.User;
import org.argeo.cms.auth.UserAdminUtils;
import org.argeo.cms.ux.widgets.Column;
import org.osgi.service.useradmin.User;
@@
-16,9
+18,11
@@
public class UserColumn implements Column<Content> {
return UserAdminUtils.getUserDisplayName(role.adapt(User.class));
else if (role.hasContentClass(LdapObj.organization))
return role.attr(LdapAttr.o);
return UserAdminUtils.getUserDisplayName(role.adapt(User.class));
else if (role.hasContentClass(LdapObj.organization))
return role.attr(LdapAttr.o);
- else if (role.hasContentClass(LdapObj.groupOfNames))
- return role.attr(LdapAttr.cn);
- else
+ else if (role.hasContentClass(LdapObj.groupOfNames)) {
+ // TODO make it more generic at ACR level
+ Object label = LdapAcrUtils.getLocalized(role, LdapAttr.cn.qName(), CurrentUser.locale());
+ return label.toString();
+ } else
return null;
}
return null;
}