From: Will Thompson <will.thompson@collabora.co.uk>
Date: Mon, 27 Feb 2012 17:52:30 +0000 (+0000)
Subject: annotationparser: correct "maximium" in error messages
X-Git-Tag: GOBJECT_INTROSPECTION_1_33_2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c38ca616ed727c6e89923d89cf188584cd255a2;p=platform%2Fupstream%2Fgobject-introspection.git

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
---

diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index 76f3124..e35eb28 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 fcaf093..50ba086 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 71749d1..52e3116 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: