diff --git a/pgweb/pugs/migrations/0001_initial.py b/pgweb/pugs/migrations/0001_initial.py index c4c4451c..c5a5394d 100644 --- a/pgweb/pugs/migrations/0001_initial.py +++ b/pgweb/pugs/migrations/0001_initial.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('website_url', models.TextField(null=True, blank=True)), ('mailing_list_url', models.TextField(null=True, blank=True)), ('country', models.ForeignKey(to='core.Country')), - ('org', models.ForeignKey(blank=True, to='core.Organisation', help_text=b'Organization that manages the PUG and its contents', null=True)), + ('org', models.ForeignKey(blank=True, to='core.Organisation', help_text=b'Organisation that manages the PUG and its contents', null=True)), ], ), ] diff --git a/pgweb/pugs/models.py b/pgweb/pugs/models.py index 66389c50..a72e0626 100644 --- a/pgweb/pugs/models.py +++ b/pgweb/pugs/models.py @@ -5,7 +5,7 @@ class PUG(models.Model): contains information about a local PostgreSQL user group """ country = models.ForeignKey('core.Country') - org = models.ForeignKey('core.Organisation', null=True, blank=True, help_text='Organization that manages the PUG and its contents') + org = models.ForeignKey('core.Organisation', null=True, blank=True, help_text='Organisation that manages the PUG and its contents') approved = models.BooleanField(null=False, blank=False, default=False) locale = models.CharField(max_length=255, help_text="Locale where the PUG meets, e.g. 'New York City'") title = models.CharField(max_length=255, help_text="Title/Name of the PUG, e.g. 'NYC PostgreSQL User Group'") diff --git a/pgweb/util/admin.py b/pgweb/util/admin.py index 21e2b8da..e68041a9 100644 --- a/pgweb/util/admin.py +++ b/pgweb/util/admin.py @@ -63,7 +63,7 @@ class PgwebAdmin(admin.ModelAdmin): if not obj.org.email: # Should not happen because we remove the form field. Thus # a hard exception is ok. - raise Exception("Organization does not have an email, canot send notification!") + raise Exception("Organisation does not have an email, canot send notification!") n = ModerationNotification() n.objecttype = obj.__class__.__name__ n.objectid = obj.id diff --git a/templates/admin/change_form_pgweb.html b/templates/admin/change_form_pgweb.html index 4dcc115d..4ca5bbe5 100644 --- a/templates/admin/change_form_pgweb.html +++ b/templates/admin/change_form_pgweb.html @@ -35,7 +35,7 @@ Note that the summary field can use

{%if original.org.email%} -New notification: (Note! This comment is emailed to the organization!)
+New notification: (Note! This comment is emailed to the organisation!)
To send a notification on rejection, first add the notification above and hit "Save and continue editing". Then as a separate step, delete the record. {%else%} diff --git a/templates/pages/about/donate.html b/templates/pages/about/donate.html index 9751681d..6f8d7651 100644 --- a/templates/pages/about/donate.html +++ b/templates/pages/about/donate.html @@ -24,11 +24,11 @@ It focuses on Education, User Groups, and Advocacy. Recognised PostgreSQL Nonprofit Organizations (NPOs) become recognised, please review the guidelines here. +

For information about how Recognised PostgreSQL Nonprofit Organisations (NPOs) become recognised, please review the guidelines here.

Questions

If you have any questions about donations please contact either the PostgreSQL Funds Group or the -respective organization you are donating to. +respective organisation you are donating to.

{%endblock%} diff --git a/templates/pages/about/privacypolicy.html b/templates/pages/about/privacypolicy.html index 995097aa..b924a2c3 100644 --- a/templates/pages/about/privacypolicy.html +++ b/templates/pages/about/privacypolicy.html @@ -3,12 +3,12 @@ {%block contents%}

Privacy Policy

When you visit our website, our servers automatically log your IP address and/or host name.

-

We store information such as your email address, name and locality only if you decide to send us such information by completing a survey, or registering as a user on one of our sites. We collect this information to help us improve the content of our sites, customize the layout of our web pages and to contact people for technical and support purposes. We will not share your email address with other organizations unless required by law.

+

We store information such as your email address, name and locality only if you decide to send us such information by completing a survey, or registering as a user on one of our sites. We collect this information to help us improve the content of our sites, customize the layout of our web pages and to contact people for technical and support purposes. We will not share your email address with other organisations unless required by law.

If you submit content to the website, such as listing your company as a service provider, the information you submitted will be published.

If you post a message to one of our public mailinglists, your sending email address and any content of the email will be published, and archived, -both by us and by other organizations. These archives are permanent, and +both by us and by other organisations. These archives are permanent, and posted emails are not removed. By sending a message to one of these lists you implicitly grant permission for this archival, overriding any disclaimers in the message itself.

diff --git a/templates/pages/community/recognition.html b/templates/pages/community/recognition.html index 8d042f62..bdec51b8 100644 --- a/templates/pages/community/recognition.html +++ b/templates/pages/community/recognition.html @@ -11,7 +11,7 @@