# HG changeset patch
# User hurons@caf4f556-3d62-0410-8435-a86758001935
# Date 1274111713 0
# Node ID 632ee16f1e91d75d1bc74bd78e9107a6d1645d69
# Parent  d3ee643d6ac523646141e3dd7610f5e3917cd970
- flag
- new traduction
- debug ical home
- ...

diff -r d3ee643d6ac5 -r 632ee16f1e91 web/version.php
--- a/web/version.php	Mon May 17 12:16:52 2010 +0000
+++ b/web/version.php	Mon May 17 15:55:13 2010 +0000
@@ -1,3 +1,4 @@
 <?php
-	$version="01.10";
+	$version="01.11";
+	
 ?>
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/header.php
--- a/web/wp-content/themes/IRI-Theme/header.php	Mon May 17 12:16:52 2010 +0000
+++ b/web/wp-content/themes/IRI-Theme/header.php	Mon May 17 15:55:13 2010 +0000
@@ -138,17 +138,23 @@
   <div class="column" id="header">
 	<div class="column">
        <a href="<?php echo (get_option('home').$LANG_LINK); ?>/" class="logo">
-		<img alt="<?php bloginfo('name'); ?>" src="<?php bloginfo('stylesheet_directory'); ?>/images/logo-iri-petit.png" />
+		<img alt="<?php bloginfo('name'); ?>" src="<?php bloginfo('stylesheet_directory'); ?>/images/logo-iri-petit_<?php echo($current_lang['lang']); ?>.png" />
 	   </a> 
-	</div>   
+	</div> 
+
+	<!-- LANG MENU -->
 	  <div class="column lang">
 		<ul>
-		<?php if (function_exists('xili_language_list')) {//&& is_user_logged_in()
+			<li style="list-style: none;"><a href='http://www.iri.centrepompidou.fr/dev/~hurons/iri.centrepompidou.fr/?lang=en_us' title='View the english web site.'><img src="<?php bloginfo('stylesheet_directory'); ?>/images/flag_en_<?php echo($current_lang['lang']); ?>.gif" title="flag" /> &nbsp;in english</a></li>
+			<li style="list-style: none;"><a href='http://www.iri.centrepompidou.fr/dev/~hurons/iri.centrepompidou.fr/?lang=fr_fr' title='Voir le site en Fran&ccedil;ais.'><img src="<?php bloginfo('stylesheet_directory'); ?>/images/flag_fr_<?php echo($current_lang['lang']); ?>.gif" title="drapeau"/> &nbsp;en fran&ccedil;ais</a></li>
+		</ul>
+		<?php /* script de liste de langue remplacer par ce qui est au dessus 
+		 if (function_exists('xili_language_list')) {//&& is_user_logged_in()
 			xili_language_list();
-		} ?>
-		</ul>
+		}*/ ?>
 	  </div>
 	
+	
   </div>
   
 <!-- Navigation -->
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/home.php
--- a/web/wp-content/themes/IRI-Theme/home.php	Mon May 17 12:16:52 2010 +0000
+++ b/web/wp-content/themes/IRI-Theme/home.php	Mon May 17 15:55:13 2010 +0000
@@ -60,9 +60,10 @@
 	  // It's hard to guess on other platforms, so stick to http://
 	  if(strstr($_SERVER['HTTP_USER_AGENT'],'Mac OS X'))
 		  $webcal = preg_replace('/^http:/','webcal:',$webcal);
-	  echo "\t    <a id='ec3_publish' href='$webcal'"
-		 . " title='".__('Cliquer ici pour vous abonner au Icalendar de l&quot;Institut de recherche et d&quot;innovation.','IriTheme').">\n"
-		 . "\t     <img src='".get_option('home')."/wp-content/plugins/event-calendar/publish.gif' alt='iCalendar' />\n"
+		  $homeURL = get_option('home');
+		//echo($homeURL);  
+	  echo "\t    <a id='ec3_publish' href='$webcal' title='".__('Click here to subscribe our Icalendar feed (in french only).','IriTheme')."' >\n"
+		 . "\t     <img src='$homeURL/wp-content/plugins/event-calendar/publish.gif' alt='iCalendar' >\n"
 		 . "\t    </a>\n";
 	?>
 
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/images/Thumbs.db
Binary file web/wp-content/themes/IRI-Theme/images/Thumbs.db has changed
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/images/flag_en_en_us.gif
Binary file web/wp-content/themes/IRI-Theme/images/flag_en_en_us.gif has changed
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/images/flag_en_fr_fr.gif
Binary file web/wp-content/themes/IRI-Theme/images/flag_en_fr_fr.gif has changed
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/images/flag_fr_fr_fr.gif
Binary file web/wp-content/themes/IRI-Theme/images/flag_fr_fr_fr.gif has changed
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/images/icons/Thumbs.db
Binary file web/wp-content/themes/IRI-Theme/images/icons/Thumbs.db has changed
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/images/logo-iri-petit_fr_fr.png
Binary file web/wp-content/themes/IRI-Theme/images/logo-iri-petit_fr_fr.png has changed
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/images/partenaires/Thumbs.db
Binary file web/wp-content/themes/IRI-Theme/images/partenaires/Thumbs.db has changed
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/language/fr_FR.mo
Binary file web/wp-content/themes/IRI-Theme/language/fr_FR.mo has changed
diff -r d3ee643d6ac5 -r 632ee16f1e91 web/wp-content/themes/IRI-Theme/language/fr_FR.po
--- a/web/wp-content/themes/IRI-Theme/language/fr_FR.po	Mon May 17 12:16:52 2010 +0000
+++ b/web/wp-content/themes/IRI-Theme/language/fr_FR.po	Mon May 17 15:55:13 2010 +0000
@@ -3,7 +3,7 @@
 "Project-Id-Version: WordPress 2.9.1 IriTheme\n"
 "Report-Msgid-Bugs-To: samuel.huron@centrepompidou.fr\n"
 "POT-Creation-Date: 2010-03-14 04:57+0000\n"
-"PO-Revision-Date: 2010-05-17 11:33+0100\n"
+"PO-Revision-Date: 2010-05-17 17:41+0100\n"
 "Last-Translator: Samuel Huron <cybunk.com>\n"
 "Language-Team: IRI\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,13 @@
 msgid "in english"
 msgstr "en anglais"
 
-msgid "in french"
+msgid "Link and external news"
+msgstr "Liens et actualités externes"
+
+msgid "Click here to subscribe our Icalendar feed (in french only)."
+msgstr "Cliquer ici pour vous abonner au Icalendar de l&quot;Institut de recherche et d&quot;innovation."
+
+msgid "en french"
 msgstr "en français"
 
 msgid "in "