Grammalecte  Check-in [f5ad8a3209]

Overview
Comment:[core] merge from trunk
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core | fr_killtricks
Files: files | file ages | folders
SHA3-256: f5ad8a32098b1ce31f3cee89ec216d0c818657b5cc81cb33324e76650037d9f8
User & Date: olr on 2017-06-04 12:14:59
Other Links: branch diff | manifest | tags
Context
2017-06-04
17:22
[fr] det sing +nom +verbe check-in: d24985a5e0 user: olr tags: fr, fr_killtricks
12:14
[core] merge from trunk check-in: f5ad8a3209 user: olr tags: core, fr_killtricks
10:13
[core] getReadableError changed check-in: 8fefa29d19 user: olr tags: trunk, core
09:41
[fr] det plur +nom +verbe check-in: 9e1a0b9466 user: olr tags: fr, fr_killtricks
Changes

Modified gc_core/js/tests.js from [f619a539fc] to [24427fff6b].

62
63
64
65
66
67
68
69

70
71
72
73
74
75
76
62
63
64
65
66
67
68

69
70
71
72
73
74
75
76







-
+







                              "\n  found:    " + sFoundErrors +
                              "\n  errors:   \n" + sListErr;
                        nInvalid = nInvalid + 1
                    }
                    nTotal = nTotal + 1;
                }
                i = i + 1;
                if (i % 100 === 0) {
                if (i % 1000 === 0) {
                    yield i.toString();
                }
            }
            bShowUntested = true;
        }
        catch (e) {
            helpers.logerror(e);

Modified gc_core/js/text.js from [0a62428d8c] to [f8cb0efb57].

35
36
37
38
39
40
41
42
43


44
45
46
47
48
49
50
35
36
37
38
39
40
41


42
43
44
45
46
47
48
49
50







-
-
+
+







    }
    yield sText;
}

function getReadableError (oErr) {
    // Returns an error oErr as a readable error
    try {
        let s = "\n* " + oErr['nStart'] + ":" + oErr['nEnd'] + "  # " + oErr['sRuleId']+"  : ";
        s += oErr["sMessage"];
        let s = "\n* " + oErr['nStart'] + ":" + oErr['nEnd'] + "  # " + oErr['sRuleId']+":\n";
        s += "  " + oErr["sMessage"];
        if (oErr["aSuggestions"].length > 0) {
            s += "\n  > Suggestions : " + oErr["aSuggestions"].join(" | ");
        }
        if (oErr["URL"] !== "") {
            s += "\n  > URL: " + oErr["URL"];
        }
        return s;

Modified gc_core/py/text.py from [af72c36707] to [e964ece40d].

81
82
83
84
85
86
87
88
89


90
91
92
93
94
95
96
81
82
83
84
85
86
87


88
89
90
91
92
93
94
95
96







-
-
+
+







        nOffset += ln
    return sText


def getReadableError (dErr):
    "Returns an error dErr as a readable error"
    try:
        s = u"* {nStart}:{nEnd}  # {sLineId} / {sRuleId} : ".format(**dErr)
        s += dErr.get("sMessage", "# error : message not found")
        s = u"* {nStart}:{nEnd}  # {sLineId} / {sRuleId}:\n".format(**dErr)
        s += "  " + dErr.get("sMessage", "# error : message not found")
        if dErr.get("aSuggestions", None):
            s += "\n  > Suggestions : " + " | ".join(dErr.get("aSuggestions", "# error : suggestions not found"))
        if dErr.get("URL", None):
            s += "\n  > URL: " + dErr["URL"]
        return s
    except KeyError:
        return u"* Non-compliant error: {}".format(dErr)