conjugate 1.4.8 → 1.4.9

data/conjugate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'conjugate'
-  s.version     = '1.4.8'
+  s.version     = '1.4.9'
   s.date        = '2012-02-15'
   s.summary     = "Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates"
   s.description = s.summary

data/lib/conjugate/french_templates/irregular_verbs.rb

@@ -160,10 +160,12 @@ FrenchIrregularVerbs = {
   'peser' => :e_er,
 
   'promener' => :e_er,
+  
+  'acheter' => :e_er,
 
   'céder' => :é_er,
 
-  'célébrer' => :é_er,
+  'célébrer' => :é_é_er,
 
   'compléter' => :é_er,
 
@@ -187,13 +189,13 @@ FrenchIrregularVerbs = {
 
   'préférer' => :é_er,
 
-  'proteéger' => :é_er,
+  'proteéger' => :e_é_er,
 
-  'refléter' => :é_er,
+  'refléter' => :e_é_er,
 
-  'répéter' => :é_er,
+  'répéter' => :é_é_er,
 
-  'révéler' => :é_er,
+  'révéler' => :é_é_er,
 
   'suggérer' => :é_er,
 
@@ -201,13 +203,13 @@ FrenchIrregularVerbs = {
 
   'appeler' => :xx_er,
 
-  'épeler' => :xx_er,
+  'épeler' => :é_xx_er,
 
   'rappeler' => :xx_er,
 
-  'renouveler' => :xx_er,
+  'renouveler' => :e_xx_er,
 
-  'feuilleter' => :xx_er,
+  'feuilleter' => :e_xx_er,
 
   'hoqueter' => :xx_er,
 
@@ -215,7 +217,7 @@ FrenchIrregularVerbs = {
 
   'projeter' => :xx_er,
 
-  'rejeter' => :xx_er,
+  'rejeter' => :e_xx_er,
 
   'dormir' => :ir_s,
 

data/lib/conjugate/french_templates/templates.rb

@@ -1508,50 +1508,50 @@ FrenchTemplates = {
   },
 
   :e_er => {
-  	:infinitive => "{{{2}}}er", 
+  	:infinitive => "{{{1}}}e{{{2}}}er", 
   	:present => {
-  		:je => "{{{2}}}e",
-  		:tu => "{{{2}}}es",
-  		:il => "{{{2}}}e",
-  		:nous => "{{{2}}}ons",
-  		:vous => "{{{2}}}ez",
-  		:ils => "{{{2}}}ent"
+  		:je => "{{{1}}}è{{{2}}}e",
+  		:tu => "{{{1}}}è{{{2}}}es",
+  		:il => "{{{1}}}è{{{2}}}e",
+  		:nous => "{{{1}}}è{{{2}}}ons",
+  		:vous => "{{{1}}}è{{{2}}}ez",
+  		:ils => "{{{1}}}è{{{2}}}ent"
   	}, 
   	:imperfect => {
-  		:je => "{{{2}}}ais",
-  		:tu => "{{{2}}}ais",
-  		:il => "{{{2}}}ait",
-  		:nous => "{{{2}}}ions",
-  		:vous => "{{{2}}}iez",
-  		:ils => "{{{2}}}aient"
+  		:je => "{{{1}}}e{{{2}}}ais",
+  		:tu => "{{{1}}}e{{{2}}}ais",
+  		:il => "{{{1}}}e{{{2}}}ait",
+  		:nous => "{{{1}}}e{{{2}}}ions",
+  		:vous => "{{{1}}}e{{{2}}}iez",
+  		:ils => "{{{1}}}e{{{2}}}aient"
   	},
   	:past_historic => {
-  		:je => "{{{2}}}ai",
-  		:tu => "{{{2}}}as",
-  		:il => "{{{2}}}a",
-  		:nous => "{{{2}}}âmes",
-  		:vous => "{{{2}}}âtes",
-  		:ils => "{{{2}}}èrent"
+  		:je => "{{{1}}}è{{{2}}}ai",
+  		:tu => "{{{1}}}è{{{2}}}as",
+  		:il => "{{{1}}}è{{{2}}}a",
+  		:nous => "{{{1}}}è{{{2}}}âmes",
+  		:vous => "{{{1}}}è{{{2}}}âtes",
+  		:ils => "{{{1}}}è{{{2}}}èrent"
   	},
   	:future => {
-  		:je => "{{{2}}}erai",
-  		:tu => "{{{2}}}eras",
-  		:il => "{{{2}}}era",
-  		:nous => "{{{2}}}erons",
-  		:vous => "{{{2}}}erez",
-  		:ils => "{{{2}}}eront"
+  		:je => "{{{1}}}è{{{2}}}erai",
+  		:tu => "{{{1}}}è{{{2}}}eras",
+  		:il => "{{{1}}}è{{{2}}}era",
+  		:nous => "{{{1}}}è{{{2}}}erons",
+  		:vous => "{{{1}}}è{{{2}}}erez",
+  		:ils => "{{{1}}}è{{{2}}}eront"
   	},
   	:conditional => {
-  		:je => "{{{2}}}erais",
-  		:tu => "{{{2}}}erais",
-  		:il => "{{{2}}}erait",
-  		:nous => "{{{2}}}erions",
-  		:vous => "{{{2}}}eriez",
-  		:ils => "{{{2}}}eraient"
+  		:je => "{{{1}}}è{{{2}}}erais",
+  		:tu => "{{{1}}}è{{{2}}}erais",
+  		:il => "{{{1}}}è{{{2}}}erait",
+  		:nous => "{{{1}}}è{{{2}}}erions",
+  		:vous => "{{{1}}}è{{{2}}}eriez",
+  		:ils => "{{{1}}}è{{{2}}}eraient"
   	},
   	
-  	:present_participle => "{{{2}}}ant",
-    :past_participle => "{{{2}}}é"
+  	:present_participle => "{{{1}}}e{{{2}}}ant",
+    :past_participle => "{{{1}}}e{{{2}}}é"
   },
 
   :éclore => {
@@ -1602,50 +1602,144 @@ FrenchTemplates = {
   },
 
   :é_er => {
-  	:infinitive => "{{{2}}}er", 
+  	:infinitive => "{{{1}}}é{{{2}}}er", 
   	:present => {
-  		:je => "{{{2}}}e",
-  		:tu => "{{{2}}}es",
-  		:il => "{{{2}}}e",
-  		:nous => "{{{2}}}ons",
-  		:vous => "{{{2}}}ez",
-  		:ils => "{{{2}}}ent"
+  		:je => "{{{1}}}è{{{2}}}e",
+  		:tu => "{{{1}}}è{{{2}}}es",
+  		:il => "{{{1}}}è{{{2}}}e",
+  		:nous => "{{{1}}}è{{{2}}}ons",
+  		:vous => "{{{1}}}è{{{2}}}ez",
+  		:ils => "{{{1}}}è{{{2}}}ent"
   	}, 
   	:imperfect => {
-  		:je => "{{{2}}}ais",
-  		:tu => "{{{2}}}ais",
-  		:il => "{{{2}}}ait",
-  		:nous => "{{{2}}}ions",
-  		:vous => "{{{2}}}iez",
-  		:ils => "{{{2}}}aient"
+  		:je => "{{{1}}}é{{{2}}}ais",
+  		:tu => "{{{1}}}é{{{2}}}ais",
+  		:il => "{{{1}}}é{{{2}}}ait",
+  		:nous => "{{{1}}}é{{{2}}}ions",
+  		:vous => "{{{1}}}é{{{2}}}iez",
+  		:ils => "{{{1}}}é{{{2}}}aient"
   	},
   	:past_historic => {
-  		:je => "{{{2}}}ai",
-  		:tu => "{{{2}}}as",
-  		:il => "{{{2}}}a",
-  		:nous => "{{{2}}}âmes",
-  		:vous => "{{{2}}}âtes",
-  		:ils => "{{{2}}}èrent"
+  		:je => "{{{1}}}é{{{2}}}ai",
+  		:tu => "{{{1}}}é{{{2}}}as",
+  		:il => "{{{1}}}é{{{2}}}a",
+  		:nous => "{{{1}}}é{{{2}}}âmes",
+  		:vous => "{{{1}}}é{{{2}}}âtes",
+  		:ils => "{{{1}}}é{{{2}}}èrent"
   	},
   	:future => {
-  		:je => "{{{2}}}erai",
-  		:tu => "{{{2}}}eras",
-  		:il => "{{{2}}}era",
-  		:nous => "{{{2}}}erons",
-  		:vous => "{{{2}}}erez",
-  		:ils => "{{{2}}}eront"
+  		:je => "{{{1}}}é{{{2}}}erai",
+  		:tu => "{{{1}}}é{{{2}}}eras",
+  		:il => "{{{1}}}é{{{2}}}era",
+  		:nous => "{{{1}}}é{{{2}}}erons",
+  		:vous => "{{{1}}}é{{{2}}}erez",
+  		:ils => "{{{1}}}é{{{2}}}eront"
   	},
   	:conditional => {
-  		:je => "{{{2}}}erais",
-  		:tu => "{{{2}}}erais",
-  		:il => "{{{2}}}erait",
-  		:nous => "{{{2}}}erions",
-  		:vous => "{{{2}}}eriez",
-  		:ils => "{{{2}}}eraient"
+  		:je => "{{{1}}}é{{{2}}}erais",
+  		:tu => "{{{1}}}é{{{2}}}erais",
+  		:il => "{{{1}}}é{{{2}}}erait",
+  		:nous => "{{{1}}}é{{{2}}}erions",
+  		:vous => "{{{1}}}é{{{2}}}eriez",
+  		:ils => "{{{1}}}é{{{2}}}eraient"
   	},
   	
-  	:present_participle => "{{{2}}}ant",
-    :past_participle => "{{{2}}}é"
+  	:present_participle => "{{{1}}}é{{{2}}}ant",
+    :past_participle => "{{{1}}}é{{{2}}}é"
+  },
+  
+  :e_é_er => {
+  	:infinitive => "{{{1}}}e{{{2}}}é{{{3}}}er", 
+  	:present => {
+  		:je => "{{{1}}}e{{{2}}}è{{{3}}}e",
+  		:tu => "{{{1}}}e{{{2}}}è{{{3}}}es",
+  		:il => "{{{1}}}e{{{2}}}è{{{3}}}e",
+  		:nous => "{{{1}}}e{{{2}}}è{{{3}}}ons",
+  		:vous => "{{{1}}}e{{{2}}}è{{{3}}}ez",
+  		:ils => "{{{1}}}e{{{2}}}è{{{3}}}ent"
+  	}, 
+  	:imperfect => {
+  		:je => "{{{1}}}e{{{2}}}é{{{3}}}ais",
+  		:tu => "{{{1}}}e{{{2}}}é{{{3}}}ais",
+  		:il => "{{{1}}}e{{{2}}}é{{{3}}}ait",
+  		:nous => "{{{1}}}e{{{2}}}é{{{3}}}ions",
+  		:vous => "{{{1}}}e{{{2}}}é{{{3}}}iez",
+  		:ils => "{{{1}}}e{{{2}}}é{{{3}}}aient"
+  	},
+  	:past_historic => {
+  		:je => "{{{1}}}e{{{2}}}é{{{3}}}ai",
+  		:tu => "{{{1}}}e{{{2}}}é{{{3}}}as",
+  		:il => "{{{1}}}e{{{2}}}é{{{3}}}a",
+  		:nous => "{{{1}}}e{{{2}}}é{{{3}}}âmes",
+  		:vous => "{{{1}}}e{{{2}}}é{{{3}}}âtes",
+  		:ils => "{{{1}}}e{{{2}}}é{{{3}}}èrent"
+  	},
+  	:future => {
+  		:je => "{{{1}}}e{{{2}}}é{{{3}}}erai",
+  		:tu => "{{{1}}}e{{{2}}}é{{{3}}}eras",
+  		:il => "{{{1}}}e{{{2}}}é{{{3}}}era",
+  		:nous => "{{{1}}}e{{{2}}}é{{{3}}}erons",
+  		:vous => "{{{1}}}e{{{2}}}é{{{3}}}erez",
+  		:ils => "{{{1}}}e{{{2}}}é{{{3}}}eront"
+  	},
+  	:conditional => {
+  		:je => "{{{1}}}e{{{2}}}é{{{3}}}erais",
+  		:tu => "{{{1}}}e{{{2}}}é{{{3}}}erais",
+  		:il => "{{{1}}}e{{{2}}}é{{{3}}}erait",
+  		:nous => "{{{1}}}e{{{2}}}é{{{3}}}erions",
+  		:vous => "{{{1}}}e{{{2}}}é{{{3}}}eriez",
+  		:ils => "{{{1}}}e{{{2}}}é{{{3}}}eraient"
+  	},
+  	
+  	:present_participle => "{{{1}}}e{{{2}}}é{{{3}}}ant",
+    :past_participle => "{{{1}}}e{{{2}}}é{{{3}}}é"
+  },
+  
+  :é_é_er => {
+  	:infinitive => "{{{1}}}é{{{2}}}é{{{3}}}er", 
+  	:present => {
+  		:je => "{{{1}}}é{{{2}}}è{{{3}}}e",
+  		:tu => "{{{1}}}é{{{2}}}è{{{3}}}es",
+  		:il => "{{{1}}}é{{{2}}}è{{{3}}}e",
+  		:nous => "{{{1}}}é{{{2}}}è{{{3}}}ons",
+  		:vous => "{{{1}}}é{{{2}}}è{{{3}}}ez",
+  		:ils => "{{{1}}}é{{{2}}}è{{{3}}}ent"
+  	}, 
+  	:imperfect => {
+  		:je => "{{{1}}}é{{{2}}}é{{{3}}}ais",
+  		:tu => "{{{1}}}é{{{2}}}é{{{3}}}ais",
+  		:il => "{{{1}}}é{{{2}}}é{{{3}}}ait",
+  		:nous => "{{{1}}}é{{{2}}}é{{{3}}}ions",
+  		:vous => "{{{1}}}é{{{2}}}é{{{3}}}iez",
+  		:ils => "{{{1}}}é{{{2}}}é{{{3}}}aient"
+  	},
+  	:past_historic => {
+  		:je => "{{{1}}}é{{{2}}}é{{{3}}}ai",
+  		:tu => "{{{1}}}é{{{2}}}é{{{3}}}as",
+  		:il => "{{{1}}}é{{{2}}}é{{{3}}}a",
+  		:nous => "{{{1}}}é{{{2}}}é{{{3}}}âmes",
+  		:vous => "{{{1}}}é{{{2}}}é{{{3}}}âtes",
+  		:ils => "{{{1}}}é{{{2}}}é{{{3}}}èrent"
+  	},
+  	:future => {
+  		:je => "{{{1}}}é{{{2}}}é{{{3}}}erai",
+  		:tu => "{{{1}}}é{{{2}}}é{{{3}}}eras",
+  		:il => "{{{1}}}é{{{2}}}é{{{3}}}era",
+  		:nous => "{{{1}}}é{{{2}}}é{{{3}}}erons",
+  		:vous => "{{{1}}}é{{{2}}}é{{{3}}}erez",
+  		:ils => "{{{1}}}é{{{2}}}é{{{3}}}eront"
+  	},
+  	:conditional => {
+  		:je => "{{{1}}}é{{{2}}}é{{{3}}}erais",
+  		:tu => "{{{1}}}é{{{2}}}é{{{3}}}erais",
+  		:il => "{{{1}}}é{{{2}}}é{{{3}}}erait",
+  		:nous => "{{{1}}}é{{{2}}}é{{{3}}}erions",
+  		:vous => "{{{1}}}é{{{2}}}é{{{3}}}eriez",
+  		:ils => "{{{1}}}é{{{2}}}é{{{3}}}eraient"
+  	},
+  	
+  	:present_participle => "{{{1}}}é{{{2}}}é{{{3}}}ant",
+    :past_participle => "{{{1}}}é{{{2}}}é{{{3}}}é"
   },
 
   :ecer => {
@@ -1978,50 +2072,145 @@ FrenchTemplates = {
   },
 
   :xx_er => {
-  	:infinitive => "{{{2}}}er", 
+  	:infinitive => "{{{1}}}e{{{2}}}er", 
+  	:present => {
+  		:je => "{{{1}}}e{{{2}}}{{{2}}}e",
+  		:tu => "{{{1}}}e{{{2}}}{{{2}}}es",
+  		:il => "{{{1}}}e{{{2}}}{{{2}}}e",
+  		:nous => "{{{1}}}e{{{2}}}{{{2}}}ons",
+  		:vous => "{{{1}}}e{{{2}}}{{{2}}}ez",
+  		:ils => "{{{1}}}e{{{2}}}{{{2}}}ent"
+  	}, 
+  	:imperfect => {
+  		:je => "{{{1}}}e{{{2}}}ais",
+  		:tu => "{{{1}}}e{{{2}}}ais",
+  		:il => "{{{1}}}e{{{2}}}ait",
+  		:nous => "{{{1}}}e{{{2}}}ions",
+  		:vous => "{{{1}}}e{{{2}}}iez",
+  		:ils => "{{{1}}}e{{{2}}}aient"
+  	},
+  	:past_historic => {
+  		:je => "{{{1}}}e{{{2}}}ai",
+  		:tu => "{{{1}}}e{{{2}}}as",
+  		:il => "{{{1}}}e{{{2}}}a",
+  		:nous => "{{{1}}}e{{{2}}}âmes",
+  		:vous => "{{{1}}}e{{{2}}}âtes",
+  		:ils => "{{{1}}}e{{{2}}}èrent"
+  	},
+  	:future => {
+  		:je => "{{{1}}}e{{{2}}}{{{2}}}erai",
+  		:tu => "{{{1}}}e{{{2}}}{{{2}}}eras",
+  		:il => "{{{1}}}e{{{2}}}{{{2}}}era",
+  		:nous => "{{{1}}}e{{{2}}}{{{2}}}erons",
+  		:vous => "{{{1}}}e{{{2}}}{{{2}}}erez",
+  		:ils => "{{{1}}}e{{{2}}}{{{2}}}eront"
+  	},
+  	:conditional => {
+  		:je => "{{{1}}}e{{{2}}}{{{2}}}erais",
+  		:tu => "{{{1}}}e{{{2}}}{{{2}}}erais",
+  		:il => "{{{1}}}e{{{2}}}{{{2}}}erait",
+  		:nous => "{{{1}}}e{{{2}}}{{{2}}}erions",
+  		:vous => "{{{1}}}e{{{2}}}{{{2}}}eriez",
+  		:ils => "{{{1}}}e{{{2}}}{{{2}}}eraient"
+  	},
+  	
+  	:present_participle => "{{{1}}}e{{{2}}}ant",
+    :past_participle => "{{{1}}}e{{{2}}}é"
+  },
+  
+  :e_xx_er => {
+  	:infinitive => "{{{1}}}e{{{2}}}e{{{3}}}er", 
+  	:present => {
+  		:je => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}e",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}es",
+  		:il => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}e",
+  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}ons",
+  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}ez",
+  		:ils => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}ent"
+  	}, 
+  	:imperfect => {
+  		:je => "{{{1}}}e{{{2}}}e{{{3}}}ais",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}ais",
+  		:il => "{{{1}}}e{{{2}}}e{{{3}}}ait",
+  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}ions",
+  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}iez",
+  		:ils => "{{{1}}}e{{{2}}}e{{{3}}}aient"
+  	},
+  	:past_historic => {
+  		:je => "{{{1}}}e{{{2}}}e{{{3}}}ai",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}as",
+  		:il => "{{{1}}}e{{{2}}}e{{{3}}}a",
+  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}âmes",
+  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}âtes",
+  		:ils => "{{{1}}}e{{{2}}}e{{{3}}}èrent"
+  	},
+  	:future => {
+  		:je => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erai",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}eras",
+  		:il => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}era",
+  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erons",
+  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erez",
+  		:ils => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}eront"
+  	},
+  	:conditional => {
+  		:je => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erais",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erais",
+  		:il => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erait",
+  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erions",
+  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}eriez",
+  		:ils => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}eraient"
+  	},
+  	
+  	:present_participle => "{{{1}}}e{{{2}}}e{{{3}}}ant",
+    :past_participle => "{{{1}}}e{{{2}}}e{{{3}}}é"
+  },
+  
+  
+  :é_xx_er => {
+  	:infinitive => "{{{1}}}é{{{2}}}e{{{3}}}er", 
   	:present => {
-  		:je => "{{{2}}}e",
-  		:tu => "{{{2}}}es",
-  		:il => "{{{2}}}e",
-  		:nous => "{{{2}}}ons",
-  		:vous => "{{{2}}}ez",
-  		:ils => "{{{2}}}ent"
+  		:je => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}e",
+  		:tu => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}es",
+  		:il => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}e",
+  		:nous => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}ons",
+  		:vous => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}ez",
+  		:ils => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}ent"
   	}, 
   	:imperfect => {
-  		:je => "{{{2}}}ais",
-  		:tu => "{{{2}}}ais",
-  		:il => "{{{2}}}ait",
-  		:nous => "{{{2}}}ions",
-  		:vous => "{{{2}}}iez",
-  		:ils => "{{{2}}}aient"
+  		:je => "{{{1}}}é{{{2}}}e{{{3}}}ais",
+  		:tu => "{{{1}}}é{{{2}}}e{{{3}}}ais",
+  		:il => "{{{1}}}é{{{2}}}e{{{3}}}ait",
+  		:nous => "{{{1}}}é{{{2}}}e{{{3}}}ions",
+  		:vous => "{{{1}}}é{{{2}}}e{{{3}}}iez",
+  		:ils => "{{{1}}}é{{{2}}}e{{{3}}}aient"
   	},
   	:past_historic => {
-  		:je => "{{{2}}}ai",
-  		:tu => "{{{2}}}as",
-  		:il => "{{{2}}}a",
-  		:nous => "{{{2}}}âmes",
-  		:vous => "{{{2}}}âtes",
-  		:ils => "{{{2}}}èrent"
+  		:je => "{{{1}}}é{{{2}}}e{{{3}}}ai",
+  		:tu => "{{{1}}}é{{{2}}}e{{{3}}}as",
+  		:il => "{{{1}}}é{{{2}}}e{{{3}}}a",
+  		:nous => "{{{1}}}é{{{2}}}e{{{3}}}âmes",
+  		:vous => "{{{1}}}é{{{2}}}e{{{3}}}âtes",
+  		:ils => "{{{1}}}é{{{2}}}e{{{3}}}èrent"
   	},
   	:future => {
-  		:je => "{{{2}}}erai",
-  		:tu => "{{{2}}}eras",
-  		:il => "{{{2}}}era",
-  		:nous => "{{{2}}}erons",
-  		:vous => "{{{2}}}erez",
-  		:ils => "{{{2}}}eront"
+  		:je => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}erai",
+  		:tu => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}eras",
+  		:il => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}era",
+  		:nous => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}erons",
+  		:vous => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}erez",
+  		:ils => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}eront"
   	},
   	:conditional => {
-  		:je => "{{{2}}}erais",
-  		:tu => "{{{2}}}erais",
-  		:il => "{{{2}}}erait",
-  		:nous => "{{{2}}}erions",
-  		:vous => "{{{2}}}eriez",
-  		:ils => "{{{2}}}eraient"
+  		:je => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}erais",
+  		:tu => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}erais",
+  		:il => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}erait",
+  		:nous => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}erions",
+  		:vous => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}eriez",
+  		:ils => "{{{1}}}é{{{2}}}e{{{3}}}{{{3}}}eraient"
   	},
   	
-  	:present_participle => "{{{2}}}ant",
-    :past_participle => "{{{2}}}é"
+  	:present_participle => "{{{1}}}é{{{2}}}e{{{3}}}ant",
+    :past_participle => "{{{1}}}é{{{2}}}e{{{3}}}é"
   },
 
   :faillir => {
@@ -2683,50 +2872,50 @@ FrenchTemplates = {
   },
 
   :ir_s => {
-  	:infinitive => "{{{2}}}ir", 
+  	:infinitive => "{{{1}}}ir", 
   	:present => {
   		:je => "{{{1}}}s",
   		:tu => "{{{1}}}s",
   		:il => "{{{1}}}t",
-  		:nous => "{{{2}}}ons",
-  		:vous => "{{{2}}}ez",
-  		:ils => "{{{2}}}ent"
+  		:nous => "{{{1}}}ons",
+  		:vous => "{{{1}}}ez",
+  		:ils => "{{{1}}}ent"
   	}, 
   	:imperfect => {
-  		:je => "{{{2}}}ais",
-  		:tu => "{{{2}}}ais",
-  		:il => "{{{2}}}ait",
-  		:nous => "{{{2}}}ions",
-  		:vous => "{{{2}}}iez",
-  		:ils => "{{{2}}}aient"
+  		:je => "{{{1}}}ais",
+  		:tu => "{{{1}}}ais",
+  		:il => "{{{1}}}ait",
+  		:nous => "{{{1}}}ions",
+  		:vous => "{{{1}}}iez",
+  		:ils => "{{{1}}}aient"
   	},
   	:past_historic => {
-  		:je => "{{{2}}}is",
-  		:tu => "{{{2}}}is",
-  		:il => "{{{2}}}it",
-  		:nous => "{{{2}}}îmes",
-  		:vous => "{{{2}}}îtes",
-  		:ils => "{{{2}}}irent"
+  		:je => "{{{1}}}is",
+  		:tu => "{{{1}}}is",
+  		:il => "{{{1}}}it",
+  		:nous => "{{{1}}}îmes",
+  		:vous => "{{{1}}}îtes",
+  		:ils => "{{{1}}}irent"
   	},
   	:future => {
-  		:je => "{{{2}}}irai",
-  		:tu => "{{{2}}}iras",
-  		:il => "{{{2}}}ira",
-  		:nous => "{{{2}}}irons",
-  		:vous => "{{{2}}}irez",
-  		:ils => "{{{2}}}iront"
+  		:je => "{{{1}}}irai",
+  		:tu => "{{{1}}}iras",
+  		:il => "{{{1}}}ira",
+  		:nous => "{{{1}}}irons",
+  		:vous => "{{{1}}}irez",
+  		:ils => "{{{1}}}iront"
   	},
   	:conditional => {
-  		:je => "{{{2}}}irais",
-  		:tu => "{{{2}}}irais",
-  		:il => "{{{2}}}irait",
-  		:nous => "{{{2}}}irions",
-  		:vous => "{{{2}}}iriez",
-  		:ils => "{{{2}}}iraient"
+  		:je => "{{{1}}}irais",
+  		:tu => "{{{1}}}irais",
+  		:il => "{{{1}}}irait",
+  		:nous => "{{{1}}}irions",
+  		:vous => "{{{1}}}iriez",
+  		:ils => "{{{1}}}iraient"
   	},
   	
-  	:present_participle => "{{{2}}}ant",
-    :past_participle => "{{{2}}}i"
+  	:present_participle => "{{{1}}}ant",
+    :past_participle => "{{{1}}}i"
   },
 
   :lire => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjugate
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000Z
+date: 2012-02-15 00:00:00.000000000 Z
 dependencies: []
 description: Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates
 email: jeremy@govocab.com
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates