diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-02-27 17:52:30 +0000 |
|---|---|---|
| committer | Johan Dahlin <jdahlin@litl.com> | 2012-04-09 12:05:33 -0300 |
| commit | 4c38ca616ed727c6e89923d89cf188584cd255a2 (patch) | |
| tree | 14d25294b31bd9ca6d6cbca1b5cfbe5fd7f25d2c | |
| parent | 5030e41034f607a3cdb9aab6324f3b3b7099f9ad (diff) | |
| download | gobject-introspection-4c38ca616ed727c6e89923d89cf188584cd255a2.tar.gz | |
annotationparser: correct "maximium" in error messages
"Maximium" is not an English word. Even if corrected to "maximum" (which
is), "at maximum" is not conventional usage: "at most" is more
idiomatic.
https://bugzilla.gnome.org/show_bug.cgi?id=670985
| -rw-r--r-- | giscanner/annotationparser.py | 6 | ||||
| -rw-r--r-- | tests/warn/invalid-closure.h | 2 | ||||
| -rw-r--r-- | tests/warn/invalid-element-type.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 76f31243..e35eb288 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -321,7 +321,7 @@ class DocTag(object): elif option == OPT_CLOSURE: if value is not None and value.length() > 1: message.warn( - 'closure takes at maximium 1 value, %d given' % ( + 'closure takes at most 1 value, %d given' % ( value.length()), self.position) continue elif option == OPT_DESTROY: @@ -335,7 +335,7 @@ class DocTag(object): continue if value.length() > 2: message.warn( - 'element-type takes at maximium 2 values, %d given' % ( + 'element-type takes at most 2 values, %d given' % ( value.length()), self.position) continue elif option == OPT_FOREIGN: @@ -349,7 +349,7 @@ class DocTag(object): continue if value.length() > 1: message.warn( - 'out annotation takes at maximium 1 value, %d given' % ( + 'out annotation takes at most 1 value, %d given' % ( value.length()), self.position) continue value_str = value.one() diff --git a/tests/warn/invalid-closure.h b/tests/warn/invalid-closure.h index fcaf0937..50ba0864 100644 --- a/tests/warn/invalid-closure.h +++ b/tests/warn/invalid-closure.h @@ -5,4 +5,4 @@ */ void test_invalid_closure(int param); -// EXPECT:4: Warning: Test: closure takes at maximium 1 value, 2 given +// EXPECT:4: Warning: Test: closure takes at most 1 value, 2 given diff --git a/tests/warn/invalid-element-type.h b/tests/warn/invalid-element-type.h index 71749d1a..52e31164 100644 --- a/tests/warn/invalid-element-type.h +++ b/tests/warn/invalid-element-type.h @@ -33,7 +33,7 @@ void test_invalid_hash_element_type(GHashTable *h1, GHashTable *h2, GHashTable * // EXPECT:27: Warning: Test: element-type annotation needs a value // EXPECT:27: Warning: Test: element-type takes at least one value, none given -// EXPECT:29: Warning: Test: element-type takes at maximium 2 values, 3 given +// EXPECT:29: Warning: Test: element-type takes at most 2 values, 3 given /** * test_invalid_bytearray_element_type: |