Author: tchemit Date: 2012-03-08 18:05:49 +0100 (Thu, 08 Mar 2012) New Revision: 335 Url: http://forge.codelutin.com/repositories/revision/echobase/335 Log: add i18n actions Added: trunk/echobase-ui/src/main/webapp/images/fr.png trunk/echobase-ui/src/main/webapp/images/gb.png Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-01 22:47:17 UTC (rev 334) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-08 17:05:49 UTC (rev 335) @@ -1,3 +1,7 @@ +echobase.action.toEnglish=Use english version +echobase.action.toFrench=Use the french version +echobase.action.usingEnglish=English version used +echobase.action.usingFrench=French version used echobase.common.importError=Message d'erreur echobase.common.importFileName=Nom du fichier importé echobase.common.nbCreatedObjects=Nombre d'objets crées Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-01 22:47:17 UTC (rev 334) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-08 17:05:49 UTC (rev 335) @@ -23,6 +23,10 @@ echobase.action.return=Retour echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Enregistrer la requête +echobase.action.toEnglish=Utiliser la version anglaise +echobase.action.toFrench=Utiliser la version française +echobase.action.usingEnglish=Version anglaise utilisé +echobase.action.usingFrench=Version française utilisé echobase.common.acousticDensityUnit=acousticDensityUnit echobase.common.acquisitionSoftwareVersionER60=acquisitionSoftwareVersion (ER60 instrument) echobase.common.acquisitionSoftwareVersionME70=acquisitionSoftwareVersion (ME70 instrument) Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-03-01 22:47:17 UTC (rev 334) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-03-08 17:05:49 UTC (rev 335) @@ -29,12 +29,16 @@ <div class='displayBlock top'> + <%@ include file="i18n.jsp" %> + <div class='floatLeft'> <s:a action="home" cssClass="logo" namespace="/">EchoBase</s:a> </div> <div id='headerRight'> <div> + + <s:text name="echobase.label.user.login"> <s:param> <s:property value="#session.echoBaseSession.echoBaseUser.email"/> @@ -46,10 +50,12 @@ <s:text name="echobase.action.logout"/> </s:a> </li> + <li> + </li> </ul> </div> <br/> - <%@ include file="i18n.jsp" %> + <br/> </div> <div class="cleanBoth menu"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2012-03-01 22:47:17 UTC (rev 334) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2012-03-08 17:05:49 UTC (rev 335) @@ -22,32 +22,34 @@ #L% --%> <%@ taglib prefix="s" uri="/struts-tags" %> -<%--div class="cleanBoth"> - <s:text name="echobase.label.language"/> - <ul> - <li> - <s:if - test="%{#session['WW_TRANS_I18N_LOCALE'] != null && #session['WW_TRANS_I18N_LOCALE'].language == 'en'}"> - <s:text name="echobase.label.locale.english"/> - </s:if> - <s:else> - <s:a action="home" namespace="/"> - <s:param name="request_locale">en_GB</s:param> - <s:text name="echobase.action.locale.english"/> - </s:a> - </s:else> - </li> - <li> - <s:if - test="%{#session['WW_TRANS_I18N_LOCALE'] == null || #session['WW_TRANS_I18N_LOCALE'].language == 'fr'}"> - <s:text name="echobase.label.locale.french"/> - </s:if> - <s:else> - <s:a action="home" namespace="/"> - <s:param name="request_locale">fr_FR</s:param> - <s:text name="echobase.action.locale.french"/> - </s:a> - </s:else> - </li> - </ul> -</div--%> +<s:set name="usingEnglish"><s:text name='echobase.action.usingEnglish'/></s:set> +<s:set name="usingFrench"><s:text name='echobase.action.usingFrench'/></s:set> +<s:set name="toEnglish"><s:text name='echobase.action.toEnglish'/></s:set> +<s:set name="toFrench"><s:text name='echobase.action.toFrench'/></s:set> + +<s:if + test="%{#session['WW_TRANS_I18N_LOCALE'] == null || #session['WW_TRANS_I18N_LOCALE'].language == 'fr'}"> + <s:a href='' cssClass="francais i18nActive" title="%{usingFrench}"> + <s:param name="request_locale">fr</s:param> + </s:a> +</s:if> +<s:else> + <s:a namespace="/" action="home" cssClass="francais i18nNonActive" + title="%{toFrench}"> + <s:param name="request_locale">fr</s:param> + </s:a> +</s:else> + +<s:if + test="%{#session['WW_TRANS_I18N_LOCALE'] != null && #session['WW_TRANS_I18N_LOCALE'].language == 'en'}"> + <s:a href='' cssClass="anglais i18nActive" title="%{usingEnglish}"> + <s:param name="request_locale">en</s:param> + </s:a> +</s:if> +<s:else> + <s:a namespace="/" action="home" cssClass="anglais i18nNonActive" + title="%{toEnglish}"> + <s:param name="request_locale">en</s:param> + </s:a> +</s:else> + Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-03-01 22:47:17 UTC (rev 334) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-03-08 17:05:49 UTC (rev 335) @@ -40,22 +40,23 @@ <%--header--%> <div class='displayBlock top'> + <%@ include file="/WEB-INF/includes/i18n.jsp" %> <div class='floatLeft'> <s:a action="home" cssClass="logo" namespace="/">Echobase</s:a> </div> <div id='headerRight'> - <%@ include file="/WEB-INF/includes/i18n.jsp" %> + </div> </div> <div class="cleanBoth"></div> <%-- content --%> -<div class="containerHome"> +<div class="containerHome ui-corner-all"> <h2><s:text name="echobase.title.login"/></h2> <s:form method="POST" namespace="/user"> - <fieldset> + <fieldset class="ui-corner-all"> <legend> <s:text name="echobase.title.login"/> </legend> Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-03-01 22:47:17 UTC (rev 334) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-03-08 17:05:49 UTC (rev 335) @@ -632,4 +632,38 @@ } #headerRight a:hover{ background-position:0 -18px; +} + +.top a.anglais { + line-height:20px; + display: block; + text-indent: -999999px; + background: url(../images/gb.png) no-repeat; + position: absolute; + left: 30px; + top: 10px; + width: 16px; + height: 11px; + border: 2px solid transparent; +} + +.top a.francais { + line-height:20px; + display: block; + text-indent: -999999px; + background: url(../images/fr.png) no-repeat; + position: absolute; + left: 5px; + top: 10px; + width: 16px; + height: 11px; + border: 2px solid transparent; +} + +.top a.i18nNonActive:hover { + border: 2px solid #ffe600; +} + +.top a.i18nActive { + border: 2px solid white; } \ No newline at end of file Added: trunk/echobase-ui/src/main/webapp/images/fr.png =================================================================== (Binary files differ) Property changes on: trunk/echobase-ui/src/main/webapp/images/fr.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/echobase-ui/src/main/webapp/images/gb.png =================================================================== (Binary files differ) Property changes on: trunk/echobase-ui/src/main/webapp/images/gb.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL