[kupu-checkins] r52221 - kupu/trunk/kupu/mmbase

Thu Mar 6 17:15:37 CET 2008

Author: mihxil
Date: Thu Mar  6 17:15:37 2008
New Revision: 52221

Modified:
   kupu/trunk/kupu/mmbase/html.kupu
   kupu/trunk/kupu/mmbase/mmbase.kupu
Log:
details

Modified: kupu/trunk/kupu/mmbase/html.kupu
==============================================================================

--- kupu/trunk/kupu/mmbase/html.kupu	(original)
+++ kupu/trunk/kupu/mmbase/html.kupu	Thu Mar  6 17:15:37 2008
@@ -7,7 +7,7 @@
   <kupu:id>$Id: html.kupu,v 1.14 2005/09/27 18:26:52 michiel Exp $</kupu:id>
   <kupu:part name="html">
     <html xmlns="http://www.w3.org/1999/xhtml"
-          xmlns:jsp="http://java.sun.com/JSP/Page" 
+          xmlns:jsp="http://java.sun.com/JSP/Page"
           xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
           xmlns:fn="http://java.sun.com/jsp/jstl/functions"
           xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0">
@@ -24,7 +24,7 @@
         <mm:param referid="org.mmbase.index-root" />
         <mm:write session="org.mmbase.index-root" referid="org.mmbase.index-root" />
         -->
-        <mm:import id="rich_language" externid="language" />
+        <mm:import id="rich_language" externid="language" from="parameters,request" />
         <mm:import externid="rich_language" from="this,session">client</mm:import>
         <mm:write session="rich_language" referid="rich_language" />
         <mm:write cookie="rich_language" referid="rich_language"/>

Modified: kupu/trunk/kupu/mmbase/mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.kupu	Thu Mar  6 17:15:37 2008
@@ -60,14 +60,8 @@
               </mm:compare>
               <mm:import id="languages" vartype="list">en,zh,ja,de,fr,pt,nl,da,cs,fi,el,sr,eo,hi</mm:import>
               <mm:stringlist referid="languages">
-                <mm:locale language="${_}" jspvar="locale">
-                  <mm:compare referid2="rich_language">
-                    <option value="${_}" selected="selected"><jsp:expression>locale.getDisplayName(locale)</jsp:expression></option>
-                  </mm:compare>
-                  <mm:compare referid2="rich_language" inverse="true">
-                    <option value="${_}"><jsp:expression>locale.getDisplayName(locale)</jsp:expression></option>
-                  </mm:compare>
-                </mm:locale>
+                <mm:import id="gui"><mm:locale language="${_}" jspvar="locale"><jsp:expression>locale.getDisplayName(locale)</jsp:expression></mm:locale></mm:import>
+                <mm:option value="${_}" compare="${rich_language}">${gui}</mm:option>
               </mm:stringlist>
             </select>
           </form>
