From tchemit@users.nuiton.org Fri May 21 10:26:45 2010 From: tchemit@users.nuiton.org To: maven-nuiton-skin-commits@list.nuiton.org Subject: [Maven-nuiton-skin-commits] r598 - trunk/src/main/resources/META-INF/maven Date: Fri, 21 May 2010 10:26:45 +0200 Message-ID: <20100521082645.2900D15913@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1934302852200089603==" --===============1934302852200089603== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: tchemit Date: 2010-05-21 10:26:45 +0200 (Fri, 21 May 2010) New Revision: 598 Url: http://nuiton.org/repositories/revision/maven-nuiton-skin/598 Log: Evolution #629: Use maven site variable 'locales' instead of our 'siteLocales' Modified: trunk/src/main/resources/META-INF/maven/site.vm Modified: trunk/src/main/resources/META-INF/maven/site.vm =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/main/resources/META-INF/maven/site.vm 2010-05-09 12:34:20 UTC (= rev 597) +++ trunk/src/main/resources/META-INF/maven/site.vm 2010-05-21 08:26:45 UTC (= rev 598) @@ -1,6 +1,6 @@ =20 -## set in gloabal variable firstLocale the first (says main) locale of site +## set in global variable firstLocale the first (says main) locale of site #macro ( computeDefaultLocale $locales ) #set ( $myindex =3D $locales.trim().indexOf(",") ) #if ( $myindex =3D=3D -1 ) @@ -52,7 +52,7 @@ #end =20 #macro ( links $links ) - #computeDefaultLocale( $siteLocales ) + #computeDefaultLocale( $locales ) #set ( $sitemapUrl =3D $PathTool.calculateLink( "./sitemap.html", $relativ= ePath ) ) #set ( $sitemapUrl =3D $sitemapUrl.replaceAll( "\\", "/" ) ) #set ( $sitemapLabel =3D $i18n.getString( "maven-nuiton-skin", $locale, "g= oto.sitemap" ) ) @@ -71,7 +71,6 @@ ## | ##end #end - ## #computeDefaultLocale( $siteLocales ) #if ( "$scmwebeditorEnabled" !=3D "false" ) | #link ( "$project.properties.scmwebeditorUrl?adresse=3D$project.scm.de= veloperConnection&file_name=3D$alignedFileName&project_url=3D$project= .url/$locale/$alignedFileName&lang=3D$locale&defaultLang=3D$firstLoca= le&format=3D$project.properties.siteSourcesType" , $i18n.getString( "mave= n-nuiton-skin", $locale, "edit.scm.page" ) ) @@ -159,7 +158,7 @@ =20 #macro ( mainMenu $menus ) #if ( "$scmwebeditorEnabled" !=3D "false" ) - #computeDefaultLocale( $siteLocales ) + #computeDefaultLocale( $locales ) #set ($xmlExtention =3D ".xml") #link ( "$project.properties.scmwebeditorUrl?adresse=3D$project.scm.deve= loperConnection&file_name=3Dsite_$locale$xmlExtention&project_url=3D$= project.url/$locale/$alignedFileName&lang=3D$locale&defaultLang=3D$lo= cale", $i18n.getString( "maven-nuiton-skin", $locale, "edit.scm.menu" ) ) #end --===============1934302852200089603==--