[gatein-commits] gatein SVN: r8591 - in portal/trunk: component/identity/src/test/java/org/exoplatform/services/organization and 6 other directories.

Author: mposolda Date: 2012-03-14 11:32:03 -0400 (Wed, 14 Mar 2012) New Revision: 8591 Added: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java Log: GTNPORTAL-2358 Adding new field Display Name for user. Added changes in UI and in Picketlink IDM integration. Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2012-03-14 15:32:03 UTC (rev 8591) @@ -25,7 +25,6 @@ import org.exoplatform.services.organization.User; import org.exoplatform.services.organization.UserEventListener; import org.exoplatform.services.organization.UserHandler; -import org.exoplatform.services.organization.impl.UserImpl; import org.gatein.common.logging.LogLevel; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; @@ -65,6 +64,8 @@ public static final String USER_LAST_NAME = "lastName"; + public static final String USER_DISPLAY_NAME = "displayName"; + public static final String USER_EMAIL = "email"; public static final String USER_CREATED_DATE = "createdDate"; @@ -85,6 +86,7 @@ keys.add(USER_PASSWORD); keys.add(USER_FIRST_NAME); keys.add(USER_LAST_NAME); + keys.add(USER_DISPLAY_NAME); keys.add(USER_EMAIL); keys.add(USER_CREATED_DATE); keys.add(USER_LAST_LOGIN_TIME); @@ -735,6 +737,25 @@ { attributes.add(new SimpleAttribute(USER_LAST_NAME, user.getLastName())); } + + // TODO: GTNPORTAL-2358 Change once displayName will be available as part of Organization API + if (user instanceof UserImpl) + { + UserImpl userImpl = (UserImpl)user; + if (userImpl.getDisplayName() != null) + { + attributes.add(new SimpleAttribute(USER_DISPLAY_NAME, ((UserImpl)user).getDisplayName())); + } + else + { + removeDisplayNameIfNeeded(am, user); + } + } + else + { + log.warn("User is of class " + user.getClass() + " which is not instanceof " + UserImpl.class); + } + if (user.getOrganizationId() != null) { attributes.add(new SimpleAttribute(USER_ORGANIZATION_ID, user.getOrganizationId())); @@ -891,6 +912,11 @@ { user.setLastName(attrs.get(USER_LAST_NAME).getValue().toString()); } + if (attrs.containsKey(USER_DISPLAY_NAME)) + { + // TODO: GTNPORTAL-2358 Change once displayName will be available as part of Organization API + user.setFullName(attrs.get(USER_DISPLAY_NAME).getValue().toString()); + } if (attrs.containsKey(USER_ORGANIZATION_ID)) { user.setOrganizationId(attrs.get(USER_ORGANIZATION_ID).getValue().toString()); @@ -925,6 +951,24 @@ return ((PicketLinkIDMServiceImpl)service_).getRealmName(); } + // Field displayName is not mandatory. We need to handle situation when user deleted displayName, which had been set previously. + // We need to ask if current User has displayName set previously and if yes, it needs to be removed. + private void removeDisplayNameIfNeeded(AttributesManager am, User user) + { + try + { + Attribute attr = am.getAttribute(user.getUserName(), USER_DISPLAY_NAME); + if (attr != null) + { + am.removeAttributes(user.getUserName(), new String[] { USER_DISPLAY_NAME }); + } + } + catch (IdentityException e) + { + log.error("Cannot remove displayName attribute of user: " + user.getUserName() + "; ", e); + } + } + private boolean countPaginatedUsers() { return orgService.getConfiguration().isCountPaginatedUsers(); Added: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java (rev 0) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserImpl.java 2012-03-14 15:32:03 UTC (rev 8591) @@ -0,0 +1,62 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2012, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.services.organization.idm; + +/** + * TODO: This is temporary implementation, which should be removed after https://issues.jboss.org/browse/EXOJCR-1780 will be fixed + * and available in GateIn. + * + * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a> + */ +public class UserImpl extends org.exoplatform.services.organization.impl.UserImpl +{ + private String displayName; + + public UserImpl() + { + super(); + } + + public UserImpl(String username) + { + super(username); + } + + @Override + public String getFullName() + { + return displayName != null ? displayName : getFirstName() + " " + getLastName(); + } + + @Override + public void setFullName(String fullName) + { + this.displayName = fullName; + } + + String getDisplayName() + { + return this.displayName; + } +} Modified: portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java =================================================================== --- portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java 2012-03-14 15:32:03 UTC (rev 8591) @@ -162,7 +162,46 @@ uHandler.saveUser(user, false); } + + public void testDisplayName() throws Exception + { + UserHandler uHandler = organizationService.getUserHandler(); + User john = uHandler.findUserByName("john"); + Assert.assertNotNull(john); + + // Test that fullName is working correctly for "john" + Assert.assertEquals("John Anthony", john.getFullName()); + john.setFullName("Johnny Something"); + uHandler.saveUser(john, false); + john = uHandler.findUserByName("john"); + Assert.assertEquals("Johnny Something", john.getFullName()); + + // Now delete fullName and assert that it's "firstName lastName" + john.setFullName(null); + uHandler.saveUser(john, false); + john = uHandler.findUserByName("john"); + Assert.assertEquals("John Anthony", john.getFullName()); + +// TODO: GTNPORTAL-2358 uncomment once displayName will be available +// // Test that "root" and "john" have displayName but demo not. +// Assert.assertEquals("Root Root", root.getDisplayName()); +// Assert.assertEquals("john@localhost", john.getDisplayName()); +// Assert.assertNull(demo.getDisplayName()); +// +// // Change displayName of john and test that it's changed +// john.setDisplayName("John Anthony"); +// uHandler.saveUser(john, false); +// john = uHandler.findUserByName("john"); +// Assert.assertEquals("John Anthony", john.getDisplayName()); +// +// // Assign displayName to demo and test that it's changed +// demo.setDisplayName("Demo Demo"); +// uHandler.saveUser(demo, false); +// demo = uHandler.findUserByName("demo"); +// Assert.assertEquals("Demo Demo", demo.getDisplayName()); + } + private void createGroup(String parent, String name) { GroupHandler groupHandler = organizationService.getGroupHandler(); Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2012-03-14 15:32:03 UTC (rev 8591) @@ -53,6 +53,8 @@ protected static String FIRST_NAME = "firstName"; protected static String LAST_NAME = "lastName"; + + protected static String DISPLAY_NAME = "displayName"; protected static String EMAIL_ADDRESS = "emailAddress"; @@ -79,6 +81,9 @@ addUIFormInput(new UIFormStringInput(LAST_NAME, LAST_NAME, null).addValidator(StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class).addValidator(NaturalLanguageValidator.class)); + + addUIFormInput(new UIFormStringInput(DISPLAY_NAME, DISPLAY_NAME, null).addValidator(StringLengthValidator.class, 0, + 90)); addUIFormInput(new UIFormStringInput(EMAIL_ADDRESS, EMAIL_ADDRESS, null).addValidator(MandatoryValidator.class).addValidator( EmailAddressValidator.class)); @@ -123,6 +128,11 @@ private String getLastName(){ return getUIStringInput(LAST_NAME).getValue(); } + + private String getDisplayName() + { + return getUIStringInput(DISPLAY_NAME).getValue(); + } /** * Use this method instead of invokeSetBinding, to avoid abusing reflection @@ -132,6 +142,8 @@ user.setPassword(getPassword()); user.setFirstName(getFirstName()); user.setLastName(getLastName()); + // TODO: GTNPORTAL-2358 switch to setDisplayName once it will be available in Organization API + user.setFullName(getDisplayName()); user.setEmail(getEmail()); } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2012-03-14 15:32:03 UTC (rev 8591) @@ -69,6 +69,10 @@ StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class)); addUIFormInput(new UIFormStringInput("lastName", "lastName", null).addValidator( StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class)); + + // TODO: GTNPORTAL-2358 switch bindingField fullName to displayName once displayName will be available in Organization API + addUIFormInput(new UIFormStringInput("displayName", "fullName", null).addValidator( + StringLengthValidator.class, 0, 90)); addUIFormInput(new UIFormStringInput("email", "email", null).addValidator(MandatoryValidator.class).addValidator( EmailAddressValidator.class)); UIFormCheckBoxInput<Boolean> uiCheckbox = new UIFormCheckBoxInput<Boolean>(CHANGEPASS, null, false); Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_cs.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -32,6 +32,7 @@ UIAccountForm.label.email=E-mailov\u00E1 adresa: UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.note=Pole ozna\u010Den\u00E1 hv\u011Bzdi\u010Dkou <span style="color: red">*</span> jsou povinn\u00E1 UIAccountForm.label.option.female=\u017Dena UIAccountForm.label.option.male=Mu\u017E @@ -111,6 +112,7 @@ UIAccountForm.label.email=E-mailov\u00e1 adresa: UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.note=Pole ozna\u010den\u00e1 hv\u011bzdi\u010dkou <span style="color: red">*</span> jsou povinn\u00e1 UIAccountForm.label.option.female=\u017dena UIAccountForm.label.option.male=Mu\u017e Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_de.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,56 +1,57 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.account.webui.component.UIAccountForm -UIAccountForm.label.Profile=Benutzerprofil +UIAccountForm.label.Profile=Benutzerprofil UIAccountForm.title=Konto Hinzuf\u00fcgen/Bearbeiten UIAccountForm.label.username=#{word.userName}: UIAccountForm.label.SearchUser=Benutzer suchen UIAccountForm.label.password1x=Passwort: UIAccountForm.label.password2x=Passwort best\u00e4tigen: UIAccountForm.label.password=Passwort: -UIAccountForm.label.Confirmpassword=Passwort best\u00e4tigen: +UIAccountForm.label.Confirmpassword=Passwort best\u00e4tigen: UIAccountForm.action.Reset=Zur\u00fccksetzen UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: -UIAccountForm.label.email=Email-Adresse: +UIAccountForm.label.displayName=#{word.displayName}: +UIAccountForm.label.email=Email-Adresse: UIAccountForm.label.note=Pflichtfelder sind mit einem Sternchen <span style="color: red">*</span> versehen. UIAccountForm.action.Back=#{word.back} UIAccountForm.action.Save=#{word.save} UIAccountForm.label.action.SearchUser=Benutzer suchen #{0} is the username that the remote user enter -UIAccountForm.msg.user-exist=Der Benutzername '{0}' ist bereits vergeben. -UIAccountForm.msg.incorrect-password=Die Passwortbest\u00e4tigung war nicht korrekt. +UIAccountForm.msg.user-exist=Der Benutzername '{0}' ist bereits vergeben. +UIAccountForm.msg.incorrect-password=Die Passwortbest\u00e4tigung war nicht korrekt. UIAccountForm.msg.sucsesful.create.user=Der neue Benutzer ist hinzugef\u00fcgt. UIAccountForm.tab.label.AccountTemplate=Kontovorlage -UIAccountForm.tab.label.UIUserProfileInputSet=Benutzerprofil -UIAccountForm.tab.label.AccountInputSet=Konto-Konfiguration +UIAccountForm.tab.label.UIUserProfileInputSet=Benutzerprofil +UIAccountForm.tab.label.AccountInputSet=Konto-Konfiguration UIAccountForm.tab.label.UIUserMembershipSelector=Rollen des Benutzers UIAccountForm.label.Membership=Rolle des Benutzers -UIAccountForm.label.option.male=M\u00e4nnlich -UIAccountForm.label.option.female=Weiblich - +UIAccountForm.label.option.male=M\u00e4nnlich +UIAccountForm.label.option.female=Weiblich + UIAccountForm.label.HomeInfo=Private Daten UIAccountForm.label.user.name.given=#{word.givenName}: UIAccountForm.label.user.name.family=#{word.familyName}: @@ -60,7 +61,7 @@ UIAccountForm.label.user.employer=#{word.employer}: UIAccountForm.label.user.department=#{word.department}: UIAccountForm.label.user.jobtitle=#{word.jobTitle}: -UIAccountForm.label.user.language=Sprache +UIAccountForm.label.user.language=Sprache UIAccountForm.label.user.home-info.postal.name=#: UIAccountForm.label.user.home-info.postal.street=#{word.street}: UIAccountForm.label.user.home-info.postal.city=#{word.city}: Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_en.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.account.webui.component.UIAccountForm UIAccountForm.label.Profile=User Profile @@ -30,6 +30,7 @@ UIAccountForm.action.Reset=Reset UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email=Email Address: UIAccountForm.label.note=Fields marked with an asterisk<span style="color: red">*</span> are required UIAccountForm.action.Back=#{word.back} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_es.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -30,6 +30,7 @@ UIAccountForm.action.Reset=Resetear UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email=Direcci\u00f3n de correo electr\u00f3nico: UIAccountForm.label.note=Los campos marcados con un asterisco<span style="color: red">*</span> son obligatorios UIAccountForm.action.Back=#{word.back} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_fr.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -30,13 +30,14 @@ UIAccountForm.action.Reset=R\u00e9initialiser UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email=Adresse Email: UIAccountForm.label.note=Les champs marqu\u00e9s d'une asterisque <span style="color: red">*</span> sont obligatoires UIAccountForm.action.Back=#{word.back} UIAccountForm.action.Save=#{word.save} UIAccountForm.label.action.SearchUser=Rechercher un utilisateur #{0} is the username that the remote user enter -UIAccountForm.msg.user-exist=L'utilisateur '{0}' existe d\u00e9j\u00e0� +UIAccountForm.msg.user-exist=L'utilisateur '{0}' existe d\u00e9j\u00e0� UIAccountForm.msg.incorrect-password=Mot de passe incorrect UIAccountForm.msg.sucsesful.create.user=Utilisateur cr\u00e9\u00e9 avec succ\u00e8s Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_it.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.account.webui.component.UIAccountForm UIAccountForm.label.Profile=Profilo Utente @@ -30,6 +30,7 @@ UIAccountForm.action.Reset=Annulla UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email=Email Address: UIAccountForm.label.note=I campi segnati con l'asterisco<span style="color: red">*</span> sono obbligatori UIAccountForm.action.Back=#{word.back} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ja.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -30,6 +30,7 @@ UIAccountForm.action.Reset=\u30ea\u30bb\u30c3\u30c8 UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email= E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9: UIAccountForm.label.note=Fields marked with an asterisk<span style="color: red">*</span> are required Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ne.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -30,6 +30,7 @@ UIAccountForm.action.Reset=\u092a\u0941\u0928: \u0928\u093f\u0930\u094d\u0927\u093e\u0930\u0923 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email=\u0908\u092e\u0947\u0932 \u0920\u0947\u0917\u093e\u0928\u093e: UIAccountForm.label.note=Asterisk<span style="color: red">*</span> \u0932\u0947 \u091a\u093f\u0928\u0941 \u0932\u0917\u093e\u090f\u0915\u094b \u0915\u094d\u0937\u0947\u0924\u094d\u0930 \u0905\u0928\u093f\u092c\u093e\u0930\u094d\u092f \u091b UIAccountForm.action.Back=#{word.back} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_nl.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -30,6 +30,7 @@ UIAccountForm.action.Reset=Reset UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email=E-mail adres: UIAccountForm.label.note=Gemarkeerde velden met een ster<span style\="color: red">*</span> zijn vereist UIAccountForm.action.Back=#{word.back} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_pt_BR.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.account.webui.component.UIAccountForm UIAccountForm.label.Profile=Perfil do Usuário @@ -30,6 +30,7 @@ UIAccountForm.action.Reset=Limpar UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email=Endereço Email: UIAccountForm.label.note=Campos marcados com asterisco <span style="color: red">*</span> são obrigatórios UIAccountForm.action.Back=#{word.back} @@ -84,4 +85,4 @@ UIAccountForm.label.user.business-info.online.email=#{word.email}: UIAccountForm.label.user.business-info.online.uri=#{word.website}: -UIPopupWindow.title.UIGroupMembershipSelector=Selecionar Papeis +UIPopupWindow.title.UIGroupMembershipSelector=Selecionar Papeis Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_ru.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.account.webui.component.UIAccountForm UIAccountForm.label.Profile=Профиль пользователя @@ -30,6 +30,7 @@ UIAccountForm.action.Reset=Очистить UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email=Адрес эл.почты: UIAccountForm.label.note=Поля со звездочкой<span style="color: red">*</span> являются обязательными UIAccountForm.action.Back=#{word.back} @@ -84,4 +85,4 @@ UIAccountForm.label.user.business-info.online.email=#{word.email}: UIAccountForm.label.user.business-info.online.uri=#{word.website}: -UIPopupWindow.title.UIGroupMembershipSelector=Участие в группах +UIPopupWindow.title.UIGroupMembershipSelector=Участие в группах Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_uk.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.account.webui.component.UIAccountForm UIAccountForm.label.Profile=Профіль користувача @@ -30,6 +30,7 @@ UIAccountForm.action.Reset=Скинути UIAccountForm.label.firstName=#{word.firstName}: UIAccountForm.label.lastName=#{word.lastName}: +UIAccountForm.label.displayName=#{word.displayName}: UIAccountForm.label.email=Електронна пошта: UIAccountForm.label.note=Поля позначені зірочкою<span style="color: red">*</span> обов'язкові для заповнення! UIAccountForm.action.Back=#{word.back} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_cs.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -196,6 +196,7 @@ UIUserInfo.label.email=E-mailov\u00E1 adresa: UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.newPassword=Nov\u00E9 heslo: UIUserInfo.label.option.ar=Arab\u0161tina UIUserInfo.label.option.cs=\u010Ce\u0161tina Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_de.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -17,10 +17,10 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # -##org.exoplatform.organization.webui.component.UIOrganizationPortlet +##org.exoplatform.organization.webui.component.UIOrganizationPortlet UIOrganizationPortlet.label.userManagement=Benutzermanagement UIOrganizationPortlet.label.groupManagement=Gruppenmanagement -UIOrganizationPortlet.label.membershipManagement=Rollenmanagement +UIOrganizationPortlet.label.membershipManagement=Rollenmanagement ##org.exoplatform.organization.webui.component.UIMembershipTypeForm UIMembershipTypeForm.title=Rolle hinzuf\u00fcgen/\u00e4ndern @@ -99,6 +99,7 @@ UIUserInfo.label.Confirmpassword=Passwort best\u00e4tigen : UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=E-mail-Adresse: UIUserInfo.label.user.language: Language UIUserInfo.action.Back=#{word.cancel} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.organization.webui.component.UIOrganizationPortlet UIOrganizationPortlet.label.userManagement=User Management UIOrganizationPortlet.label.groupManagement=Group Management @@ -30,8 +30,8 @@ UIMembershipTypeForm.action.Save=#{word.save} UIMembershipTypeForm.action.Back=#{word.back} UIMembershipTypeForm.action.Reset=Reset -UIMembershipTypeForm.msg.SameName=This membership already exists, please enter another one -UIMembershipTypeForm.msg.MembershipNotExist= Membership [{0}] is not exist or has been deleted. +UIMembershipTypeForm.msg.SameName=This membership already exists, please enter another one +UIMembershipTypeForm.msg.MembershipNotExist= Membership [{0}] is not exist or has been deleted. ##org.exoplatform.organization.webui.component.UIGroupMembershipForm UIGroupEditMembershipForm.label.username=User Name @@ -79,8 +79,8 @@ UIListUsers.label.option.lastName=#{word.lastName} UIListUsers.label.option.email=#{word.email} UIListUsers.msg.DeleteSuperUser={0} is Super User, it can not be deleted -UIListUsers.deleteUser=Are you sure you want to delete {0} user? -UIListUsers.msg.user-is-deleted=This user may be deleted. +UIListUsers.deleteUser=Are you sure you want to delete {0} user? +UIListUsers.msg.user-is-deleted=This user may be deleted. UIListMembershipType.deleteMemberShip=Are you sure you want to delete this membership? @@ -101,6 +101,7 @@ UIUserInfo.label.Confirmpassword=Confirm Password : UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=Email Address: UIUserInfo.label.user.language: Language UIUserInfo.action.Back=#{word.cancel} @@ -173,7 +174,7 @@ UIMembershipList.header.description=#{word.description} UIMembershipList.action.title.EditMembership=Edit Membership UIMembershipList.action.title.DeleteMembership=Delete Membership -UIMembershipList.msg.InUse=You can not delete this membership because it is in use +UIMembershipList.msg.InUse=You can not delete this membership because it is in use UIMembershipList.msg.DeleteMandatory=You can not delete this membership because it is mandatory ##org.exoplatform.organization.webui.component.UIGroupMembershipForm @@ -198,7 +199,7 @@ EditGroup.action.Save=#{word.save} EditGroup.action.Back=#{word.cancel} -UIGroupForm.msg.group-exist=This group name already exists, please enter another one +UIGroupForm.msg.group-exist=This group name already exists, please enter another one UIGroupForm.msg.group-not-exist=Group "{0}" doesn't exist or has been deleted. ############################################################################ # org.exoplatform.portal.component.customization.UIShareNavigationForm # @@ -255,4 +256,4 @@ UITabPane.title.UISharedNavigation=Group Page Navigation UISharedNavigation.label.userNavigation=User Page Navigation Name UISharedNavigation.label.priority=Priority -UISharedNavigation.action.Save=Save +UISharedNavigation.action.Save=Save Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_es.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -99,6 +99,7 @@ UIUserInfo.label.Confirmpassword=Confirmar Contrase\u00f1a : UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=Direcci\u00f3n de Correo Electr\u00f3nico: UIUserInfo.label.user.language: Idioma UIUserInfo.action.Back=#{word.cancel} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_fr.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -100,6 +100,7 @@ UIUserInfo.label.Confirmpassword=Confirmation mot de passe : UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=Adresse email: UIUserInfo.action.Back=#{word.cancel} UIUserInfo.action.Save=#{word.save} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_it.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.organization.webui.component.UIOrganizationPortlet UIOrganizationPortlet.label.userManagement=Gestione Utenti UIOrganizationPortlet.label.groupManagement=Gestione Gruppi @@ -30,8 +30,8 @@ UIMembershipTypeForm.action.Save=#{word.save} UIMembershipTypeForm.action.Back=#{word.back} UIMembershipTypeForm.action.Reset=Azzera -UIMembershipTypeForm.msg.SameName=Il membership esiste gi\u00E0, inseriscine un'altro -UIMembershipTypeForm.msg.MembershipNotExist= Il membership [{0}] non esiste o \u00E8 stato cancellato. +UIMembershipTypeForm.msg.SameName=Il membership esiste gi\u00E0, inseriscine un'altro +UIMembershipTypeForm.msg.MembershipNotExist= Il membership [{0}] non esiste o \u00E8 stato cancellato. ##org.exoplatform.organization.webui.component.UIGroupMembershipForm UIGroupEditMembershipForm.label.username=Nome Utente @@ -79,7 +79,7 @@ UIListUsers.label.option.lastName=#{word.lastName} UIListUsers.label.option.email=#{word.email} UIListUsers.msg.DeleteSuperUser={0} \u00E8 un Super Utente, non pu\u00F2 essere cancellato -UIListUsers.deleteUser=Sicuro di voler cancellare l'utente {0}? +UIListUsers.deleteUser=Sicuro di voler cancellare l'utente {0}? UIListUsers.msg.user-is-deleted=L'utente pu\u00F2 essere cancellato. UIListMembershipType.deleteMemberShip=Sicuro di voler cancellare il membership? @@ -101,6 +101,7 @@ UIUserInfo.label.Confirmpassword=Conferma Password : UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=Indirizzo Email: UIUserInfo.label.user.language: Lingua UIUserInfo.action.Back=#{word.cancel} @@ -173,7 +174,7 @@ UIMembershipList.header.description=#{word.description} UIMembershipList.action.title.EditMembership=Modifica il Membership UIMembershipList.action.title.DeleteMembership=Elimina il Membership -UIMembershipList.msg.InUse=Non puoi eliminare il membership perch\u00E8 \u00E8 gi\u00E0 in uso +UIMembershipList.msg.InUse=Non puoi eliminare il membership perch\u00E8 \u00E8 gi\u00E0 in uso UIMembershipList.msg.DeleteMandatory=Non puoi eliminare il membership perch\u00E8 \u00E8 obbligatorio ##org.exoplatform.organization.webui.component.UIGroupMembershipForm @@ -198,7 +199,7 @@ EditGroup.action.Save=#{word.save} EditGroup.action.Back=#{word.cancel} -UIGroupForm.msg.group-exist=Il gruppo esiste gi\u00E0, inseriscine un altro +UIGroupForm.msg.group-exist=Il gruppo esiste gi\u00E0, inseriscine un altro UIGroupForm.msg.group-not-exist=Il gruppo "{0}" non esiste o \u00E8 stato eliminato. ############################################################################ # org.exoplatform.portal.component.customization.UIShareNavigationForm # @@ -255,4 +256,4 @@ UITabPane.title.UISharedNavigation=Navigazione della Pagina del Gruppo UISharedNavigation.label.userNavigation=Nome della Navigazione della Pagina Utente UISharedNavigation.label.priority=Priorit\u00E0 -UISharedNavigation.action.Save=Salva +UISharedNavigation.action.Save=Salva Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ja.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -100,6 +100,7 @@ UIUserInfo.label.Confirmpassword=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u78ba\u8a8d : UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=Email\u30a2\u30c9\u30ec\u30b9: UIUserInfo.label.user.language: Language UIUserInfo.action.Back=#{word.cancel} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ne.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -100,6 +100,7 @@ UIUserInfo.label.Confirmpassword=\u092a\u0915\u094d\u0915\u093e \u092a\u093e\u0938\u094d\u0935\u094b\u0930\u094d\u0921 : UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=\u0908\u092e\u0947\u0932 \u0920\u0947\u0917\u093e\u0928\u093e: UIUserInfo.label.user.language=\u092d\u093e\u0937\u093e: UIUserInfo.action.Back=#{word.cancel} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_nl.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -99,6 +99,7 @@ UIUserInfo.label.Confirmpassword=Bevestig paswoord : UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=#{word.email} adres: UIUserInfo.label.user.language=Language UIUserInfo.action.Back=#{word.back} Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_pt_BR.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.organization.webui.component.UIOrganizationPortlet UIOrganizationPortlet.label.userManagement=Gerência de Usuários UIOrganizationPortlet.label.groupManagement=Gerência de Grupos @@ -30,8 +30,8 @@ UIMembershipTypeForm.action.Save=#{word.save} UIMembershipTypeForm.action.Back=#{word.back} UIMembershipTypeForm.action.Reset=Limpar -UIMembershipTypeForm.msg.SameName=Papel já existente. -UIMembershipTypeForm.msg.MembershipNotExist=papel [{0}] inexistente. +UIMembershipTypeForm.msg.SameName=Papel já existente. +UIMembershipTypeForm.msg.MembershipNotExist=papel [{0}] inexistente. ##org.exoplatform.organization.webui.component.UIGroupMembershipForm UIGroupEditMembershipForm.label.username=Nome de Usuário @@ -100,6 +100,7 @@ UIUserInfo.label.Confirmpassword=Confirmar Senha: UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=Endereço Email: UIUserInfo.label.user.language=Língua UIUserInfo.action.Back=#{word.cancel} @@ -172,7 +173,7 @@ UIMembershipList.header.description=#{word.description} UIMembershipList.action.title.EditMembership=Editar Papel UIMembershipList.action.title.DeleteMembership=Remover Papel -UIMembershipList.msg.InUse=Papel em uso, não é possível removê-lo. +UIMembershipList.msg.InUse=Papel em uso, não é possível removê-lo. UIMembershipList.msg.DeleteMandatory=Papel obrigatório, não é possível removê-lo. ##org.exoplatform.organization.webui.component.UIGroupMembershipForm @@ -197,7 +198,7 @@ EditGroup.action.Save=#{word.save} EditGroup.action.Back=#{word.cancel} -UIGroupForm.msg.group-exist=Grupo já existente. +UIGroupForm.msg.group-exist=Grupo já existente. UIGroupForm.msg.group-not-exist=Grupo "{0}" inexistente. ############################################################################ # org.exoplatform.portal.component.customization.UIShareNavigationForm # @@ -254,4 +255,4 @@ UITabPane.title.UISharedNavigation=Navergação de Grupo UISharedNavigation.label.userNavigation=Nome da Navegação do Usuário UISharedNavigation.label.priority=Prioridade -UISharedNavigation.action.Save=Salvar +UISharedNavigation.action.Save=Salvar Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_ru.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.organization.webui.component.UIOrganizationPortlet UIOrganizationPortlet.label.userManagement=Пользователи UIOrganizationPortlet.label.groupManagement=Группы @@ -99,6 +99,7 @@ UIUserInfo.label.Confirmpassword=Подтверждение пароля: UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=Адрес эл.почты: UIUserInfo.label.user.language=Язык UIUserInfo.action.Back=#{word.cancel} @@ -162,7 +163,7 @@ UIMembershipList.header.description=#{word.description} UIMembershipList.action.title.EditMembership=Изменить участие UIMembershipList.action.title.DeleteMembership=Отменить участие -UIMembershipList.msg.InUse=Невозможно отменить участие. +UIMembershipList.msg.InUse=Невозможно отменить участие. UIMembershipList.msg.DeleteMandatory=\u0412\u044B \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u044D\u0442\u043E \u0447\u043B\u0435\u043D\u0441\u0442\u0432\u043E, \u043F\u043E\u0441\u043A\u043E\u043B\u044C\u043A\u0443 \u043E\u043D\u043E \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u043C ##org.exoplatform.organization.webui.component.UIGroupMembershipForm @@ -243,4 +244,4 @@ UITabPane.title.UISharedNavigation=Навигация страниц группы UISharedNavigation.label.userNavigation=Навигация страниц пользователя UISharedNavigation.label.priority=Приоритет -UISharedNavigation.action.Save=Сохранить +UISharedNavigation.action.Save=Сохранить Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_uk.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ##org.exoplatform.organization.webui.component.UIOrganizationPortlet UIOrganizationPortlet.label.userManagement=Управління користувачами UIOrganizationPortlet.label.groupManagement=Управління групами @@ -99,6 +99,7 @@ UIUserInfo.label.Confirmpassword=Підтвердіть пароль: UIUserInfo.label.firstName=#{word.firstName}: UIUserInfo.label.lastName=#{word.lastName}: +UIUserInfo.label.displayName=#{word.displayName}: UIUserInfo.label.email=Електронна пошта: UIUserInfo.action.Back=#{word.cancel} UIUserInfo.action.Save=#{word.save} @@ -161,7 +162,7 @@ UIMembershipList.header.description=#{word.description} UIMembershipList.action.title.EditMembership=Редагувати клас UIMembershipList.action.title.DeleteMembership=Видалити клас -UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується. +UIMembershipList.msg.InUse=Ви не можете видалити цей клас, бо він використовується. UIMembershipList.msg.DeleteMandatory=\u0412\u0456\u0434 \u0442\u0430\u043A\u0438\u0445 \u043C\u043E\u0436\u043D\u0430 \u043D\u0456 \u0432\u0438\u043B\u0443\u0447\u0456\u0442\u044C \u0446\u0435 \u043F\u0440\u0438\u043D\u0430\u043B\u0435\u0436\u043D\u0456\u0441\u0442\u044C \u043E\u0441\u043A\u0456\u043B\u044C\u043A\u0438 \u0432\u0456\u043D \u043E\u0434\u0438\u043D \u043E\u0431\u043E\u0432'\u044F\u0437\u043A\u043E\u0432\u0438\u0439 ##org.exoplatform.organization.webui.component.UIGroupMembershipForm Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_cs.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -27,6 +27,7 @@ UIRegisterForm.label.emailAddress=E-mailov\u00E1 adresa: UIRegisterForm.label.firstName=K\u0159estn\u00ED jm\u00E9no: UIRegisterForm.label.lastName=P\u0159\u00EDjmen\u00ED: +UIRegisterForm.label.displayName=Zobrazovan\u00E9 jm\u00E9no: UIRegisterForm.label.password=Heslo: UIRegisterForm.label.username=U\u017Eivatelsk\u00E9 jm\u00E9no: UIRegisterForm.registerWithSuccess.message=\u00DAsp\u011B\u0161n\u011B jste registroval nov\u00FD \u00FA\u010Det! Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/RegisterPortlet_en.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -26,6 +26,7 @@ UIRegisterForm.label.confirmPassword=Confirm Password: UIRegisterForm.label.firstName=First Name: UIRegisterForm.label.lastName=Last Name: +UIRegisterForm.label.displayName=Display Name: UIRegisterForm.label.emailAddress=Email Address: UIRegisterForm.label.captcha=Text validation: Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_cs.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -47,6 +47,7 @@ word.decorator=Dekor\u00E1tor word.department=Odd\u011Blen\u00ED word.description=Popis +word.displayName=Zobrazovan\u00E9 jm\u00E9no ################################################################### # EXPRESSION START WITH 'e' # ################################################################### Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1,22 +1,22 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# + ################################################################### # EXPRESSION START WITH 'A' # ################################################################### @@ -48,6 +48,7 @@ word.decorator=Decorator word.department=Department word.description=Description +word.displayName=Display Name ################################################################### # EXPRESSION START WITH 'e' # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml 2012-03-14 15:32:03 UTC (rev 8591) @@ -59,6 +59,7 @@ <decorator>Decorator</decorator> <department>Department</department> <description>Description</description> + <displayName>Display Name</displayName> <!-- ################################################################### # EXPRESSION START WITH 'e' # Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_cs.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -223,6 +223,7 @@ UIAccountProfiles.label.email=E-mail : UIAccountProfiles.label.firstName=K\u0159estn\u00ED jm\u00E9no: UIAccountProfiles.label.lastName=P\u0159\u00EDjmen\u00ED: +UIAccountProfiles.label.displayName=Zobrazovan\u00E9 jm\u00E9no: UIAccountProfiles.label.userName=U\u017Eivatelsk\u00E9 jm\u00E9no: UIAccountProfiles.msg.NotExistingAccount=V\u00E1\u0161 \u00FA\u010Det neexistuje, mo\u017En\u00FD byl smaz\u00E1n jin\u00FDm u\u017Eivatelem! UIAccountProfiles.msg.update.success=Informace o \u00FA\u010Dtu byly aktualizov\u00E1ny. Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-03-14 15:32:03 UTC (rev 8591) @@ -1196,6 +1196,7 @@ UIAccountProfiles.label.userName=User Name : UIAccountProfiles.label.firstName=First Name : UIAccountProfiles.label.lastName=Last Name : +UIAccountProfiles.label.displayName=Display Name : UIAccountProfiles.label.email=Email : UIAccountProfiles.msg.update.success=The account information has been updated. UIAccountProfiles.msg.NotExistingAccount=Your account is not existing, maybe it was deleted by another user! Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2012-03-14 15:32:03 UTC (rev 8591) @@ -72,6 +72,10 @@ addUIFormInput(new UIFormStringInput("lastName", "lastName", null).addValidator(StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class).addValidator(NaturalLanguageValidator.class)); + + // TODO: GTNPORTAL-2358 switch bindingField fullName to displayName once displayName will be available in Organization API + addUIFormInput(new UIFormStringInput("displayName", "fullName", null).addValidator(StringLengthValidator.class, 0, + 90)); addUIFormInput(new UIFormStringInput("email", "email", null).addValidator(MandatoryValidator.class).addValidator( EmailAddressValidator.class)); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2012-03-14 15:18:37 UTC (rev 8590) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2012-03-14 15:32:03 UTC (rev 8591) @@ -73,6 +73,10 @@ StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class)); addUIFormInput(new UIFormStringInput("lastName", "lastName", useraccount.getLastName()).addValidator( StringLengthValidator.class, 1, 45).addValidator(MandatoryValidator.class)); + + // TODO: GTNPORTAL-2358 switch to getDisplayName once it will be available in Organization API + addUIFormInput(new UIFormStringInput("displayName", "displayName", useraccount.getFullName()).addValidator( + StringLengthValidator.class, 0, 90)); addUIFormInput(new UIFormStringInput("email", "email", useraccount.getEmail()).addValidator( MandatoryValidator.class).addValidator(EmailAddressValidator.class)); } @@ -87,6 +91,8 @@ User user = service.getUserHandler().findUserByName(userName); uiForm.getUIStringInput("firstName").setValue(user.getFirstName()); uiForm.getUIStringInput("lastName").setValue(user.getLastName()); + // TODO: GTNPORTAL-2358 switch to getDisplayName once it will be available in Organization API + uiForm.getUIStringInput("displayName").setValue(user.getFullName()); uiForm.getUIStringInput("email").setValue(user.getEmail()); event.getRequestContext().addUIComponentToUpdateByAjax(uiForm); } @@ -119,6 +125,9 @@ } user.setFirstName(uiForm.getUIStringInput("firstName").getValue()); user.setLastName(uiForm.getUIStringInput("lastName").getValue()); + + // TODO: GTNPORTAL-2358 switch to setDisplayName once it will be available in Organization API + user.setFullName(uiForm.getUIStringInput("displayName").getValue()); user.setEmail(newEmail); uiApp.addMessage(new ApplicationMessage("UIAccountProfiles.msg.update.success", null)); service.getUserHandler().saveUser(user, true);