Merge branch 'master' into 'master'

Fix typo in templates

See merge request !1

src/templates/articles/article-editor.twig

@@ -9,7 +9,7 @@
             <div class="block">
                 <div class="block-heading"><h2>Submitting a new article</h2></div>
                 <div class="block-content"> 
-                    Articles typically run from 400 to 1,200 words, but submissions of any length will be considered. All submissions must be original. We will not consider articles that have already been published, in any form, unless your claim as original author can be veriefed or consent from the original authour has been obtained.
+                    Articles typically run from 400 to 1,200 words, but submissions of any length will be considered. All submissions must be original. We will not consider articles that have already been published, in any form, unless your claim as original author can be verified or consent from the original author has been obtained.
                 </div>
             </div>
         {% endif %}

src/templates/discussions/view.twig

@@ -41,7 +41,7 @@
                     </div>
                 {% elseif thread.locked %}
                     <div class="msg msg--info">
-                        Discussion thread has been locked. You can no longer add new posts
+                        Discussion thread has been locked. You can no longer add new posts.
 
                         {% if thread.isEditable %}
                             <a class='right' href='{{ thread.permalink }}/unlock' csrf>Unlock</a>
@@ -49,11 +49,11 @@
                     </div>
                 {% elseif user and not user.hasPrivilege('contribute') %}
                     <div class="msg msg--error">
-                        You have been banned from contributing to this site
+                        You have been banned from contributing to this site.
                     </div>
                 {% else %}
                     <div class="msg msg--info">
-                        You must be logged in to reply to this discussion
+                        You must be logged in to reply to this discussion.
                         <a class='right' href='/auth'>Login</a>
                     </div>
                 {% endif %}

src/templates/layout/main.twig

@@ -7,7 +7,7 @@
     {% block content %}{% endblock %}
 
     <div class="cookies">
-        <p>This site only uses cookies that are essential for the funcationality of this website. Cookies are not used for tracking or marketing purposes.</p>
+        <p>This site only uses cookies that are essential for the functionality of this website. Cookies are not used for tracking or marketing purposes.</p>
         <p>By using our site, you acknowledge that you have read and understand our <a href='/legal/privacy'>Privacy Policy</a>, and <a href='/legal/terms'>Terms of Service</a>.</p>
         <a href='#' class='button button--wide button--main right'>Dismiss</a>
     </div>

src/templates/legal/privacy.twig

@@ -5,7 +5,7 @@
     <div id="content" class="container container--wide profile">
         <div class="block">
             <div class="block-heading">
-                <h1>Code of Conduct</h1>
+                <h1>Privacy Policy</h1>
             </div>
             <div class="block-content">
 

src/templates/notifications.twig

@@ -24,7 +24,7 @@
                         {% endif %}
                     {% endfor %}
                 {% else %}
-                    No notifications recieved in the last 30 days
+                    No notifications received in the last 30 days
                 {% endif %}
             </div>
         </div>

src/templates/shop/donations.twig

@@ -46,7 +46,7 @@
                         <h2>£5</h2>
                     </div>
                     <div class="block-content">
-                        <p>Be awarded the donator medal and have a heart displayed next to your username through out the site. Also hide all adverts, forever.</p>
+                        <p>Be awarded the donator medal and have a heart displayed next to your username throughout the site. Also hide all adverts, forever.</p>
                         <a href='#' data-amount="5" class='button button--wide'>Select this tier</a>
                     </div>
                 </div>
@@ -66,7 +66,7 @@
                         <h2>£50</h2>
                     </div>
                     <div class="block-content">
-                        <p>Adopt your favourite playground level and have your details promonently displayed for all to see. You will also recieve all perks from the first two tiers</p>
+                        <p>Adopt your favourite playground level and have your details prominently displayed for all to see. You will also receive all perks from the first two tiers</p>
                         <a href='#' data-amount="50" class='button button--wide'>Select this tier</a>
                     </div>
                 </div>