From c870f6e87d5791b66ee984bc7461cdd8a80b47c5 Mon Sep 17 00:00:00 2001
From: Josh O'Brien <Josh@OBrien.in>
Date: Thu, 19 Mar 2020 13:10:10 +1100
Subject: [PATCH] English Language V2

---
 cps/__init__.py                                     |   0
 cps/comic.py                                        |   0
 cps/db.py                                           |   0
 cps/server.py                                       |   0
 cps/shelf.py                                        |   4 ++--
 cps/static/js/libs/tinymce/license.txt              |   0
 .../tinymce/skins/lightgray/content.inline.min.css  |   0
 .../js/libs/tinymce/skins/lightgray/content.min.css |   0
 .../tinymce/skins/lightgray/fonts/tinymce-small.eot | Bin
 .../tinymce/skins/lightgray/fonts/tinymce-small.svg |   0
 .../tinymce/skins/lightgray/fonts/tinymce-small.ttf | Bin
 .../skins/lightgray/fonts/tinymce-small.woff        | Bin
 .../libs/tinymce/skins/lightgray/fonts/tinymce.eot  | Bin
 .../libs/tinymce/skins/lightgray/fonts/tinymce.svg  |   0
 .../libs/tinymce/skins/lightgray/fonts/tinymce.ttf  | Bin
 .../libs/tinymce/skins/lightgray/fonts/tinymce.woff | Bin
 .../js/libs/tinymce/skins/lightgray/img/anchor.gif  | Bin
 .../js/libs/tinymce/skins/lightgray/img/loader.gif  | Bin
 .../js/libs/tinymce/skins/lightgray/img/object.gif  | Bin
 .../js/libs/tinymce/skins/lightgray/img/trans.gif   | Bin
 .../js/libs/tinymce/skins/lightgray/skin.min.css    |   0
 .../js/libs/tinymce/themes/inlite/theme.min.js      |   0
 .../js/libs/tinymce/themes/modern/theme.min.js      |   0
 cps/templates/admin.html                            |   4 ++--
 cps/templates/index.html                            |   0
 cps/templates/modal_restriction.html                |  10 +++++-----
 cps/templates/user_edit.html                        |   4 ++--
 cps/web.py                                          |   6 +++---
 28 files changed, 14 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 cps/__init__.py
 mode change 100755 => 100644 cps/comic.py
 mode change 100755 => 100644 cps/db.py
 mode change 100755 => 100644 cps/server.py
 mode change 100755 => 100644 cps/static/js/libs/tinymce/license.txt
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/content.min.css
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.eot
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.ttf
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.woff
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.eot
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.ttf
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.woff
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/img/anchor.gif
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/img/loader.gif
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/img/object.gif
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/img/trans.gif
 mode change 100755 => 100644 cps/static/js/libs/tinymce/skins/lightgray/skin.min.css
 mode change 100755 => 100644 cps/static/js/libs/tinymce/themes/inlite/theme.min.js
 mode change 100755 => 100644 cps/static/js/libs/tinymce/themes/modern/theme.min.js
 mode change 100755 => 100644 cps/templates/index.html

diff --git a/cps/__init__.py b/cps/__init__.py
old mode 100755
new mode 100644
diff --git a/cps/comic.py b/cps/comic.py
old mode 100755
new mode 100644
diff --git a/cps/db.py b/cps/db.py
old mode 100755
new mode 100644
diff --git a/cps/server.py b/cps/server.py
old mode 100755
new mode 100644
diff --git a/cps/shelf.py b/cps/shelf.py
index afee1eaa..bb3a42b5 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -216,9 +216,9 @@ def create_shelf():
                 flash(_(u"Shelf %(title)s created", title=to_save["title"]), category="success")
             except Exception:
                 flash(_(u"There was an error"), category="error")
-        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"create a shelf"), page="shelfcreate")
+        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Create a Shelf"), page="shelfcreate")
     else:
-        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"create a shelf"), page="shelfcreate")
+        return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Create a Shelf"), page="shelfcreate")
 
 
 @shelf.route("/shelf/edit/<int:shelf_id>", methods=["GET", "POST"])
diff --git a/cps/static/js/libs/tinymce/license.txt b/cps/static/js/libs/tinymce/license.txt
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css b/cps/static/js/libs/tinymce/skins/lightgray/content.inline.min.css
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/content.min.css b/cps/static/js/libs/tinymce/skins/lightgray/content.min.css
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.eot b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.eot
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.svg
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.ttf b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.ttf
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.woff b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce-small.woff
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.eot b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.eot
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.svg
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.ttf b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.ttf
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.woff b/cps/static/js/libs/tinymce/skins/lightgray/fonts/tinymce.woff
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/anchor.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/anchor.gif
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/loader.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/loader.gif
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/object.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/object.gif
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/img/trans.gif b/cps/static/js/libs/tinymce/skins/lightgray/img/trans.gif
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/skins/lightgray/skin.min.css b/cps/static/js/libs/tinymce/skins/lightgray/skin.min.css
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/themes/inlite/theme.min.js b/cps/static/js/libs/tinymce/themes/inlite/theme.min.js
old mode 100755
new mode 100644
diff --git a/cps/static/js/libs/tinymce/themes/modern/theme.min.js b/cps/static/js/libs/tinymce/themes/modern/theme.min.js
old mode 100755
new mode 100644
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 5b2ad78c..69deee09 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -15,7 +15,7 @@
             <th>{{_('Downloads')}}</th>
             <th class="hidden-xs">{{_('Admin')}}</th>
             <th class="hidden-xs">{{_('Download')}}</th>
-            <th class="hidden-xs">{{_('View eBooks')}}</th>
+            <th class="hidden-xs">{{_('View Books')}}</th>
             <th class="hidden-xs">{{_('Upload')}}</th>
             <th class="hidden-xs">{{_('Edit')}}</th>
         </tr>
@@ -58,7 +58,7 @@
           <td class="hidden-xs">{{email.mail_from}}</td>
         </tr>
       </table>
-      <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('admin.edit_mailsettings')}}">{{_('Change SMTP settings')}}</a></div>
+      <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('admin.edit_mailsettings')}}">{{_('Edit E-mail Server Settings')}}</a></div>
     </div>
   </div>
 
diff --git a/cps/templates/index.html b/cps/templates/index.html
old mode 100755
new mode 100644
diff --git a/cps/templates/modal_restriction.html b/cps/templates/modal_restriction.html
index ede585d7..aa8678df 100644
--- a/cps/templates/modal_restriction.html
+++ b/cps/templates/modal_restriction.html
@@ -3,10 +3,10 @@
   <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h4 class="modal-title hidden" id="h1">{{_('Select allowed/denied Tags')}}</h4>
-        <h4 class="modal-title hidden" id="h2">{{_('Select allowed/denied Custom Column values')}}</h4>
-        <h4 class="modal-title hidden" id="h3">{{_('Select allowed/denied Tags of user')}}</h4>
-        <h4 class="modal-title hidden" id="h4">{{_('Select allowed/denied Custom Column values of user')}}</h4>
+        <h4 class="modal-title hidden" id="h1">{{_('Select Allowed/Denied Tags')}}</h4>
+        <h4 class="modal-title hidden" id="h2">{{_('Select Allowed/Denied Custom Columns')}}</h4>
+        <h4 class="modal-title hidden" id="h3">{{_('Select Allowed/Denied Tags')}}</h4>
+        <h4 class="modal-title hidden" id="h4">{{_('Select Allowed/Denied Custom Columns')}}</h4>
       </div>
       <div class="modal-body">
           <table class="table table-no-bordered" id="restrict-elements-table" data-id-field="id" data-show-header="false" data-editable-mode="inline">
@@ -21,7 +21,7 @@
           </table>
           <form id="add_restriction" action="" method="POST">
           <div class="form-group required">
-            <label for="add_element">{{_('Add View Restriction')}}</label>
+            <label for="add_element">{{_('Add New Restriction')}}</label>
             <input type="text" class="form-control" name="add_element" id="add_element" >
           </div>
           <div class="form-group required">
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 2b1640c3..bc25b7e0 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -80,8 +80,8 @@
           <label for="Show_detail_random">{{_('Show Random Books')}}</label>
       </div>
       {% if ( g.user and g.user.role_admin() and not new_user ) %}
-      <a href="#" id="get_user_tags" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/denied Tags')}}</a>
-      <a href="#" id="get_user_column_values" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/denied custom column values')}}</a>
+      <a href="#" id="get_user_tags" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Edit Tag Restrictions')}}</a>
+      <a href="#" id="get_user_column_values" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Edit Custom Column Restrictions')}}</a>
       {% endif %}
     </div>
       <div class="col-sm-6">
diff --git a/cps/web.py b/cps/web.py
index 8f273faf..b5aa3c5c 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1057,13 +1057,13 @@ def send_to_kindle(book_id, book_format, convert):
         result = send_mail(book_id, book_format, convert, current_user.kindle_mail, config.config_calibre_dir,
                                   current_user.nickname)
         if result is None:
-            flash(_(u"Book successfully queued for sending to %(kindlemail)s", kindlemail=current_user.kindle_mail),
+            flash(_(u"Success! Selected book has been sent to your Kindle (%(kindlemail)s)", kindlemail=current_user.kindle_mail),
                   category="success")
             ub.update_download(book_id, int(current_user.id))
         else:
-            flash(_(u"There was an error sending this book: %(res)s", res=result), category="error")
+            flash(_(u"Oops! There was an error sending this book: %(res)s", res=result), category="error")
     else:
-        flash(_(u"Please configure your kindle e-mail address first..."), category="error")
+        flash(_(u"Please update your profile with a valid Send to Kindle E-mail Address."), category="error")
     if "HTTP_REFERER" in request.environ:
         return redirect(request.environ["HTTP_REFERER"])
     else: