remm 02/04/04 09:50:34
Modified: catalina/src/share/org/apache/catalina/connector/http
HttpProcessor.java
catalina/src/share/org/apache/catalina/connector/http10
HttpProcessor.java
Log:
- Port language variant support to the old HTTP connectors.
- Patch submitted by Ryan Lubke.
Revision Changes Path
1.46 +15 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- HttpProcessor.java 18 Mar 2002 07:15:40 -0000 1.45
+++ HttpProcessor.java 4 Apr 2002 17:50:34 -0000 1.46
@@ -1,6 +1,6 @@
-/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.45 2002/03/18 07:15:40 remm Exp $
- * $Revision: 1.45 $
- * $Date: 2002/03/18 07:15:40 $
+/* * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpProcessor.java,v
1.46 2002/04/04 17:50:34 remm Exp $
+ * $Revision: 1.46 $
+ * $Date: 2002/04/04 17:50:34 $
*
* ====================================================================
*
@@ -108,7 +108,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.45 $ $Date: 2002/03/18 07:15:40 $
+ * @version $Revision: 1.46 $ $Date: 2002/04/04 17:50:34 $
* @deprecated
*/
@@ -499,17 +499,27 @@
// Extract the language and country for this entry
String language = null;
String country = null;
+ String variant = null;
int dash = entry.indexOf('-');
if (dash < 0) {
language = entry;
country = "";
+ variant = "";
} else {
language = entry.substring(0, dash);
country = entry.substring(dash + 1);
+ int vDash = country.indexOf('-');
+ if (vDash > 0) {
+ String cTemp = country.substring(0, vDash);
+ variant = country.substring(vDash + 1);
+ country = cTemp;
+ } else {
+ variant = "";
+ }
}
// Add a new Locale to the list of Locales for this quality level
- Locale locale = new Locale(language, country);
+ Locale locale = new Locale(language, country, variant);
Double key = new Double(-quality); // Reverse the order
ArrayList values = (ArrayList) locales.get(key);
if (values == null) {
1.9 +12 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java
Index: HttpProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HttpProcessor.java 18 Mar 2002 07:15:40 -0000 1.8
+++ HttpProcessor.java 4 Apr 2002 17:50:34 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
1.8 2002/03/18 07:15:40 remm Exp $
- * $Revision: 1.8 $
- * $Date: 2002/03/18 07:15:40 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpProcessor.java,v
1.9 2002/04/04 17:50:34 remm Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/04/04 17:50:34 $
*
* ====================================================================
*
@@ -105,7 +105,7 @@
* the request. When the processor is completed, it will recycle itself.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.8 $ $Date: 2002/03/18 07:15:40 $
+ * @version $Revision: 1.9 $ $Date: 2002/04/04 17:50:34 $
* @deprecated
*/
@@ -463,12 +463,19 @@
while (le.hasMoreElements()) {
String language = (String)le.nextElement();
String country = "";
+ String variant = "";
int countryIndex = language.indexOf('-');
if (countryIndex > -1) {
country = language.substring(countryIndex + 1).trim();
language = language.substring(0, countryIndex).trim();
+ int vDash = country.indexOf("-");
+ if (vDash > 0) {
+ String cTemp = country.substring(0, vDash);
+ variant = country.substring(vDash + 1);
+ country = cTemp;
+ }
}
- request.addLocale(new Locale(language, country));
+ request.addLocale(new Locale(language, country, variant));
}
}
} else if (match.equals("cookie")) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
