Changeset 6054

Show
Ignore:
Timestamp:
11/14/11 12:10:22 (6 months ago)
Author:
mtld
Message:

updated i18n sample

Location:
trunk/pustefix-samples/pustefix-i18n
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • trunk/pustefix-samples/pustefix-i18n/pustefix-i18n-core/src/main/resources/PUSTEFIX-INF/conf/project.xml

    r5841 r6054  
    33                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    44                xsi:schemaLocation="http://www.pustefix-framework.org/2008/namespace/project-config  
    5                                     http://www.pustefix-framework.org/2008/namespace/project-config-0._16.xsd"> 
     5                                    http://www.pustefix-framework.org/2008/namespace/project-config-0_18.xsd"> 
    66 
    77  <project> 
    … …  
    2727    </choose> 
    2828  </xml-generator> 
     29   
     30  <!-- automatically generate searchengine sitemap file sitemaps.xml  
     31       (according to sitemaps protocol from http://www.sitemaps.org) --> 
     32  <searchengine-sitemap/> 
    2933 
    3034  <application> 

  • trunk/pustefix-samples/pustefix-i18n/pustefix-i18n-core/src/main/resources/PUSTEFIX-INF/conf/sitemap.xml

    r5869 r6054  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <sitemap> 
     2<sitemap xmlns="http://www.pustefix-framework.org/2011/namespace/sitemap" 
     3         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     4         xsi:schemaLocation="http://www.pustefix-framework.org/2011/namespace/sitemap  
     5                             http://www.pustefix-framework.org/2011/namespace/sitemap.xsd"> 
     6                              
    37  <page name="Home"/> 
    48  <page name="Overview"/> 
    … …  
    812    <alt key="mountains" name="Mountains"/> 
    913  </page> 
    10   <!-- <config-include file="conf/sitemap-fragment.xml" section="sitemap" module="*"/> --> 
     14   
     15  <!-- 
     16  <config-include file="conf/sitemap-fragment.xml" section="sitemap" module="*"/> 
     17  --> 
     18   
    1119</sitemap> 

  • trunk/pustefix-samples/pustefix-i18n/pustefix-i18n-core/src/main/resources/PUSTEFIX-INF/txt/common.xml

    r5874 r6054  
    1616              </ixsl:when> 
    1717              <ixsl:otherwise> 
    18                   <a href="{$__contextpath}/{pfx:__omitPage($page,text())}{$__sessionIdPath}"> 
     18                  <a href="{$__contextpath}/{pfx:__omitPage($page,text(),$pageAlternative)}{$__sessionIdPath}"> 
    1919                  <pfx:include href="txt/common.xml" part="langdesc"/> 
    2020                </a> 

  • trunk/pustefix-samples/pustefix-i18n/pustefix-i18n-core/src/main/resources/PUSTEFIX-INF/txt/pages/Overview.xml

    r5869 r6054  
    2121       <pfx:image src="img/cities/thumb.jpg" search="dynamic"/> 
    2222     </pfx:button> 
    23      <pfx:button page="Info"> 
    24        <pfx:argument name="category">mountains</pfx:argument> 
     23     <pfx:button page="Info" altkey="mountains"> 
    2524       <pfx:image src="img/mountains/thumb.jpg" search="dynamic"/> 
    2625     </pfx:button> 
    2726     <pfx:button page="Info"> 
    28        <pfx:argument name="category">nationalparks</pfx:argument> 
     27       <pfx:altkey><ixsl:value-of select="'nationalparks'"/></pfx:altkey> 
    2928       <pfx:image src="img/nationalparks/thumb.jpg" search="dynamic"/> 
    3029     </pfx:button> 
    31        
     30 
    3231     </div> 
    3332       

  • trunk/pustefix-samples/pustefix-i18n/pustefix-i18n-tenant-us/src/main/resources/PUSTEFIX-INF/conf/project-fragment.xml

    r5841 r6054  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<fr:config-fragments xmlns:fr="http://www.pustefix-framework.org/2008/namespace/config-fragments" 
    3                      xmlns="http://www.pustefix-framework.org/2008/namespace/project-config"> 
     3                     xmlns="http://www.pustefix-framework.org/2008/namespace/project-config" 
     4                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     5                     xsi:schemaLocation="http://www.pustefix-framework.org/2008/namespace/config-fragments  
     6                                         http://www.pustefix-framework.org/2008/namespace/config-fragments-0_18.xsd"> 
    47 
    58  <fr:tenants>