Author: sshyrkov Date: Mon Jun 18 19:44:13 2007 New Revision: 17629 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17629&repname= =3Djahia Log: JAHIA-1595: Choix de la langue: manque d'homogeneit=C3=A9 dans les proposit= ions =
http://www.jahia.net/jira/browse/JAHIA-1595 Resolved: 1) Language names are capitalized 2) Remember the selected language if navigating back to the first screen of= the wizard Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/configuration_wi= zard/welcome.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/configurat= ion_wizard/welcome.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/configuration_wizard/welcome.jsp&rev=3D17= 629&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/configuration_wi= zard/welcome.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/configuration_wi= zard/welcome.jsp Mon Jun 18 19:44:13 2007 @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and = limitations under the License. --%><%@ page language=3D"java" contentType=3D"text/html;charset=3DUTF-8" %= ><%@ include file=3D"header.inc" %> -<%@ page import=3D"java.util.*" %> +<%@ page import=3D"java.util.*, org.apache.commons.lang.StringUtils, org.j= ahia.params.ProcessingContext" %> <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %> = <jsp:useBean id=3D"javavendor" class=3D"java.lang.String" scope=3D"request= "/> @@ -85,11 +85,13 @@ <select name=3D"newLocale"> <% final Enumeration localeEnum =3D availableBundleLocales.elemen= ts(); + Locale usedLocale =3D session.getAttribute(ProcessingContext.SESSI= ON_LOCALE) !=3D null ? + (Locale)session.getAttribute(ProcessingContext.SESSION_LOCALE) := request.getLocale(); = while (localeEnum.hasMoreElements()) { final Locale curLocale =3D (Locale) localeEnum.nextElement= (); final String localeDisplayName; - localeDisplayName =3D curLocale.getDisplayName(curLocale); - if (curLocale.equals(request.getLocale())) { + localeDisplayName =3D StringUtils.capitalize(curLocale.get= DisplayName(curLocale)); + if (curLocale.equals(usedLocale)) { %> <option selected=3D"selected" value=3D"<%=3DcurLocale.toString()%>= "><%=3DlocaleDisplayName%></option> <% } else { %> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
