Merge updates: education.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/modules/fusionax/formation.pl b/modules/fusionax/formation.pl
index 46e3404..e3a23c8 100755 (executable)
--- a/modules/fusionax/formation.pl
+++ b/modules/fusionax/formation.pl
@@ -865,16 +865,16 @@ while (<FILE>)
   s/\t\t\tMS Columbia$/\tColumbia University\tMSc\t/;
   s/\t\t\tMSEE Columbia Univ$/\tColumbia University\tM\tMSEE/;
   s/\t\t\tMBA Univ Columbia$/\tColumbia University\tMBA\t/;
-  s/\t\t\tColumbia Business School - Senior Executive Program$/\tolumbia\tMBA\tSenior Executive Program/;
+  s/\t\t\tColumbia Business School - Senior Executive Program$/\tColumbia University\tMBA\tSenior Executive Program/;
   s/\t\t\tMFSE Columbia Univ$/\tColumbia University\tM\tMFSE/;
   s/\t\t\tMSc Univ Columbia$/\tColumbia University\tMSc\t/;
-  s/\t\t\tMS Columbia New-York$/\tColumbia\tMSc\t/;
+  s/\t\t\tMS Columbia New-York$/\tColumbia University\tMSc\t/;
   s/\t\t\tPhD Columbia$/\tColumbia University\tPhD\t/;
   s/\t\t\tMS Univ British Columbia$/\tUBC\tMSc\t/;
   s/\t\t\tMSc Univ British Columbia$/\tUBC\tMSc\t/;
-  s/\t\t\tMIA Columbia$/\tColumbia\tMIA\t/;
-  s/\t\t\tMIA Columbia University$/\tColumbia\tMIA\t/;
-  s/\t\t\tMIA Columbia Univ$/\tColumbia\tMIA\t/;
+  s/\t\t\tMIA Columbia$/\tColumbia University\tMIA\t/;
+  s/\t\t\tMIA Columbia University$/\tColumbia University\tMIA\t/;
+  s/\t\t\tMIA Columbia Univ$/\tColumbia University\tMIA\t/;
   s/\t\t\tMBA Chicago$/\tUniversity of Chicago\tMBA\t/;
   s/\t\t\tMsChicago$/\tUniversity of Chicago\tMSc\t/;
   s/\t\t\tMSc Univ Chicago$/\tUniversity of Chicago\tMSc\t/;

diff --git a/templates/fusionax/education.tpl b/templates/fusionax/education.tpl
index c2a27c9..c12e70d 100644 (file)
--- a/templates/fusionax/education.tpl
+++ b/templates/fusionax/education.tpl
@@ -27,7 +27,7 @@
   notre base{if $missingEducationCount eq 0}.</p>{else}&nbsp;:
 </p>
 <ul>
-  {iterate from=$missingEducation item=education}<li>{$education.Intitule_diplome}</li>{/iterate}
+  {iterate from=$missingEducation item=education}<li>{$education.Intitule_formation}</li>{/iterate}
 </ul>{/if}
 
 <p>
@@ -35,7 +35,7 @@
   notre base{if $missingDegreeCount eq 0}.</p>{else}&nbsp;:
 </p>
 <ul>
-  {iterate from=$missingDegree item=degree}<li>{$degree.Intitule_formation}</li>{/iterate}
+  {iterate from=$missingDegree item=degree}<li>{$degree.Intitule_diplome}</li>{/iterate}
 </ul>{/if}
 
 <p>