Fix next_password_change* calculations and messages. refs #9972

users/views.py

@@ -147,7 +147,12 @@ class UserMixin(OctonetMixin):
             self.user['last_password_change_days'] = _("0 day(s) ago")
         next_password_change = last_password_change + datetime.timedelta(days=shadowMax)
         self.user['next_password_change'] = next_password_change.strftime("%Y-%m-%d")
-        self.user['next_password_change_days'] = _("in {} day(s)").format((next_password_change - today).days)
+        if next_password_change < today:
+            self.user['next_password_change_days'] = _("{} day(s) ago").format((today - next_password_change).days)
+        elif next_password_change > today:
+            self.user['next_password_change_days'] = _("in {} day(s)").format((next_password_change - today).days)
+        else:
+            self.user['next_password_change_days'] = _("Today!")
 
     def get_context_data(self, **kw):
         ctx = super().get_context_data(**kw)