You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/11/22 05:05:07 UTC
svn commit: r106153 - /lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
Author: gregor
Date: Sun Nov 21 20:05:06 2004
New Revision: 106153
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
Log:
Lifted 2-letter language code restriction. It is now possible to create pages with a language code of zh-tw, for instance.
It is still possible to use the short en, de as well.
This fixes http://issues.apache.org/bugzilla/show_bug.cgi?id=28974
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java?view=diff&rev=106153&p1=lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java&r1=106152&p2=lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java&r2=106153
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java Sun Nov 21 20:05:06 2004
@@ -15,7 +15,7 @@
*
*/
-/* $Id: DefaultDocumentBuilder.java,v 1.29 2004/05/13 15:57:33 andreas Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.publication;
@@ -123,12 +123,12 @@
*/
protected String getLanguage(String urlWithoutSuffix) {
- String suffix = "";
+ String language = "";
String url = urlWithoutSuffix;
- if (url.length() >= 3 && url.charAt(url.length() - 3) == '_') {
- suffix = url.substring(url.length() - 2);
+ if (url.length() >= 3 && url.substring(url.length() -6).indexOf("_") != -1) {
+ language = url.substring(url.lastIndexOf("_") +1);
}
- return suffix;
+ return language;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org