Merge pull request #235 from whitesmith/naming-version-changes

Naming consistency changes and version bump
whitesmith · Apr 13, 2017 · 594acec · 594acec
2 parents 4b31acf + e20d2a5
commit 594acec
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 19 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 # Contributing to Hawkpost
 
-Given this is an unfinished project and many features are still missing, you are more than welcome to join in and help improve HawkPost. The project will mostly use the Github issues to keep track of bugs, feature requests and milestones. So and account should be all you need to start contributing.
+Given this project is in active development, with the desire to continually provide more value and better serve its users, you are more than welcome to join in and help improve Hawkpost. The project will mostly use the Github issues to keep track of bugs, feature requests and milestones. So an account should be all you need to start contributing.
 
-Below are a few things we follow and would appreciate if you do to.
+Below are a few things we follow and would appreciate if you do too.
 
 ## Issues
 
@@ -24,11 +24,11 @@ and
 $ pip-compile requirements/base.in requirements/development.in -o requirements/requirements_dev.txt
 ```
 
-* Commit these changes alongside your code changes
+* Commit these changes alongside your other code modifications
 
 ## Style
 
-In order to facilitate the tasks of everyone who is contributing to this project, we have opted to present a few guidelines here about the style of code. These guidelines are not rigid and common sense should be taken into account when discussing this matter.
+In order to facilitate the task of everyone who is contributing to this project, we have opted to present a few guidelines here about the "code style" . These guidelines are not rigid and common sense should be taken into account when discussing this matter.
 
 For python code, unless it is prejudicial to the given situation or makes it harder to understand the code, you should follow the [PEP8](https://www.python.org/dev/peps/pep-0008/) convention.
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-HawkPost
+Hawkpost
 ========
 
-HawkPost lets you create unique links that you can share with the person that desires to send you important information but doesn't know how to deal with PGP.
+Hawkpost lets you create unique links that you can share with the person that desires to send you important information but doesn't know how to deal with PGP.
 
 You can deploy your own server using the code from this repository or use the official server (that is running an exact copy of this repo) at [https://hawkpost.co](https://hawkpost.co).
 
@@ -18,12 +18,7 @@ The way it works is like this:
 1. Finally the server forwards it to your e-mail address.
 
 
-## Disclaimer
-
-This project is in `beta` state. This means it is not 100% ready and you should **use it at your own risk**.
-
-
-# Getting started
+# Setting up a development environment
 
 In this section you can find the steps to setup a minimal development environment on your machine.
 

diff --git a/hawkpost/templates/account/auth_modals.html b/hawkpost/templates/account/auth_modals.html
@@ -9,7 +9,7 @@
       <form class="login smalltext text-lightest" id="login-form-js" method="POST" action="{% url 'account_login' %}">
         <div class="col-xs-12">
           <h3 class="title text-lightest">{% trans "LOGIN" %}</h3>
-          <p>{% blocktrans %}If you have not created an account yet, then please<a class=" md-trigger text-blue" href="#modal-signup" data-modal="modal-signup"><span>sign up</span></a>.{% endblocktrans %}</p>
+          <p>{% blocktrans %}If you have not created an account yet, then please <a class=" md-trigger text-blue" href="#modal-signup" data-modal="modal-signup"><span>sign up</span></a>.{% endblocktrans %}</p>
           <p class="no-padding">
             <div class="login-or">
               <p class="no-padding smalltext">{% trans "Login using your email address:" %}</p>

diff --git a/hawkpost/templates/layout/base.html b/hawkpost/templates/layout/base.html
@@ -4,7 +4,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>{% trans "HawkPost - Submit your content securely" %}</title>
+  <title>{% trans "Hawkpost - Submit your content securely" %}</title>
   {% block styles %}
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <!-- hp styles -->

diff --git a/humans/admin.py b/humans/admin.py
@@ -62,6 +62,6 @@ def send_notification(self, request, queryset):
     delete_selected.short_description = _('Delete selected notifications')
 
 
-admin.site.site_header = _('HawkPost Administration')
-admin.site.site_title = _('HawkPost Admin')
+admin.site.site_header = _('Hawkpost Administration')
+admin.site.site_title = _('Hawkpost Admin')
 admin.site.index_title = _('Project Models')
diff --git a/humans/templates/humans/update_user_form.html b/humans/templates/humans/update_user_form.html
@@ -63,7 +63,7 @@
                   <li class="section" id="section3">
                     <div class="col-xs-12 start-xs">
                       <span class="text-blue smalltext">
-                        The "Server signed" feature allows you to improve your security by allowing us to sign the (<strong>already encrypted</strong>) message with our key, so you can make sure the message really came from us. For now, the only e-mail clients confirmed to display this correctly are <strong>Evolution</strong> and <strong>mutt</strong>
+                        <p>The "Server signed" feature allows you to improve your security by allowing us to sign the (<strong>already encrypted</strong>) message with our key, so you can make sure the message really came from us. For now, the only e-mail clients that display this feature correctly are <strong>Evolution</strong> and <strong>mutt</strong></p>
                       </span>
                       <div class="checkbox-">
                         {{ form.server_signed.errors }} {{ form.server_signed.label_tag }}
@@ -72,7 +72,7 @@
                         </div>
                       </div>
                       <p class="smalltext no-margin">
-                        The key used to sign can be found <a class="text-blue" href="{{sign_key_url}}">here</a> and fingerprint so you can check it is:</p>
+                        The key used to sign can be found <a class="text-blue" href="{{sign_key_url}}">here</a> and the fingerprint, so you can verify it, is the following:</p>
                         <p class="no-margin smalltext text-darkest">{{sign_key_fingerprint}}</p>
                       </div>
                     </li>

diff --git a/humans/templates/humans/user_confirm_delete.html b/humans/templates/humans/user_confirm_delete.html
@@ -7,7 +7,7 @@
       <div class="row center-xs center-sm">
         <div class="col-xs-12 col-offset-sm-2 col-sm-8 col-offset-md-3 col-md-6 mb-normal">
           <h1 class="title text-light">DELETE ACCOUNT</h1>
-          <p>Your account in HawkPost is about to be deleted along with all its contents and settings. Are you sure you want to continue?</p>
+          <p>Your account in Hawkpost is about to be deleted along with all its contents and settings. Are you sure you want to continue?</p>
         </div>
     </div>
     <div class="row center-xs ">