From a7eb547ca42303e72986a31e4652ea27c6a21f2c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Mar 2021 12:40:23 +0100
Subject: [PATCH 1/4] Renamed brazilian datepicker file

---
 ...-datepicker.pt-BR.min.js => bootstrap-datepicker.pt_BR.min.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename cps/static/js/libs/bootstrap-datepicker/locales/{bootstrap-datepicker.pt-BR.min.js => bootstrap-datepicker.pt_BR.min.js} (100%)

diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.pt-BR.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.pt_BR.min.js
similarity index 100%
rename from cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.pt-BR.min.js
rename to cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.pt_BR.min.js

From e35748deffe5390df096f0922bad2d9d2129fbb0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Mar 2021 17:30:54 +0100
Subject: [PATCH 2/4] Fix wording and tabs

---
 cps/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index 627cca0b..c804d801 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -96,12 +96,12 @@ def create_app():
         app.instance_path = app.instance_path.decode('utf-8')
 
     if os.environ.get('FLASK_DEBUG'):
-    	cache_buster.init_cache_busting(app)
+        cache_buster.init_cache_busting(app)
 
     log.info('Starting Calibre Web...')
     if sys.version_info < (3, 0):
-        log.info('Python2 is EOL since end of 2019, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
-        print('Python2 is EOL since end of 2019, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
+        log.info('Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2 please consider upgrading to Python3')
+        print('Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2 please consider upgrading to Python3')
     Principal(app)
     lm.init_app(app)
     app.secret_key = os.getenv('SECRET_KEY', config_sql.get_flask_session_key(ub.session))

From c418c7e7256929b238e3e708b6b19cc6737fed80 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Mar 2021 18:31:49 +0100
Subject: [PATCH 3/4] Prevent empty email from field (#1906)

---
 cps/templates/email_edit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index 9df0a385..5264ab58 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -33,7 +33,7 @@
     </div>
     <div class="form-group">
       <label for="mail_from">{{_('From E-mail')}}</label>
-      <input type="text" class="form-control" name="mail_from" id="mail_from" value="{{content.mail_from}}">
+      <input type="text" class="form-control" name="mail_from" id="mail_from" value="{{content.mail_from}}" required>
     </div>
     <label for="mail_size">{{_('Attachment Size Limit')}}</label>
      <div class="form-group input-group">

From 7a196fed7caf4f34b5f5ff7ac42a1aa59d577deb Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 27 Mar 2021 18:34:57 +0100
Subject: [PATCH 4/4] Prevent empty email port and server address(#1906)

---
 cps/templates/email_edit.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index 5264ab58..0dd9ef17 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -9,11 +9,11 @@
   <form role="form" class="col-md-10 col-lg-6" method="POST">
     <div class="form-group">
       <label for="mail_server">{{_('SMTP Hostname')}}</label>
-      <input type="text" class="form-control" name="mail_server" id="mail_server" value="{{content.mail_server}}">
+      <input type="text" class="form-control" name="mail_server" id="mail_server" value="{{content.mail_server}}" required>
     </div>
     <div class="form-group">
       <label for="mail_port">{{_('SMTP Port')}}</label>
-      <input type="number" min="1" max="65535" step="1" class="form-control" name="mail_port" id="mail_port" value="{% if content.mail_port != None %}{{ content.mail_port }}{% endif %}" autocomplete="off">
+      <input type="number" min="1" max="65535" step="1" class="form-control" name="mail_port" id="mail_port" value="{% if content.mail_port != None %}{{ content.mail_port }}{% endif %}" autocomplete="off" required>
     </div>
     <div class="form-group">
       <label for="mail_use_ssl">{{_('Encryption')}}</label>