Index: gc_lang/fr/modules-js/gce_suggestions.js ================================================================== --- gc_lang/fr/modules-js/gce_suggestions.js +++ gc_lang/fr/modules-js/gce_suggestions.js @@ -180,13 +180,12 @@ return gc_engine.oSpellChecker.getLemma(sFlex).filter(sStem => conj.isVerb(sStem)).join("|"); } const _dQuiEst = new Map ([ - ["je", ":1s"], ["j’", ":1s"], ["j’en", ":1s"], ["j’y", ":1s"], - ["tu", ":2s"], ["il", ":3s"], ["on", ":3s"], ["elle", ":3s"], - ["nous", ":1p"], ["vous", ":2p"], ["ils", ":3p"], ["elles", ":3p"] + ["je", ":1s"], ["j’", ":1s"], ["tu", ":2s"], ["il", ":3s"], ["on", ":3s"], ["elle", ":3s"], ["iel", ":3s"], + ["nous", ":1p"], ["vous", ":2p"], ["ils", ":3p"], ["elles", ":3p"], ["iels", ":3p"] ]); const _lIndicatif = [":Ip", ":Iq", ":Is", ":If"]; const _lSubjonctif = [":Sp", ":Sq"]; function suggVerbMode (sFlex, cMode, sSuj) { @@ -198,17 +197,11 @@ } else if (cMode.startsWith(":I") || cMode.startsWith(":S")) { lMode = [cMode]; } else { return ""; } - let sWho = _dQuiEst.gl_get(sSuj.toLowerCase(), null); - if (!sWho) { - if (sSuj[0].gl_isLowerCase()) { // pas un pronom, ni un nom propre - return ""; - } - sWho = ":3s"; - } + let sWho = _dQuiEst.gl_get(sSuj.toLowerCase(), ":3s"); let aSugg = new Set(); for (let sStem of gc_engine.oSpellChecker.getLemma(sFlex)) { let tTags = conj._getTags(sStem); if (tTags) { for (let sTense of lMode) { Index: gc_lang/fr/modules/gce_suggestions.py ================================================================== --- gc_lang/fr/modules/gce_suggestions.py +++ gc_lang/fr/modules/gce_suggestions.py @@ -136,12 +136,12 @@ def suggVerbInfi (sFlex): "returns infinitive forms of " return "|".join([ sStem for sStem in _oSpellChecker.getLemma(sFlex) if conj.isVerb(sStem) ]) -_dQuiEst = { "je": ":1s", "j’": ":1s", "j’en": ":1s", "j’y": ":1s", \ - "tu": ":2s", "il": ":3s", "on": ":3s", "elle": ":3s", "nous": ":1p", "vous": ":2p", "ils": ":3p", "elles": ":3p" } +_dQuiEst = { "je": ":1s", "j’": ":1s", "tu": ":2s", "il": ":3s", "on": ":3s", "elle": ":3s", "iel": ":3s", \ + "nous": ":1p", "vous": ":2p", "ils": ":3p", "elles": ":3p", "iels": ":3p" } _lIndicatif = [":Ip", ":Iq", ":Is", ":If"] _lSubjonctif = [":Sp", ":Sq"] def suggVerbMode (sFlex, cMode, sSuj): "returns other conjugations of acconding to and " @@ -151,15 +151,11 @@ lMode = _lSubjonctif elif cMode.startswith((":I", ":S")): lMode = [cMode] else: return "" - sWho = _dQuiEst.get(sSuj.lower(), None) - if not sWho: - if sSuj[0:1].islower(): # pas un pronom, ni un nom propre - return "" - sWho = ":3s" + sWho = _dQuiEst.get(sSuj.lower(), ":3s") aSugg = set() for sStem in _oSpellChecker.getLemma(sFlex): tTags = conj._getTags(sStem) if tTags: for sTense in lMode: