dgraham 2003/07/11 17:35:08 Modified: src/share/org/apache/struts/taglib/html HtmlTag.java Log: Add country to lang attribute if defined. PR# 19299. Revision Changes Path 1.15 +20 -10 jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java Index: HtmlTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/HtmlTag.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- HtmlTag.java 11 Jul 2003 04:22:15 -0000 1.14 +++ HtmlTag.java 12 Jul 2003 00:35:08 -0000 1.15 @@ -169,20 +169,22 @@ protected String renderHtmlStartElement() { StringBuffer sb = new StringBuffer("<html"); - // Use the current Locale to set our language preferences String language = null; + String country = ""; + if (this.locale) { // provided for 1.1 backward compatibility, remove after 1.2 language = this.getCurrentLocale().getLanguage(); } else { - language = - RequestUtils - .retrieveUserLocale(pageContext, Globals.LOCALE_KEY) - .getLanguage(); + Locale currentLocale = + RequestUtils.retrieveUserLocale(pageContext, Globals.LOCALE_KEY); + + language = currentLocale.getLanguage(); + country = currentLocale.getCountry(); } - // Does the locale have a language? boolean validLanguage = ((language != null) && (language.length() > 0)); + boolean validCountry = country.length() > 0; if (this.xhtml) { this.pageContext.setAttribute( @@ -196,12 +198,20 @@ if ((this.lang || this.locale || this.xhtml) && validLanguage) { sb.append(" lang=\""); sb.append(language); + if (validCountry) { + sb.append("-"); + sb.append(country); + } sb.append("\""); } if (this.xhtml && validLanguage) { sb.append(" xml:lang=\""); sb.append(language); + if (validCountry) { + sb.append("-"); + sb.append(country); + } sb.append("\""); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]