Overview
| Comment: | [fr] conjugeur: mise à jour + pas de variable d’un seul caractère |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk | fr |
| Files: | files | file ages | folders |
| SHA3-256: |
6a3646249d23cd8ebe4ac4c9de026448 |
| User & Date: | olr on 2017-05-28 13:01:17 |
| Other Links: | manifest | tags |
Context
|
2017-05-29
| ||
| 06:26 | [fr] déplacement des règles de confusion <différent/différend> + correction faux positifs check-in: b2901e8b0f user: olr tags: trunk, fr | |
|
2017-05-28
| ||
| 13:01 | [fr] conjugeur: mise à jour + pas de variable d’un seul caractère check-in: 6a3646249d user: olr tags: trunk, fr | |
| 12:15 | [fr] étiquettes pour les verbes pronominaux check-in: 3a71c07d37 user: olr tags: trunk, fr | |
Changes
Modified gc_lang/fr/modules-js/conj.js from [1c45293d0f] to [55db24a585].
| ︙ | ︙ | |||
283 284 285 286 287 288 289 |
]);
};
_readableInfo () {
// returns readable infos
this.sVerbAux = (this._sRawInfo.slice(7,8) == "e") ? "être" : "avoir";
let sGroup = _dGroup.get(this._sRawInfo[0]);
| | | | | | | | | | | | | | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 |
]);
};
_readableInfo () {
// returns readable infos
this.sVerbAux = (this._sRawInfo.slice(7,8) == "e") ? "être" : "avoir";
let sGroup = _dGroup.get(this._sRawInfo[0]);
let sInfo = "";
if (this._sRawInfo.slice(3,4) == "t") {
sInfo = "transitif";
} else if (this._sRawInfo.slice(4,5) == "n") {
sInfo = "transitif indirect";
} else if (this._sRawInfo.slice(2,3) == "i") {
sInfo = "intransitif";
} else if (this._sRawInfo.slice(5,6) == "r") {
sInfo = "pronominal réciproque";
} else if (this._sRawInfo.slice(5,6) == "p") {
sInfo = "pronominal";
}
if ( ["q", "u", "v", "e"].includes(this._sRawInfo.slice(5,6)) ) {
sInfo = sInfo + " (+ usage pronominal)";
}
if (this._sRawInfo.slice(6,7) == "m") {
sInfo = sInfo + " impersonnel";
}
if (sInfo === "") {
sInfo = "# erreur - code : " + this._sRawInfo;
}
return sGroup + " · " + sInfo;
};
infinitif (bPro, bNeg, bTpsCo, bInt, bFem) {
let sInfi;
if (bTpsCo) {
sInfi = (bPro) ? "être" : this.sVerbAux;
} else {
|
| ︙ | ︙ | |||
341 342 343 344 345 346 347 |
return this.dConj.get(":PQ").get(sWho);
};
participePresent (bPro, bNeg, bTpsCo, bInt, bFem) {
if (!this.dConj.get(":PQ").get(":P")) {
return "";
}
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 |
return this.dConj.get(":PQ").get(sWho);
};
participePresent (bPro, bNeg, bTpsCo, bInt, bFem) {
if (!this.dConj.get(":PQ").get(":P")) {
return "";
}
let sPartPre;
if (bTpsCo) {
sPartPre = (!bPro) ? _getConjWithTags(this.sVerbAux, this._tTagsAux, ":PQ", ":P") : getConj("être", ":PQ", ":P");
} else {
sPartPre = this.dConj.get(":PQ").get(":P");
}
if (sPartPre === "") {
return "";
}
let bEli = _zStartVoy.test(sPartPre);
if (bPro) {
if (this.bProWithEn) {
sPartPre = "s’en " + sPartPre;
} else {
sPartPre = (bEli) ? "s’" + sPartPre : "se " + sPartPre;
}
}
if (bNeg) {
sPartPre = (bEli && !bPro) ? "n’" + sPartPre + " pas" : "ne " + sPartPre + " pas";
}
if (bTpsCo) {
sPartPre += " " + this._seekPpas(bPro, bFem, this._sRawInfo[5] == "r");
}
if (bInt) {
sPartPre += " … ?";
}
return sPartPre;
};
conjugue (sTemps, sWho, bPro, bNeg, bTpsCo, bInt, bFem) {
if (!this.dConj.get(sTemps).get(sWho)) {
return "";
}
let sConj;
if (!bTpsCo && bInt && sWho == ":1s" && this.dConj.get(sTemps)._get(":1ś", false)) {
sWho = ":1ś";
}
if (bTpsCo) {
sConj = (!bPro) ? _getConjWithTags(this.sVerbAux, this._tTagsAux, sTemps, sWho) : getConj("être", sTemps, sWho);
} else {
sConj = this.dConj.get(sTemps).get(sWho);
}
if (sConj === "") {
return "";
}
let bEli = _zStartVoy.test(sConj);
if (bPro) {
if (!this.bProWithEn) {
sConj = (bEli) ? _dProObjEl.get(sWho) + sConj : _dProObj.get(sWho) + sConj;
} else {
sConj = _dProObjEl.get(sWho) + "en " + sConj;
}
}
if (bNeg) {
sConj = (bEli && !bPro) ? "n’" + sConj : "ne " + sConj;
}
if (bInt) {
if (sWho == ":3s" && !_zNeedTeuph.test(sConj)) {
sConj += "-t";
}
sConj += "-" + this._getPronom(sWho, bFem);
} else {
if (sWho == ":1s" && bEli && !bNeg && !bPro) {
sConj = "j’" + sConj;
} else {
sConj = this._getPronom(sWho, bFem) + " " + sConj;
}
}
if (bNeg) {
sConj += " pas";
}
if (bTpsCo) {
sConj += " " + this._seekPpas(bPro, bFem, sWho.endsWith("p") || this._sRawInfo[5] == "r");
}
if (bInt) {
sConj += " … ?";
}
return sConj;
};
_getPronom (sWho, bFem) {
if (sWho == ":3s") {
if (this._sRawInfo[5] == "r") {
return "on";
} else if (bFem) {
return "elle";
}
} else if (sWho == ":3p" && bFem) {
return "elles";
}
return _dProSuj.get(sWho);
};
imperatif (sWho, bPro, bNeg, bTpsCo, bFem) {
if (!this.dConj.get(":E").get(sWho)) {
return "";
}
let sImpe;
if (bTpsCo) {
sImpe = (!bPro) ? _getConjWithTags(this.sVerbAux, this._tTagsAux, ":E", sWho) : getConj("être", ":E", sWho);
} else {
sImpe = this.dConj.get(":E").get(sWho);
}
if (sImpe === "") {
return "";
}
let bEli = _zStartVoy.test(sImpe);
if (bNeg) {
if (bPro) {
if (!this.bProWithEn) {
sImpe = (bEli && sWho == ":2s") ? "ne t’" + sImpe + " pas" : _dImpeProNeg.get(sWho) + sImpe + " pas";
} else {
sImpe = _dImpeProNegEn.get(sWho) + sImpe + " pas";
}
} else {
sImpe = (bEli) ? "n’" + sImpe + " pas" : "ne " + sImpe + " pas";
}
} else if (bPro) {
sImpe = (this.bProWithEn) ? sImpe + _dImpeProEn.get(sWho) : sImpe + _dImpePro.get(sWho);
}
if (bTpsCo) {
return sImpe + " " + this._seekPpas(bPro, bFem, sWho.endsWith("p") || this._sRawInfo[5] == "r");
}
return sImpe;
};
_seekPpas (bPro, bFem, bPlur) {
if (!bPro && this.sVerbAux == "avoir") {
return this.dConj.get(":PQ").get(":Q1");
}
if (!bFem) {
|
| ︙ | ︙ |
Modified gc_lang/fr/modules/conj.py from [7c55bc9b32] to [55e5497434].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 |
_dGroup = { "0": "auxiliaire", "1": "1ᵉʳ groupe", "2": "2ᵉ groupe", "3": "3ᵉ groupe" }
_dTenseIdx = { ":PQ": 0, ":Ip": 1, ":Iq": 2, ":Is": 3, ":If": 4, ":K": 5, ":Sp": 6, ":Sq": 7, ":E": 8 }
| | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
_dGroup = { "0": "auxiliaire", "1": "1ᵉʳ groupe", "2": "2ᵉ groupe", "3": "3ᵉ groupe" }
_dTenseIdx = { ":PQ": 0, ":Ip": 1, ":Iq": 2, ":Is": 3, ":If": 4, ":K": 5, ":Sp": 6, ":Sq": 7, ":E": 8 }
def isVerb (sVerb):
return sVerb in _dVerb
def getConj (sVerb, sTense, sWho):
"returns conjugation (can be an empty string)"
if sVerb not in _dVerb:
return None
return _modifyStringWithSuffixCode(sVerb, _dPatternConj[sTense][_lTags[_dVerb[sVerb][1]][_dTenseIdx[sTense]]].get(sWho, ""))
|
| ︙ | ︙ | |||
238 239 240 241 242 243 244 |
if not self._sRawInfo:
return "verbe inconnu"
if self._sRawInfo[7:8] == "e":
self.sVerbAux = "être"
else:
self.sVerbAux = "avoir"
sGroup = _dGroup.get(self._sRawInfo[0], "# erreur ")
| | | | | | | | | | | | | | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 |
if not self._sRawInfo:
return "verbe inconnu"
if self._sRawInfo[7:8] == "e":
self.sVerbAux = "être"
else:
self.sVerbAux = "avoir"
sGroup = _dGroup.get(self._sRawInfo[0], "# erreur ")
sInfo = ""
if self._sRawInfo[3:4] == "t":
sInfo = "transitif"
elif self._sRawInfo[4:5] == "n":
sInfo = "transitif indirect"
elif self._sRawInfo[2:3] == "i":
sInfo = "intransitif"
elif self._sRawInfo[5:6] == "r":
sInfo = "pronominal réciproque"
elif self._sRawInfo[5:6] == "p":
sInfo = "pronominal"
if self._sRawInfo[5:6] in ["q", "u", "v", "e"]:
sInfo = sInfo + " (+ usage pronominal)"
if self._sRawInfo[6:7] == "m":
sInfo = sInfo + " impersonnel"
if not sInfo:
sInfo = "# erreur - code : " + self._sRawInfo
return sGroup + " · " + sInfo
except:
traceback.print_exc()
return "# erreur"
def infinitif (self, bPro, bNeg, bTpsCo, bInt, bFem):
try:
if bTpsCo:
|
| ︙ | ︙ | |||
294 295 296 297 298 299 300 |
return "# erreur"
def participePresent (self, bPro, bNeg, bTpsCo, bInt, bFem):
try:
if not self.dConj[":PQ"][":P"]:
return ""
if bTpsCo:
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 |
return "# erreur"
def participePresent (self, bPro, bNeg, bTpsCo, bInt, bFem):
try:
if not self.dConj[":PQ"][":P"]:
return ""
if bTpsCo:
sPartPre = _getConjWithTags(self.sVerbAux, self._tTagsAux, ":PQ", ":P") if not bPro else getConj("être", ":PQ", ":P")
else:
sPartPre = self.dConj[":PQ"][":P"]
if not sPartPre:
return ""
bEli = True if _zStartVoy.search(sPartPre) else False
if bPro:
if self.bProWithEn:
sPartPre = "s’en " + sPartPre
else:
sPartPre = "s’" + sPartPre if bEli else "se " + sPartPre
if bNeg:
if bEli and not bPro:
sPartPre = "n’" + sPartPre + " pas"
else:
sPartPre = "ne " + sPartPre + " pas"
if bTpsCo:
sPartPre += " " + self._seekPpas(bPro, bFem, self._sRawInfo[5] == "r")
if bInt:
sPartPre += " … ?"
return sPartPre
except:
traceback.print_exc()
return "# erreur"
def conjugue (self, sTemps, sWho, bPro, bNeg, bTpsCo, bInt, bFem):
try:
if not self.dConj[sTemps][sWho]:
return ""
if not bTpsCo and bInt and sWho == ":1s" and self.dConj[sTemps].get(":1ś", False):
sWho = ":1ś"
if bTpsCo:
sConj = _getConjWithTags(self.sVerbAux, self._tTagsAux, sTemps, sWho) if not bPro else getConj("être", sTemps, sWho)
else:
sConj = self.dConj[sTemps][sWho]
if not sConj:
return ""
bEli = True if _zStartVoy.search(sConj) else False
if bPro:
if not self.bProWithEn:
sConj = _dProObjEl[sWho] + sConj if bEli else _dProObj[sWho] + sConj
else:
sConj = _dProObjEl[sWho] + "en " + sConj
if bNeg:
sConj = "n’" + sConj if bEli and not bPro else "ne " + sConj
if bInt:
if sWho == ":3s" and not _zNeedTeuph.search(sConj):
sConj += "-t"
sConj += "-" + self._getPronom(sWho, bFem)
else:
if sWho == ":1s" and bEli and not bNeg and not bPro:
sConj = "j’" + sConj
else:
sConj = self._getPronom(sWho, bFem) + " " + sConj
if bNeg:
sConj += " pas"
if bTpsCo:
sConj += " " + self._seekPpas(bPro, bFem, sWho.endswith("p") or self._sRawInfo[5] == "r")
if bInt:
sConj += " … ?"
return sConj
except:
traceback.print_exc()
return "# erreur"
def _getPronom (self, sWho, bFem):
try:
if sWho == ":3s":
|
| ︙ | ︙ | |||
378 379 380 381 382 383 384 |
return "# erreur"
def imperatif (self, sWho, bPro, bNeg, bTpsCo, bFem):
try:
if not self.dConj[":E"][sWho]:
return ""
if bTpsCo:
| | | | | | | | | | | | | 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 |
return "# erreur"
def imperatif (self, sWho, bPro, bNeg, bTpsCo, bFem):
try:
if not self.dConj[":E"][sWho]:
return ""
if bTpsCo:
sImpe = _getConjWithTags(self.sVerbAux, self._tTagsAux, ":E", sWho) if not bPro else getConj(u"être", ":E", sWho)
else:
sImpe = self.dConj[":E"][sWho]
if not sImpe:
return ""
bEli = True if _zStartVoy.search(sImpe) else False
if bNeg:
if bPro:
if not self.bProWithEn:
if bEli and sWho == ":2s":
sImpe = "ne t’" + sImpe + " pas"
else:
sImpe = _dImpeProNeg[sWho] + sImpe + " pas"
else:
sImpe = _dImpeProNegEn[sWho] + sImpe + " pas"
else:
sImpe = "n’" + sImpe + " pas" if bEli else "ne " + sImpe + " pas"
elif bPro:
sImpe = sImpe + _dImpeProEn[sWho] if self.bProWithEn else sImpe + _dImpePro[sWho]
if bTpsCo:
return sImpe + " " + self._seekPpas(bPro, bFem, sWho.endswith("p") or self._sRawInfo[5] == "r")
return sImpe
except:
traceback.print_exc()
return "# erreur"
def _seekPpas (self, bPro, bFem, bPlur):
try:
if not bPro and self.sVerbAux == "avoir":
|
| ︙ | ︙ |
Modified gc_lang/fr/oxt/Conjugueur/Conjugueur.py from [6ca66ec150] to [7525f9e8de].
| ︙ | ︙ | |||
299 300 301 302 303 304 305 |
self.otco.Enabled = False
self.infomsg.Label = self.sWarning
else:
self.infomsg.Label = ""
if sRawInfo[5] == "_":
self.opro.State = False
self.opro.Enabled = False
| | | | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 |
self.otco.Enabled = False
self.infomsg.Label = self.sWarning
else:
self.infomsg.Label = ""
if sRawInfo[5] == "_":
self.opro.State = False
self.opro.Enabled = False
elif sRawInfo[5] in ["q", "u", "v", "e"]:
self.opro.State = False
self.opro.Enabled = True
elif sRawInfo[5] == "p" or sRawInfo[5] == "r":
self.opro.State = True
self.opro.Enabled = False
elif sRawInfo[5] == "x":
self.opro.Label = "cas particuliers"
self.opro.State = False
self.opro.Enabled = False
else:
self.opro.Label = "# erreur #"
self.opro.State = False
self.opro.Enabled = False
|
| ︙ | ︙ |
Modified gc_lang/fr/tb/content/conjugueur.js from [d8559c53e4] to [52fcb1616a].
| ︙ | ︙ | |||
98 99 100 101 102 103 104 |
document.getElementById('otco').style = "color: #CCC;";
document.getElementById('smallnote').hidden = false;
} else {
if (sRawInfo[5] == "_") {
document.getElementById('opro').checked = false;
document.getElementById('opro').disabled = true;
document.getElementById('opro').style = "color: #CCC;";
| | | | 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 |
document.getElementById('otco').style = "color: #CCC;";
document.getElementById('smallnote').hidden = false;
} else {
if (sRawInfo[5] == "_") {
document.getElementById('opro').checked = false;
document.getElementById('opro').disabled = true;
document.getElementById('opro').style = "color: #CCC;";
} else if (["q", "u", "v", "e"].includes(sRawInfo[5])) {
document.getElementById('opro').checked = false;
document.getElementById('opro').disabled = false;
document.getElementById('opro').style = "color: #000;";
} else if (sRawInfo[5] == "p" || sRawInfo[5] == "r") {
document.getElementById('opro').checked = true;
document.getElementById('opro').disabled = true;
document.getElementById('opro').style = "color: #CCC;";
} else if (sRawInfo[5] == "x") {
document.getElementById('opro').textContent = "cas particuliers";
document.getElementById('opro').checked = false;
document.getElementById('opro').disabled = true;
document.getElementById('opro').style = "color: #CCC;";
} else {
document.getElementById('opro').textContent = "# erreur #";
document.getElementById('opro').checked = false;
|
| ︙ | ︙ |
Modified gc_lang/fr/xpi/data/conj_panel.js from [d0838c414c] to [0a29bb81bd].
| ︙ | ︙ | |||
91 92 93 94 95 96 97 |
document.getElementById('otco_lbl').style = "color: #CCC;";
document.getElementById('smallnote').hidden = false;
} else {
if (sRawInfo[5] == "_") {
document.getElementById('opro').checked = false;
document.getElementById('opro').disabled = true;
document.getElementById('opro_lbl').style = "color: #CCC;";
| | | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 |
document.getElementById('otco_lbl').style = "color: #CCC;";
document.getElementById('smallnote').hidden = false;
} else {
if (sRawInfo[5] == "_") {
document.getElementById('opro').checked = false;
document.getElementById('opro').disabled = true;
document.getElementById('opro_lbl').style = "color: #CCC;";
} else if (["q", "u", "v", "e"].includes(sRawInfo[5])) {
document.getElementById('opro').checked = false;
document.getElementById('opro').disabled = false;
document.getElementById('opro_lbl').style = "color: #000;";
} else if (sRawInfo[5] == "p" || sRawInfo[5] == "r") {
document.getElementById('opro').checked = true;
document.getElementById('opro').disabled = true;
document.getElementById('opro_lbl').style = "color: #CCC;";
} else if (sRawInfo[5] == "x") {
document.getElementById('opro').textContent = "cas particuliers";
document.getElementById('opro').checked = false;
document.getElementById('opro').disabled = true;
document.getElementById('opro_lbl').style = "color: #CCC;";
} else {
document.getElementById('opro').textContent = "# erreur #";
document.getElementById('opro').checked = false;
|
| ︙ | ︙ |