Author: bleny Date: 2011-01-04 13:41:44 +0000 (Tue, 04 Jan 2011) New Revision: 881 Log: translations of components Removed: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties Modified: trunk/pom.xml trunk/wao-ui/pom.xml trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/pom.xml 2011-01-04 13:41:44 UTC (rev 881) @@ -328,7 +328,7 @@ <labs.id>154</labs.id> <!-- libraries version --> - <nuitonI18nVersion>2.0.1</nuitonI18nVersion> + <nuitonI18nVersion>2.1-SNAPSHOT</nuitonI18nVersion> <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> <topiaVersion>2.5</topiaVersion> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/pom.xml 2011-01-04 13:41:44 UTC (rev 881) @@ -169,6 +169,7 @@ <execution> <id>parse Tapestry</id> <goals> + <goal>parserJava</goal> <goal>parserTapestry</goal> <goal>gen</goal> </goals> @@ -176,6 +177,7 @@ <entries> <entry> <basedir>${basedir}/src/main/resources/fr/ifremer/wao/ui</basedir> + <specificGoal>parserTapestry</specificGoal> </entry> </entries> </configuration> Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2011-01-04 13:41:44 UTC (rev 881) @@ -34,6 +34,7 @@ import fr.ifremer.wao.ui.services.ServiceAuthentication; import fr.ifremer.wao.ui.services.WaoManager; import org.apache.tapestry5.BindingConstants; +import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.annotations.InjectComponent; import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Parameter; @@ -43,11 +44,11 @@ import org.apache.tapestry5.services.Request; import org.slf4j.Logger; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; /** * Layout @@ -141,14 +142,21 @@ @Property private Map.Entry<String, String> menuItem; + @Inject + private ComponentResources resources; + public Map getMenuItems() { if (menuItems == null) { + + Messages messages = resources.getMessages(); Map<String, Class> pagesInMenu = new LinkedHashMap<String, Class>(); - pagesInMenu.put("Plan d'échantillonnage", SamplingPlan.class); - pagesInMenu.put("Navires", Boats.class); - pagesInMenu.put("Contacts", Contacts.class); - pagesInMenu.put("Synthèse", Synthesis.class); - pagesInMenu.put("Administration", Administration.class); + + pagesInMenu.put(messages.get(n_("wao.ui.page.SamplingPlan.title")), SamplingPlan.class); + pagesInMenu.put(messages.get(n_("wao.ui.page.Boats.title")), Boats.class); + pagesInMenu.put(messages.get(n_("wao.ui.page.Contacts.title")), Contacts.class); + pagesInMenu.put(messages.get(n_("wao.ui.page.Synthesis.title")), Synthesis.class); + pagesInMenu.put(messages.get(n_("wao.ui.page.Administration.title")), Administration.class); + menuItems = new LinkedHashMap<String, String>(); for (Map.Entry<String, Class> menuEntry : pagesInMenu.entrySet()) { String linkName = menuEntry.getKey(); @@ -162,42 +170,6 @@ return menuItems; } - public String getAdminClass() { - return !isAdministrationHidden() ? " admin" : ""; - } - - public String getSamplingSelected() { - return this.contentId.equals("so-sampling") ? "selected" : ""; - } - - public String getBoatsSelected() { - return this.contentId.equals("so-boats") ? "selected" : ""; - } - - public String getContactsSelected() { - return this.contentId.equals("so-contacts") ? "selected" : ""; - } - - public String getSynthesisSelected() { - return this.contentId.equals("so-synthesis") ? "selected" : ""; - } - - public String getAdminSelected() { - return this.contentId.equals("so-admin") ? "selected" : ""; - } - - public boolean isAdministrationHidden() { - return !getCurrentUser().isAdmin() && !getCurrentUser().isCoordinator(); - } - - public String getAccessText() { - String text = getCurrentUser().getRole().getLabel(); - if (getCurrentUser().isReadOnly()) { - text += " lecture seule"; - } - return text; - } - public boolean displayBody() { return !fatal; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-01-04 13:41:44 UTC (rev 881) @@ -153,6 +153,7 @@ private boolean addNewCompanySelected; private boolean deleteCompanySelected; private boolean addNewUserSelected; + private boolean showUserSelected; private boolean deleteUserSelected; void setupRender() throws WaoException { @@ -416,6 +417,11 @@ } @Log + void onSelectedFromShowUser() { + showUserSelected = true; + } + + @Log void onSuccessFromUserActionsForm() throws WaoException { if (addNewUserSelected) { userId = null; @@ -429,6 +435,8 @@ } catch (WaoBusinessException eee) { layout.addError(eee.getMessage()); } + } else if (showUserSelected && userId != null) { + userEdited = findUser(userId); } // reset : if user change, its profiles change @@ -465,7 +473,10 @@ public WaoUser getUserEdited() throws WaoException { if (userEdited == null) { - if (userId != null) { + if (userId == null) { + userEdited = serviceUser.getNewUser(getCompany()); + generatePassword = true; + } else { if (log.isDebugEnabled()) { log.debug("User exist in selectModel : " + userId); } @@ -475,9 +486,6 @@ log.debug(">>User.active : " + userEdited.isActive()); log.debug(">>User.login : " + userEdited.getLogin()); } - } else { - userEdited = serviceUser.getNewUser(getCompany()); - generatePassword = true; } } return userEdited; @@ -643,8 +651,20 @@ @Log Zone onActionFromAddRole() { - if (getEditedProfile() != null && - getEditedProfile().getUserRoleOrdinal() != null) { + + if ( getEditedProfile() == null + || getEditedProfile().getUserRoleOrdinal() == null) { + return null; + } + + boolean profileCanBeAdded = true; + for (UserProfile userProfile : getEditedUserProfiles()) { + if (userProfile.getUserRole() == getEditedProfile().getUserRole()) { + profileCanBeAdded = false; + } + } + + if (profileCanBeAdded) { getEditedProfile().setCanWrite( ! readOnly); if (log.isDebugEnabled()) { log.debug("Add user profile : " + getEditedProfile().getDescription()); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2011-01-04 13:41:44 UTC (rev 881) @@ -28,7 +28,23 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.PieChartData; import fr.ifremer.wao.bean.PieChartDataImpl; -import fr.ifremer.wao.service.*; +import fr.ifremer.wao.service.ServiceBoat; +import fr.ifremer.wao.service.ServiceBoatImpl; +import fr.ifremer.wao.service.ServiceCartography; +import fr.ifremer.wao.service.ServiceCartographyImpl; +import fr.ifremer.wao.service.ServiceChart; +import fr.ifremer.wao.service.ServiceContact; +import fr.ifremer.wao.service.ServiceContactImpl; +import fr.ifremer.wao.service.ServiceNews; +import fr.ifremer.wao.service.ServiceNewsImpl; +import fr.ifremer.wao.service.ServiceReferential; +import fr.ifremer.wao.service.ServiceReferentialImpl; +import fr.ifremer.wao.service.ServiceSampling; +import fr.ifremer.wao.service.ServiceSamplingImpl; +import fr.ifremer.wao.service.ServiceSynthesis; +import fr.ifremer.wao.service.ServiceSynthesisImpl; +import fr.ifremer.wao.service.ServiceUser; +import fr.ifremer.wao.service.ServiceUserImpl; import fr.ifremer.wao.ui.pages.PieChart; import org.apache.tapestry5.SymbolConstants; import org.apache.tapestry5.ioc.Configuration; @@ -40,7 +56,15 @@ import org.apache.tapestry5.ioc.services.Coercion; import org.apache.tapestry5.ioc.services.CoercionTuple; import org.apache.tapestry5.ioc.services.RegistryShutdownHub; -import org.apache.tapestry5.services.*; +import org.apache.tapestry5.services.ApplicationStateContribution; +import org.apache.tapestry5.services.ApplicationStateCreator; +import org.apache.tapestry5.services.ApplicationStateManager; +import org.apache.tapestry5.services.ComponentRequestFilter; +import org.apache.tapestry5.services.PageRenderLinkSource; +import org.apache.tapestry5.services.Request; +import org.apache.tapestry5.services.RequestFilter; +import org.apache.tapestry5.services.RequestHandler; +import org.apache.tapestry5.services.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -294,4 +318,11 @@ PieChartData.class, String.class, coercion2)); } + public void contributeValidationMessagesSource(OrderedConfiguration<String> configuration) { + if (logger.isDebugEnabled()) { + logger.debug("contribute validation messages source in conf " + configuration.toString()); + } + // configuration.override("Default","/org/example/myapp/validators/validators"); + } + } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2011-01-04 13:41:44 UTC (rev 881) @@ -48,8 +48,7 @@ </a>--> </p> <p class="cnil"> - Le site de "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" a fait l'objet d'une déclaration à - la CNIL sous le numéro suivant : 1414476 + ${message:wao.ui.disclaimer} </p> </div> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ImportFieldSet.tml 2011-01-04 13:41:44 UTC (rev 881) @@ -24,11 +24,11 @@ <div class="so-import"> <form t:type="form" t:id="importForm" action="post"> <fieldset> - <legend>Import ${label}</legend> + <legend>${format:wao.ui.import.title=label}</legend> <t:errors /> - <label for="file">Fichier ${format} ${label}</label> :<br /> + <label for="file">${format:wao.ui.import.description=format,label}</label><br /> <input t:type="upload" t:id="file" t:validate="required" /> - <input t:type="submit" class="ico import" value="OK" title="Import ${label} (format ${format} avec encodage UTF-8)" /> + <input t:type="submit" class="ico import" value="OK" title="${format:wao.ui.import.fullDescription=label,format}" /> <t:body /> </fieldset> </form> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2011-01-04 13:41:44 UTC (rev 881) @@ -26,11 +26,11 @@ <tbody> <tr> <th /> - <th colspan="${indicator.indicatorLevel.size()}">Indicateur : ${indicator.synthesisId.label}</th> - <th>Pondération</th> + <th colspan="${indicator.indicatorLevel.size()}">${message:wao.ui.indicator.indicator} ${indicator.synthesisId}</th> + <th>${message:wao.ui.indicator.coefficient}</th> </tr> <tr> - <th>Niveaux</th> + <th>${message:wao.ui.indicator.levels}</th> <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> <t:if test="highLightCurrentIndicatorLevel()"> <td class="highlight selected">${indicatorLevel.level}</td> @@ -44,7 +44,7 @@ </td> </tr> <tr> - <th>Bornes</th> + <th>${message:wao.ui.indicator.bounds}</th> <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> <td> <t:if test="indicatorLevel.lowerEqualsUpperBounds()"> @@ -64,7 +64,7 @@ </tr> <t:if test="getEditable()"> <tr> - <th>Modifications</th> + <th>${message:wao.ui.indicator.editions}</th> <t:loop t:source="indicator.indicatorLevel" t:value="indicatorLevel" volatile="true"> <td> <t:if test="indicatorLevel.lowerBoundPositiveInfinity"> @@ -75,13 +75,13 @@ <!--input t:type="textfield" value="indicatorLevel.lowerBound" size="3" disabled="disabled" /--> </p:else> </t:if> - <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> + <span t:type="ck/Tooltip" t:value="${message:wao.ui.indicator.useRightDecimalSymbol}" t:effect="appear"> <input t:type="textfield" value="indicatorLevel.upperBound" size="3" /> </span> </td> </t:loop> <td> - <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> + <span t:type="ck/Tooltip" t:value="${message:wao.ui.indicator.useRightDecimalSymbol}" t:effect="appear"> <input t:type="textfield" value="indicator.coefficient" size="3" /> </span> </td> @@ -91,7 +91,7 @@ </table> <t:if test="isWithLegend()"> <div class="acenter" style="font-size: 9pt;"> - En jaune, la position actuelle de la société selon cet indicateur. + ${message:wao.ui.indicator.legend} </div> </t:if> Deleted: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties 2011-01-04 13:41:44 UTC (rev 881) @@ -1,27 +0,0 @@ -### -# #%L -# Wao :: Web Interface -# -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -login-label: Identifiant -password-label: Mot de passe -email-label: Votre identifiant Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.tml 2011-01-04 13:41:44 UTC (rev 881) @@ -53,33 +53,32 @@ </t:unless> <div id="so-session" class="clearfix"> <div class="fleft"> - <a t:type="pagelink" t:page="index" title="Page d'accueil"> - <img src="${asset:context:img/logo-wao-48px.png}" alt="WAO logo" title="Retourner sur la page d'accueil"/> + <a t:type="pagelink" t:page="index" title="{$mesage:wao.ui.page.Index.title}"> + <img src="${asset:context:img/logo-wao-48px.png}" alt="{$mesage:wao.ui.page.Index.title}" title="{$mesage:wao.ui.page.Index.title}"/> </a>  </div> <div class="fleft"> - <a href="mailto:obsmer at ifremer.fr" title="Contacter un responsable Obsmer"> + <a href="mailto:obsmer at ifremer.fr" title="${message:wao.ui.action.contactAdmin}"> <img src="${asset:context:img/MiniLogo.jpg}" alt="Obsmer logo"/> </a> </div> <div id="user-infos" class="fleft"> - Vous êtes <strong>${currentUser.fullName}</strong> de la société <strong>${currentUser.company.name}</strong> - (${currentUser.profile.description}) + ${format:wao.ui.layout.userDescription=currentUser.fullName,currentUser.company.name,currentUser.profile.description} </div> <div id="user-actions" class="fright"> - <a t:type="pagelink" t:page="index" title="Page d'accueil"> - <img src="${asset:context:img/home.png}" alt="Accueil" title="Page d'accueil" /> + <a t:type="pagelink" t:page="index" title="${message:wao.ui.page.Index.title}"> + <img src="${asset:context:img/home.png}" alt="${message:wao.ui.page.Index.title}" title="${message:wao.ui.page.Index.title}" /> </a> <t:unless t:test="currentUser.guest"> - <a t:type="pagelink" t:page="cartography" title="Cartes" target="blank"> - <img src="${asset:context:img/cartography.png}" alt="Cartes" title="Cartes"/> + <a t:type="pagelink" t:page="cartography" title="${message:wao.ui.page.Cartography.title}"> + <img src="${asset:context:img/cartography.png}" alt="${message:wao.ui.page.Cartography.title}" title="${message:wao.ui.page.Cartography.title}"/> </a> </t:unless> - <a t:type="pagelink" t:page="userProfileForm" title="Gestion profil"> - <img src="${asset:context:img/user.png}" alt="Preferences" title="Gestion profil"/> + <a t:type="pagelink" t:page="userProfileForm" title="${message:wao.ui.page.UserProfileForm.title}"> + <img src="${asset:context:img/user.png}" alt="${message:wao.ui.page.UserProfileForm.title}" title="${message:wao.ui.page.UserProfileForm.title}"/> </a> - <a t:type="actionlink" t:id="exit" title="Déconnexion"> - <img src="${asset:context:img/exit.png}" alt="Exit" title="Déconnexion"/> + <a t:type="actionlink" t:id="exit" title="${message:wao.ui.action.logout}"> + <img src="${asset:context:img/exit.png}" alt="${message:wao.ui.action.logout}" title="${message:wao.ui.action.logout}"/> </a> </div> </div> @@ -90,54 +89,6 @@ </li> </ul> - <!--ul class="clearfix" id="so-menu"> - <li class="link${adminClass} ${samplingSelected}" onclick="location.href='${contextPath}/samplingPlan'" - title="Plan d'échantillonnage"> - Plan d'Echantillonnage - </li> - <li class="sep"> </li> - <t:unless t:test="currentUser.guest"> - <li class="link${adminClass} ${boatsSelected}" onclick="location.href='${contextPath}/boats'" title="Liste des navires"> - Navires - </li> - <li class="sep"> </li> - <li class="link${adminClass} ${contactsSelected}" onclick="location.href='${contextPath}/contacts'" title="Liste des contacts"> - Contacts - </li> - <li class="sep"> </li> - <li class="link${adminClass} ${synthesisSelected}" onclick="location.href='${contextPath}/synthesis'" title="Synthèses et indicateurs"> - Synthèse - </li> - <p:else> - <!- Menu disabled for Guest user -> - <li class="disabled" title="Liste des navires inaccessible"> - Navires - </li> - <li class="sep"> </li> - <li class="disabled" title="Liste des contacts inaccessible"> - Contacts - </li> - <li class="sep"> </li> - <li class="disabled" title="Synthèses et indicateurs inaccessibles"> - Synthèse - </li> - </p:else> - </t:unless> - <t:unless t:test="administrationHidden"> - <li class="sep"> </li> - <t:if t:test="currentUser.readOnly"> - <li class="disabled${adminClass}" title="Administration inaccessible"> - Administration - </li> - <p:else> - <li class="link${adminClass} ${adminSelected}" onclick="location.href='${contextPath}/administration'" title="Administration"> - Administration - </li> - </p:else> - </t:if> - </t:unless> - </ul--> - <div id="${contentId}"> <t:feedback t:id="contentFeedback" t:autoClear="false"/> <t:if t:test="displayBody()"> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/LogFile.tml 2011-01-04 13:41:44 UTC (rev 881) @@ -24,7 +24,7 @@ <t:if t:test="source"> <div class="fright"> <a t:type="actionlink" t:id="showLogFile" target="blank"> - <img src="${icon}" alt="Fichier de log" title="Afficher le fichier de log ${title}" /> + <img src="${icon}" alt="${format:wao.ui.misc.logFile.description=title}" title="${format:wao.ui.misc.logFile.description=title}" /> </a> </div> </t:if> Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-01-04 13:41:44 UTC (rev 881) @@ -16,3 +16,27 @@ code-label= dup-label= shipOwner-label= +wao.ui.action.contactAdmin= +wao.ui.action.logout= +wao.ui.disclaimer= +wao.ui.import.description= +wao.ui.import.fullDescription= +wao.ui.import.title= +wao.ui.indicator.bounds= +wao.ui.indicator.coefficient= +wao.ui.indicator.editions= +wao.ui.indicator.indicator= +wao.ui.indicator.legend= +wao.ui.indicator.levels= +wao.ui.indicator.useRightDecimalSymbol= +wao.ui.layout.userDescription= +wao.ui.layout.userDescription\=currentUser.fullName,currentUser.company.name,currentUser.profile.description= +wao.ui.misc.logFile.description= +wao.ui.page.Administration.title= +wao.ui.page.Boats.title= +wao.ui.page.Cartography.title= +wao.ui.page.Contacts.title= +wao.ui.page.Index.title= +wao.ui.page.SamplingPlan.title= +wao.ui.page.Synthesis.title= +wao.ui.page.UserProfileForm.title= Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-03 20:14:18 UTC (rev 880) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-01-04 13:41:44 UTC (rev 881) @@ -1,18 +1,44 @@ -ContactState.BOARDING_DONE=Embarquement r\u00E9alis\u00E9 -ContactState.BOARDING_EXPECTED=Embarquement programm\u00E9 -ContactState.BOAT_DEFINITIVE_REFUSED=Refus d\u00E9finitif +ContactState.BOARDING_DONE=Embarquement r\u00e9alis\u00e9 +ContactState.BOARDING_EXPECTED=Embarquement programm\u00e9 +ContactState.BOAT_DEFINITIVE_REFUSED=Refus d\u00e9finitif ContactState.BOAT_REFUSED=Refus ContactState.BOAT_UNAVAILABLE=Non abouti ContactState.CONTACT_START=Contact pris DataReliability.DOUBTFUL=Douteuse -DataReliability.NOT_PROVIDED=Non contr\u00F4l\u00E9e +DataReliability.NOT_PROVIDED=Non contr\u00f4l\u00e9e DataReliability.NOT_RELIABLE=Non exploitable DataReliability.RELIABLE=Exploitable DataReliability.UNKNOWN=Inconnue -SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Toutes esp\u00E8ces commerciales -SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1+G2 -SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1 -SamplingStrategy.SPECIFIC_STOCK=Stock sp\u00E9cifique +SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Toutes esp\u00e8ces commerciales +SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultan\u00e9 \: esp\u00e8ces G1+G2 +SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultan\u00e9 \: esp\u00e8ces G1 +SamplingStrategy.SPECIFIC_STOCK=Stock sp\u00e9cifique code-label= dup-label= shipOwner-label= +wao.ui.action.contactAdmin=Contacter un responsable ObsMer +wao.ui.action.logout=D\u00e9connexion +wao.ui.action.revert=Annuler +wao.ui.action.save=Enregistrer +wao.ui.disclaimer=Le site de "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" a fait l'objet d'une d\u00e9claration \u00e0 la CNIL sous le num\u00e9ro suivant \: 1414476 +wao.ui.import.description=Fichier %s %s \: +wao.ui.import.fullDescription=Import %s (format %s avec encodage UTF-8) +wao.ui.import.title=Import %s +wao.ui.indicator.andMore=%s et plus +wao.ui.indicator.bounds=Bornes +wao.ui.indicator.coefficient=Pond\u00e9ration +wao.ui.indicator.editions=Modifications +wao.ui.indicator.indicator=Indicateur \: +wao.ui.indicator.legend=En jaune, la position actuelle de la soci\u00e9t\u00e9 selon cet indicateur. +wao.ui.indicator.levels=Niveaux +wao.ui.indicator.useRightDecimalSymbol=Attention \u00e0 bien utiliser ',' et non '.' pour les d\u00e9cimales +wao.ui.layout.userDescription=Vous \u00eates %s de la soci\u00e9t\u00e9 %s (%s) +wao.ui.misc.logFile.description=Afficher le fichier de log de %s +wao.ui.page.Administration.title=Administration +wao.ui.page.Boats.title=Navires +wao.ui.page.Cartography.title=Cartography +wao.ui.page.Contacts.title=Contacts +wao.ui.page.Index.title=Accueil +wao.ui.page.SamplingPlan.title=Plan d'\u00e9chantillonnage +wao.ui.page.Synthesis.title=Synth\u00e8se +wao.ui.page.UserProfileForm.title=Gestion du profil