Grammalecte  Check-in [cad546de72]

Overview
Comment:[fr] fix conjugueur
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | fr
Files: files | file ages | folders
SHA3-256: cad546de7297bd0289ae43e3e6f988a4596be8f7f5b2c09e934195769c479e53
User & Date: olr on 2023-03-22 18:12:32
Other Links: manifest | tags
Context
2023-03-22
19:03
[fr] faux positifs check-in: 18e5cd0473 user: olr tags: trunk, fr
18:12
[fr] fix conjugueur check-in: cad546de72 user: olr tags: trunk, fr
12:15
[fr] phonet_simil: maj check-in: ff9e10f27d user: olr tags: trunk, fr
Changes

Modified gc_lang/fr/modules-js/conj.js from [0c226f31fc] to [4f811f8baa].

490
491
492
493
494
495
496
497
498





499
500
501


502
503

504
505
506
507
508
509
510
490
491
492
493
494
495
496


497
498
499
500
501
502


503
504
505

506
507
508
509
510
511
512
513







-
-
+
+
+
+
+

-
-
+
+

-
+







        return sImpe;
    }

    _seekPpas (bPro, bFem, bPlur) {
        if (!bPro && this.sVerbAux == "avoir") {
            return this.dConj.get(":Q").get(":m:s");
        }
        if (!bFem) {
            return (bPlur && this.dConj.get(":Q").get(":f:s")) ? this.dConj.get(":Q").get(":f:s") : this.dConj.get(":Q").get(":m:s");
        if (bFem && bPlur) {
            return this.dConj.get(":Q").get(":f:p") || this.dConj.get(":Q").get(":m:s");
        }
        else if (bFem && !bPlur) {
            return this.dConj.get(":Q").get(":f:s") || this.dConj.get(":Q").get(":m:s");
        }
        if (!bPlur) {
            return (this.dConj.get(":Q").get(":m:p")) ? this.dConj.get(":Q").get(":m:p") : this.dConj.get(":Q").get(":m:s");
        if (bPlur) {
            return this.dConj.get(":Q").get(":m:p") || this.dConj.get(":Q").get(":m:s");
        }
        return (this.dConj.get(":Q").get(":f:p")) ? this.dConj.get(":Q").get(":f:p") : this.dConj.get(":Q").get(":m:s");
        return this.dConj.get(":Q").get(":m:s");
    }

    createConjTable (bPro=false, bNeg=false, bTpsCo=false, bInt=false, bFem=false) {
        let oConjTable = {
            "t_infi":   "Infinitif",
            "infi":     this.infinitif(bPro, bNeg, bTpsCo, bInt, bFem),
            "t_ppre":   "Participe présent",

Modified gc_lang/fr/modules/conj.py from [c6776ced05] to [c1932bbd86].

447
448
449
450
451
452
453
454
455
456
457
458







459
460
461
462
463
464
465
447
448
449
450
451
452
453





454
455
456
457
458
459
460
461
462
463
464
465
466
467







-
-
-
-
-
+
+
+
+
+
+
+







            traceback.print_exc()
            return "# erreur"

    def _seekPpas (self, bPro, bFem, bPlur):
        try:
            if not bPro and self.sVerbAux == "avoir":
                return self.dConj[":Q"][":m:s"]
            if not bFem:
                return self.dConj[":Q"][":f:s"]  if bPlur and self.dConj[":Q"][":f:s"]  else  self.dConj[":Q"][":m:s"]
            if not bPlur:
                return self.dConj[":Q"][":m:p"]  if self.dConj[":Q"][":m:p"]  else  self.dConj[":Q"][":m:s"]
            return self.dConj[":Q"][":f:p"]  if self.dConj[":Q"][":f:p"]  else  self.dConj[":Q"][":m:s"]
            if bFem and bPlur:
                return self.dConj[":Q"][":f:p"] or self.dConj[":Q"][":m:s"]
            if bFem and not bPlur:
                return self.dConj[":Q"][":f:s"] or self.dConj[":Q"][":m:s"]
            if bPlur:
                return self.dConj[":Q"][":m:p"] or self.dConj[":Q"][":m:s"]
            return self.dConj[":Q"][":m:s"]
        except KeyError:
            traceback.print_exc()
            return "# erreur"

    def createConjTable (self, bPro=False, bNeg=False, bTpsCo=False, bInt=False, bFem=False):
        "return a dictionary of all conjugations with titles, according to options (used to be displayed as is)"
        dConjTable = {