This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 764bdfb02d3e23bca3e06de258e718a48918c98a Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:41:19 2015 +0100 On mentionne dans le pied de page le nom du laboratoire après la société (fixes #6558) --- wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 2 +- wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 2 +- wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties index 4d26f6e..3ab18e1 100644 --- a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties +++ b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties @@ -460,7 +460,7 @@ wao.ui.indicators.title=Providers quality indicators wao.ui.invalidDateFormat=Expected format is yyyy-mm-dd wao.ui.invalidLogin=Invalid identifier wao.ui.invalidMonthFormat=Expected format is yyyy-mm -wao.ui.layout.userDescription=You are %s of company %s (%s) +wao.ui.layout.userDescription=You are %s (%s, %s) wao.ui.message.chooseProfile=Choose your profile \: wao.ui.misc.METIER=METIER wao.ui.misc.N/A=non available diff --git a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties index 3e5d06b..57313fc 100644 --- a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties +++ b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties @@ -461,7 +461,7 @@ wao.ui.indicators.title=Indicateurs qualités prestataires wao.ui.invalidDateFormat=Le format attendu est jj/mm/aaaa wao.ui.invalidLogin=Identifiant invalide wao.ui.invalidMonthFormat=Le format attendu est mm/aaaa -wao.ui.layout.userDescription=Vous êtes %s de la société %s (%s) +wao.ui.layout.userDescription=Vous êtes %s (%s, %s) wao.ui.message.chooseProfile=Choisissez dans la liste votre profil de connexion \: wao.ui.misc.METIER=MÉTIER wao.ui.misc.N/A=non renseignée diff --git a/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp b/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp index 812822a..275b2dd 100644 --- a/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp +++ b/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp @@ -282,7 +282,7 @@ <li> <s:text name="wao.ui.layout.userDescription"> <s:param value="authenticatedWaoUser.waoUser.fullName"/> - <s:param value="authenticatedWaoUser.waoUser.company.name"/> + <s:param value="authenticatedWaoUser.waoUser.organisation.fullName"/> <s:param value="getText(authenticatedWaoUser.userRole)"/> </s:text> </li> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.