Merge pull request #7180 from roed-math/american-spelling

Use American spelling throughout

Author: roed314

CONTRIBUTORS.yaml

@@ -1,5 +1,5 @@
 # This is the list of contributors to LMFDB
-# They are listed on /acknowledgement and maybe elsewhere
+# They are listed on /acknowledgment and maybe elsewhere
 # the 'name' field is mandatory, all others currently optional
 #  - affil: university or company affiliation
 #  - url: homepage

lmfdb/api2/templates/api2.html

@@ -18,7 +18,7 @@ <h2 id="api2-requests">API2 requests</h2>
 <li><p><a class="uri">/api2/inventory/&lt;searcher&gt;</a> - Describe the list of possible fields that can be returned by a searcher</p></li>
 <li><p><a class="uri">/api2/data/&lt;searcher&gt;</a> - Perform a search using a given searcher. Query parameters taken from the searcher description are provided as an ampersand delimited query string to this endpoint. Non searching parameters are available and are all prepended by “_”</p></li>
 <li><p><a class="uri">/api2/pretty/&lt;other_path&gt;</a> - This takes a valid other API path and produces a human readable (just) HTML page from the data contained. The other path should be the part after “api2” in the URL</p></li>
-<li><p><a class="uri">/api2/singleton/&lt;path&gt;</a> - This is intended to provide a URL that allows canonical reference to a single element of the database. The format of the singletons is not standardised and should not in general be used for machine readable access</p></li>
+<li><p><a class="uri">/api2/singleton/&lt;path&gt;</a> - This is intended to provide a URL that allows canonical reference to a single element of the database. The format of the singletons is not standardized and should not in general be used for machine readable access</p></li>
 <li><p><a class="uri">/api2/livepg/&lt;database&gt;</a> - This is intended to replicate the behavior of the existing API. By specifying a database name and then using a standard search string (as per the /data/&lt;searcher&gt; endpoint) a search is performed on the raw database. This is not intended for normal access, but for debugging and testing purposes only.</p></li>
 </ul>
 <h3 id="api2-singletons">API2 singleton queries</h3>

lmfdb/bianchi_modular_forms/templates/bmf-field_dim_table.html

@@ -47,7 +47,7 @@
 {% endif %}
 <p>{{info.report | safe}}
                     {# we have to decide which option is preselected
-                    based on a judgement of what users will want to
+                    based on a judgment of what users will want to
                     switch to, i.e. one of the other two options.  For
                     simplicity I have used the 3-cycle new -> all ->
                     cusp -> new. #}

lmfdb/bianchi_modular_forms/web_BMF.py

@@ -115,7 +115,7 @@ def __init__(self, dbdata, max_eigs=50):
             - dbdata: the data from the database
 
         dbdata is expected to be a database entry from which the class
-        is initialised.
+        is initialized.
 
         """
         self.__dict__.update(dbdata)

lmfdb/characters/test_characters.py

@@ -142,7 +142,7 @@ def test_dirichletgalorbs(self):
                     r'<td class="center">\(e\left(\frac{115}{714}\right)\)</td>')
         assert table_row in W.get_data(as_text=True)
 
-        # Tests for URL behaviour of characters
+        # Tests for URL behavior of characters
 
         W = self.tc.get('/Character/Dirichlet/5489/banana/100', follow_redirects=True)
         assert bool_string(True) in W.get_data(as_text=True)

lmfdb/classical_modular_forms/web_newform.py

@@ -1028,9 +1028,9 @@ def display_hecke_char_polys(self, num_disp=5):
                  th_wrap('charpoly', '$F_p(T)$'),
                  '  </tr>', '</thead>', '<tbody>']
         loop_count = 0
-        for p, factorisation in hecke_polys_orbits.items():
-            factorisation.sort(key=lambda elt: (elt[0].degree(), elt[1]))
-            charpoly = raw_typeset_poly_factor(factorisation, decreasing=True)
+        for p, factorization in hecke_polys_orbits.items():
+            factorization.sort(key=lambda elt: (elt[0].degree(), elt[1]))
+            charpoly = raw_typeset_poly_factor(factorization, decreasing=True)
             if loop_count < num_disp:
                 polys.append('  <tr>')
             else:

lmfdb/ecnf/WebEllipticCurve.py

@@ -215,12 +215,12 @@ def EC_R_plot_zone(f,h):
         return plot_zone_union(EC_R_plot_zone_piece(f,h,ZF[0],ZF[1]),EC_R_plot_zone_piece(f,h,ZF[2],2*xi-ZF[2]))
     return EC_R_plot_zone_piece(f,h,ZF[0],2*ZF[1]-ZF[0])
 
-def EC_R_plot(ainvs, xmin, xmax, ymin, ymax, colour, legend):
+def EC_R_plot(ainvs, xmin, xmax, ymin, ymax, color, legend):
     x = var('x')
     y = var('y')
     c = (xmin + xmax) / 2
     d = (xmax - xmin)
-    return implicit_plot(y ** 2 + ainvs[0] * x * y + ainvs[2] * y - x ** 3 - ainvs[1] * x ** 2 - ainvs[3] * x - ainvs[4], (x, xmin, xmax), (y, ymin, ymax), plot_points=500, aspect_ratio="automatic", color=colour) + plot(0, xmin=c - 1e-5 * d, xmax=c + 1e-5 * d, ymin=ymin, ymax=ymax, aspect_ratio="automatic", color=colour, legend_label=legend)  # Add an extra plot outside the visible frame because implicit plots are buggy: their legend does not show (https://trac.sagemath.org/ticket/15903)
+    return implicit_plot(y ** 2 + ainvs[0] * x * y + ainvs[2] * y - x ** 3 - ainvs[1] * x ** 2 - ainvs[3] * x - ainvs[4], (x, xmin, xmax), (y, ymin, ymax), plot_points=500, aspect_ratio="automatic", color=color) + plot(0, xmin=c - 1e-5 * d, xmax=c + 1e-5 * d, ymin=ymin, ymax=ymax, aspect_ratio="automatic", color=color, legend_label=legend)  # Add an extra plot outside the visible frame because implicit plots are buggy: their legend does not show (https://trac.sagemath.org/ticket/15903)
 
 Rx = PolynomialRing(RDF,'x')
 
@@ -238,7 +238,7 @@ def EC_nf_plot(K, ainvs, base_field_gen_name):
         xmax = max([r[1] for r in R])
         ymin = min([r[2] for r in R])
         ymax = max([r[3] for r in R])
-        cols = rainbow(n1) # Default choice of n colours
+        cols = rainbow(n1) # Default choice of n colors
         # However, these tend to be too pale, so we preset them for small values of n
         if n1 == 1:
             cols = ["blue"]

lmfdb/ecnf/test_ecnf.py

@@ -59,7 +59,7 @@ def test_j(self):
         L = self.tc.get('/EllipticCurve/2.0.4.1/5525.5/b/9')
         assert '226834389543384' in L.get_data(as_text=True)
         assert '1490902050625' in L.get_data(as_text=True)
-        L = self.tc.get('EllipticCurve/2.2.89.1/81.1/a/1') # Test factorisation
+        L = self.tc.get('EllipticCurve/2.2.89.1/81.1/a/1') # Test factorization
         assert '8798344145175011328000' in L.get_data(as_text=True)
 
     def test_download(self):

lmfdb/elliptic_curves/elliptic_curve.py

@@ -654,7 +654,7 @@ def elliptic_curve_search(info, query):
                     info['galois_image'] = ','.join(modell_labels + elladic_labels)
                 query['modell_images'] = { '$contains': modell_labels }
 
-    # The button which used to be labelled Optimal only no/yes"
+    # The button which used to be labeled Optimal only no/yes"
     # (default: no) has been renamed "Curves per isogeny class
     # all/one" (default: all).  When this option is "one" we only list
     # one curve in each class, currently choosing the curve with

lmfdb/elliptic_curves/isog_class.py

@@ -133,7 +133,7 @@ def make_class(self):
         from sage.matrix.all import Matrix
         M = classdata['isogeny_matrix']
 
-        # permute rows/cols to match labelling: the rows/cols in the
+        # permute rows/cols to match labeling: the rows/cols in the
         # ec_classdata table are with respect to LMFDB ordering.
         if self.label_type == 'Cremona':
             def perm(i): return next(c for c in self.curves if c['Cnumber'] == i+1)['lmfdb_number']-1