Overview
Comment: | [fx][fr][js] conjugueur: table de conjugaison dans le module conj au lieu de l’ui |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | fr | fx |
Files: | files | file ages | folders |
SHA3-256: |
397ebe76ebc5a53cc206d94b0b1e0848 |
User & Date: | olr on 2019-05-06 13:56:11 |
Other Links: | manifest | tags |
Context
2019-05-06
| ||
15:09 | [tb][fr][js] conjugueur: table de conjugaison dans le module conj au lieu de l’ui check-in: 603dc4246d user: olr tags: trunk, fr, tb | |
13:56 | [fx][fr][js] conjugueur: table de conjugaison dans le module conj au lieu de l’ui check-in: 397ebe76eb user: olr tags: trunk, fr, fx | |
13:55 | [lo] conjugueur: code clarification check-in: 32fd16071a user: olr tags: trunk, lo | |
Changes
Modified gc_lang/fr/modules-js/conj.js from [98b99c75fa] to [68b70111ba].
︙ | ︙ | |||
201 202 203 204 205 206 207 208 209 210 211 212 213 214 | this._tTags = conj._getTags(sVerbPattern); if (!this._tTags) { throw new RangeError ("Unknown verb."); } this._tTagsAux = conj._getTags(this.sVerbAux); this.bProWithEn = (this._sRawInfo[5] === "e"); this.cGroup = this._sRawInfo[0]; this.dConj = new Map ([ [":Y", new Map ([ ["label", "Infinitif"], [":", sVerb] ])], [":P", new Map ([ ["label", "Participe présent"], | > > > > > > > > > > > > > > > | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 | this._tTags = conj._getTags(sVerbPattern); if (!this._tTags) { throw new RangeError ("Unknown verb."); } this._tTagsAux = conj._getTags(this.sVerbAux); this.bProWithEn = (this._sRawInfo[5] === "e"); this.cGroup = this._sRawInfo[0]; this.bUncomplete = this._sRawInfo.endsWith("zz"); this.sProLabel = "pronominal"; if (this._sRawInfo[5] == "_") { this.nPronominable = -1; } else if (["q", "u", "v", "e"].includes(this._sRawInfo[5])) { this.nPronominable = 0; } else if (this._sRawInfo[5] == "p" || this._sRawInfo[5] == "r") { this.nPronominable = 1; } else if (this._sRawInfo[5] == "x") { this.sProLabel = "cas particuliers"; this.nPronominable = 2; } else { this.sProLabel = "# erreur #"; this.nPronominable = -1; } this.dConj = new Map ([ [":Y", new Map ([ ["label", "Infinitif"], [":", sVerb] ])], [":P", new Map ([ ["label", "Participe présent"], |
︙ | ︙ | |||
492 493 494 495 496 497 498 499 500 501 502 503 504 505 | return (bPlur && this.dConj.get(":Q").get(":Q2")) ? this.dConj.get(":Q").get(":Q2") : this.dConj.get(":Q").get(":Q1"); } if (!bPlur) { return (this.dConj.get(":Q").get(":Q3")) ? this.dConj.get(":Q").get(":Q3") : this.dConj.get(":Q").get(":Q1"); } return (this.dConj.get(":Q").get(":Q4")) ? this.dConj.get(":Q").get(":Q4") : this.dConj.get(":Q").get(":Q1"); } } // Initialization if(!conj.bInit && typeof(process) !== 'undefined') { // Work with nodejs conj.init(helpers.loadFile(__dirname+"/conj_data.json")); | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 | return (bPlur && this.dConj.get(":Q").get(":Q2")) ? this.dConj.get(":Q").get(":Q2") : this.dConj.get(":Q").get(":Q1"); } if (!bPlur) { return (this.dConj.get(":Q").get(":Q3")) ? this.dConj.get(":Q").get(":Q3") : this.dConj.get(":Q").get(":Q1"); } return (this.dConj.get(":Q").get(":Q4")) ? this.dConj.get(":Q").get(":Q4") : this.dConj.get(":Q").get(":Q1"); } 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", "ppre": this.participePresent(bPro, bNeg, bTpsCo, bInt, bFem), "t_ppas": "Participes passés", "ppas1": this.participePasse(":Q1"), "ppas2": this.participePasse(":Q2"), "ppas3": this.participePasse(":Q3"), "ppas4": this.participePasse(":Q4"), "t_imp": "Impératif", "t_impe": (bInt) ? "" : ((!bTpsCo) ? "Présent" : "Passé"), "impe1": (!bInt) ? this.imperatif(":2s", bPro, bNeg, bTpsCo, bFem) : "", "impe2": (!bInt) ? this.imperatif(":1p", bPro, bNeg, bTpsCo, bFem) : "", "impe3": (!bInt) ? this.imperatif(":2p", bPro, bNeg, bTpsCo, bFem) : "", "t_indi": "Indicatif", "t_ipre": (!bTpsCo) ? "Présent" : "Passé composé", "ipre1": this.conjugue(":Ip", ":1s", bPro, bNeg, bTpsCo, bInt, bFem), "ipre2": this.conjugue(":Ip", ":2s", bPro, bNeg, bTpsCo, bInt, bFem), "ipre3": this.conjugue(":Ip", ":3s", bPro, bNeg, bTpsCo, bInt, bFem), "ipre4": this.conjugue(":Ip", ":1p", bPro, bNeg, bTpsCo, bInt, bFem), "ipre5": this.conjugue(":Ip", ":2p", bPro, bNeg, bTpsCo, bInt, bFem), "ipre6": this.conjugue(":Ip", ":3p", bPro, bNeg, bTpsCo, bInt, bFem), "t_iimp": (!bTpsCo) ? "Imparfait" : "Plus-que-parfait", "iimp1": this.conjugue(":Iq", ":1s", bPro, bNeg, bTpsCo, bInt, bFem), "iimp2": this.conjugue(":Iq", ":2s", bPro, bNeg, bTpsCo, bInt, bFem), "iimp3": this.conjugue(":Iq", ":3s", bPro, bNeg, bTpsCo, bInt, bFem), "iimp4": this.conjugue(":Iq", ":1p", bPro, bNeg, bTpsCo, bInt, bFem), "iimp5": this.conjugue(":Iq", ":2p", bPro, bNeg, bTpsCo, bInt, bFem), "iimp6": this.conjugue(":Iq", ":3p", bPro, bNeg, bTpsCo, bInt, bFem), "t_ipsi": (!bTpsCo) ? "Passé simple" : "Passé antérieur", "ipsi1": this.conjugue(":Is", ":1s", bPro, bNeg, bTpsCo, bInt, bFem), "ipsi2": this.conjugue(":Is", ":2s", bPro, bNeg, bTpsCo, bInt, bFem), "ipsi3": this.conjugue(":Is", ":3s", bPro, bNeg, bTpsCo, bInt, bFem), "ipsi4": this.conjugue(":Is", ":1p", bPro, bNeg, bTpsCo, bInt, bFem), "ipsi5": this.conjugue(":Is", ":2p", bPro, bNeg, bTpsCo, bInt, bFem), "ipsi6": this.conjugue(":Is", ":3p", bPro, bNeg, bTpsCo, bInt, bFem), "t_ifut": (!bTpsCo) ? "Futur" : "Futur antérieur", "ifut1": this.conjugue(":If", ":1s", bPro, bNeg, bTpsCo, bInt, bFem), "ifut2": this.conjugue(":If", ":2s", bPro, bNeg, bTpsCo, bInt, bFem), "ifut3": this.conjugue(":If", ":3s", bPro, bNeg, bTpsCo, bInt, bFem), "ifut4": this.conjugue(":If", ":1p", bPro, bNeg, bTpsCo, bInt, bFem), "ifut5": this.conjugue(":If", ":2p", bPro, bNeg, bTpsCo, bInt, bFem), "ifut6": this.conjugue(":If", ":3p", bPro, bNeg, bTpsCo, bInt, bFem), "t_cond": "Conditionnel", "t_conda": (!bTpsCo) ? "Présent" : "Passé (1ʳᵉ forme)", "conda1": this.conjugue(":K", ":1s", bPro, bNeg, bTpsCo, bInt, bFem), "conda2": this.conjugue(":K", ":2s", bPro, bNeg, bTpsCo, bInt, bFem), "conda3": this.conjugue(":K", ":3s", bPro, bNeg, bTpsCo, bInt, bFem), "conda4": this.conjugue(":K", ":1p", bPro, bNeg, bTpsCo, bInt, bFem), "conda5": this.conjugue(":K", ":2p", bPro, bNeg, bTpsCo, bInt, bFem), "conda6": this.conjugue(":K", ":3p", bPro, bNeg, bTpsCo, bInt, bFem), "t_condb": (bTpsCo) ? "Passé (2ᵉ forme)" : "", "condb1": (bTpsCo) ? this.conjugue(":Sq", ":1s", bPro, bNeg, bTpsCo, bInt, bFem) : "", "condb2": (bTpsCo) ? this.conjugue(":Sq", ":2s", bPro, bNeg, bTpsCo, bInt, bFem) : "", "condb3": (bTpsCo) ? this.conjugue(":Sq", ":3s", bPro, bNeg, bTpsCo, bInt, bFem) : "", "condb4": (bTpsCo) ? this.conjugue(":Sq", ":1p", bPro, bNeg, bTpsCo, bInt, bFem) : "", "condb5": (bTpsCo) ? this.conjugue(":Sq", ":2p", bPro, bNeg, bTpsCo, bInt, bFem) : "", "condb6": (bTpsCo) ? this.conjugue(":Sq", ":3p", bPro, bNeg, bTpsCo, bInt, bFem) : "", "t_subj": "Subjonctif", "t_spre": (bInt) ? "" : ((!bTpsCo) ? "Présent" : "Passé"), "spre1": (!bInt) ? this.conjugue(":Sp", ":1s", bPro, bNeg, bTpsCo, bInt, bFem) : "", "spre2": (!bInt) ? this.conjugue(":Sp", ":2s", bPro, bNeg, bTpsCo, bInt, bFem) : "", "spre3": (!bInt) ? this.conjugue(":Sp", ":3s", bPro, bNeg, bTpsCo, bInt, bFem) : "", "spre4": (!bInt) ? this.conjugue(":Sp", ":1p", bPro, bNeg, bTpsCo, bInt, bFem) : "", "spre5": (!bInt) ? this.conjugue(":Sp", ":2p", bPro, bNeg, bTpsCo, bInt, bFem) : "", "spre6": (!bInt) ? this.conjugue(":Sp", ":3p", bPro, bNeg, bTpsCo, bInt, bFem) : "", "t_simp": (bInt) ? "" : ((!bTpsCo) ? "Imparfait" : "Plus-que-parfait"), "simp1": (!bInt) ? this.conjugue(":Sq", ":1s", bPro, bNeg, bTpsCo, bInt, bFem) : "", "simp2": (!bInt) ? this.conjugue(":Sq", ":2s", bPro, bNeg, bTpsCo, bInt, bFem) : "", "simp3": (!bInt) ? this.conjugue(":Sq", ":3s", bPro, bNeg, bTpsCo, bInt, bFem) : "", "simp4": (!bInt) ? this.conjugue(":Sq", ":1p", bPro, bNeg, bTpsCo, bInt, bFem) : "", "simp5": (!bInt) ? this.conjugue(":Sq", ":2p", bPro, bNeg, bTpsCo, bInt, bFem) : "", "simp6": (!bInt) ? this.conjugue(":Sq", ":3p", bPro, bNeg, bTpsCo, bInt, bFem) : "" } return oConjTable; } } // Initialization if(!conj.bInit && typeof(process) !== 'undefined') { // Work with nodejs conj.init(helpers.loadFile(__dirname+"/conj_data.json")); |
︙ | ︙ |
Modified gc_lang/fr/webext/panel/conjugueur.js from [532fc861da] to [d64a44e001].
︙ | ︙ | |||
59 60 61 62 63 64 65 | if (!conj.isVerb(sVerb)) { document.getElementById('verb').style = "color: #BB4411;"; } else { document.getElementById('verb_title').textContent = sVerb; document.getElementById('verb').style = "color: #999999;"; document.getElementById('verb').value = ""; oVerb = new Verb(sVerb); | < | | < < | | < < > | < < < < < | < | < | | | | | < < < < | | < | | | | | | | | | | | | | < < | | | | | | < < < < < < < < | | | | < | | | < < < < < < < < < | | > | < | | | | | | > | | | | | | | | | | | | < < < < < < < < < | | | | | | < | < < < < < < < < | | | < < > | | | | | < | | > | | | | | | | < | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | if (!conj.isVerb(sVerb)) { document.getElementById('verb').style = "color: #BB4411;"; } else { document.getElementById('verb_title').textContent = sVerb; document.getElementById('verb').style = "color: #999999;"; document.getElementById('verb').value = ""; oVerb = new Verb(sVerb); document.getElementById('info').textContent = oVerb.sInfo; document.getElementById('opro').textContent = oVerb.sProLabel; if (oVerb.bUncomplete) { document.getElementById('opro').checked = false; document.getElementById('opro').disabled = true; document.getElementById('opro_lbl').style = "color: #CCC;"; document.getElementById('otco').checked = false; document.getElementById('otco').disabled = true; document.getElementById('otco_lbl').style = "color: #CCC;"; document.getElementById('smallnote').textContent = "Ce verbe n’a pas encore été vérifié. C’est pourquoi les options “pronominal” et “temps composés” sont désactivées."; } else { document.getElementById('otco').disabled = false; document.getElementById('otco_lbl').style = "color: #000;"; if (oVerb.nPronominable == 0) { document.getElementById('opro').checked = false; document.getElementById('opro').disabled = false; document.getElementById('opro_lbl').style = "color: #000;"; } else if (oVerb.nPronominable == 1) { document.getElementById('opro').checked = true; document.getElementById('opro').disabled = true; document.getElementById('opro_lbl').style = "color: #CCC;"; } else { // -1 or 1 or error document.getElementById('opro').checked = false; document.getElementById('opro').disabled = true; document.getElementById('opro_lbl').style = "color: #CCC;"; } document.getElementById('smallnote').textContent = "❦"; } _displayResults(); } } } catch (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } } function _displayResults () { if (oVerb === null) { return; } try { let bPro = document.getElementById('opro').checked; let bNeg = document.getElementById('oneg').checked; let bTCo = document.getElementById('otco').checked; let bInt = document.getElementById('oint').checked; let bFem = document.getElementById('ofem').checked; let oConjTable = oVerb.createConjTable(bPro, bNeg, bTCo, bInt, bFem); document.getElementById('verb').Text = ""; // infinitif document.getElementById('infi').textContent = oConjTable["infi"] || " "; // something or nbsp // participe présent document.getElementById('ppre').textContent = oConjTable["ppre"] || " "; // participes passés document.getElementById('ppas1').textContent = oConjTable["ppas1"] || " "; document.getElementById('ppas2').textContent = oConjTable["ppas2"] || " "; document.getElementById('ppas3').textContent = oConjTable["ppas3"] || " "; document.getElementById('ppas4').textContent = oConjTable["ppas4"] || " "; // impératif document.getElementById('impe_temps').textContent = oConjTable["t_impe"] || " "; document.getElementById('impe1').textContent = oConjTable["impe1"] || " "; document.getElementById('impe2').textContent = oConjTable["impe2"] || " "; document.getElementById('impe3').textContent = oConjTable["impe3"] || " "; // présent document.getElementById('ipre_temps').textContent = oConjTable["t_ipre"] || " "; document.getElementById('ipre1').textContent = oConjTable["ipre1"] || " "; document.getElementById('ipre2').textContent = oConjTable["ipre2"] || " "; document.getElementById('ipre3').textContent = oConjTable["ipre3"] || " "; document.getElementById('ipre4').textContent = oConjTable["ipre4"] || " "; document.getElementById('ipre5').textContent = oConjTable["ipre5"] || " "; document.getElementById('ipre6').textContent = oConjTable["ipre6"] || " "; // imparfait document.getElementById('iimp_temps').textContent = oConjTable["t_iimp"] || " "; document.getElementById('iimp1').textContent = oConjTable["iimp1"] || " "; document.getElementById('iimp2').textContent = oConjTable["iimp2"] || " "; document.getElementById('iimp3').textContent = oConjTable["iimp3"] || " "; document.getElementById('iimp4').textContent = oConjTable["iimp4"] || " "; document.getElementById('iimp5').textContent = oConjTable["iimp5"] || " "; document.getElementById('iimp6').textContent = oConjTable["iimp6"] || " "; // passé simple document.getElementById('ipsi_temps').textContent = oConjTable["t_ipsi"] || " "; document.getElementById('ipsi1').textContent = oConjTable["ipsi1"] || " "; document.getElementById('ipsi2').textContent = oConjTable["ipsi2"] || " "; document.getElementById('ipsi3').textContent = oConjTable["ipsi3"] || " "; document.getElementById('ipsi4').textContent = oConjTable["ipsi4"] || " "; document.getElementById('ipsi5').textContent = oConjTable["ipsi5"] || " "; document.getElementById('ipsi6').textContent = oConjTable["ipsi6"] || " "; // futur document.getElementById('ifut_temps').textContent = oConjTable["t_ifut"] || " "; document.getElementById('ifut1').textContent = oConjTable["ifut1"] || " "; document.getElementById('ifut2').textContent = oConjTable["ifut2"] || " "; document.getElementById('ifut3').textContent = oConjTable["ifut3"] || " "; document.getElementById('ifut4').textContent = oConjTable["ifut4"] || " "; document.getElementById('ifut5').textContent = oConjTable["ifut5"] || " "; document.getElementById('ifut6').textContent = oConjTable["ifut6"] || " "; // Conditionnel document.getElementById('conda_temps').textContent = oConjTable["t_conda"] || " "; document.getElementById('conda1').textContent = oConjTable["conda1"] || " "; document.getElementById('conda2').textContent = oConjTable["conda2"] || " "; document.getElementById('conda3').textContent = oConjTable["conda3"] || " "; document.getElementById('conda4').textContent = oConjTable["conda4"] || " "; document.getElementById('conda5').textContent = oConjTable["conda5"] || " "; document.getElementById('conda6').textContent = oConjTable["conda6"] || " "; document.getElementById('condb_temps').textContent = oConjTable["t_condb"] || " "; document.getElementById('condb1').textContent = oConjTable["condb1"] || " "; document.getElementById('condb2').textContent = oConjTable["condb2"] || " "; document.getElementById('condb3').textContent = oConjTable["condb3"] || " "; document.getElementById('condb4').textContent = oConjTable["condb4"] || " "; document.getElementById('condb5').textContent = oConjTable["condb5"] || " "; document.getElementById('condb6').textContent = oConjTable["condb6"] || " "; // subjonctif présent document.getElementById('spre_temps').textContent = oConjTable["t_spre"] || " "; document.getElementById('spre1').textContent = oConjTable["spre1"] || " "; document.getElementById('spre2').textContent = oConjTable["spre2"] || " "; document.getElementById('spre3').textContent = oConjTable["spre3"] || " "; document.getElementById('spre4').textContent = oConjTable["spre4"] || " "; document.getElementById('spre5').textContent = oConjTable["spre5"] || " "; document.getElementById('spre6').textContent = oConjTable["spre6"] || " "; // subjonctif imparfait document.getElementById('simp_temps').textContent = oConjTable["t_simp"] || " "; document.getElementById('simp1').textContent = oConjTable["simp1"] || " "; document.getElementById('simp2').textContent = oConjTable["simp2"] || " "; document.getElementById('simp3').textContent = oConjTable["simp3"] || " "; document.getElementById('simp4').textContent = oConjTable["simp4"] || " "; document.getElementById('simp5').textContent = oConjTable["simp5"] || " "; document.getElementById('simp6').textContent = oConjTable["simp6"] || " "; } catch (e) { console.error(e.fileName + "\n" + e.name + "\nline: " + e.lineNumber + "\n" + e.message); } } createVerbAndConjugate("être"); document.getElementById("verb").focus(); |