Improve account-disabled error messages.

etc/msgs.json

@@ -185,6 +185,7 @@
     ["badpost", "<0>Your browser session has changed since you last used this tab. Please try again."],
     ["session_failed_error", "<0>You appear to have disabled cookies in your browser. This site requires cookies to function."],
 
+    ["account_disabled", "<0>Your account on this site has been disabled by a site administrator"],
     ["signin_error", "{message:ftext}"],
     ["signin_error", "<5>User {email} does not currently have an account. Double-check the email address, or <a href=\"{newaccount}\">create the account</a> if you’d like.", ["{context}=no_account", "{newaccount}"]],
     ["signin_error", "<5>{message:ftext}. Use <a href=\"{forgotpassword}\">“Forgot your password?”</a> to reset it.", ["{context}=password_expired", "{forgotpassword}"]],

index.php

@@ -43,7 +43,7 @@ function handle_request($nav) {
         if (!$pagej || str_starts_with($pagej->name, "__")) {
             Multiconference::fail($qreq, 404, ["link" => true], "<0>Page not found");
         } else if ($user->is_disabled() && !($pagej->allow_disabled ?? false)) {
-            Multiconference::fail($qreq, 403, ["link" => true], "<0>Your account is disabled");
+            Multiconference::fail($qreq, 403, ["link" => true], $user->conf->_i("account_disabled"));
         } else {
             $pc->set_root($pagej->group);
             handle_request_components($user, $qreq, $pagej->group, $pc);

lib/fmt.php

@@ -328,6 +328,13 @@ function addj($m) {
         }
     }
 
+    /** @param string $id
+     * @param string $otext
+     * @param null|float|int $priority */
+    function define_template($id, $otext, $priority = null) {
+        $this->_addj_object((object) ["id" => $id, "otext" => $otext, "priority" => $priority, "template" => true]);
+    }
+
     /** @param string $id
      * @return bool */
     function has_override($id) {

lib/login.php

@@ -362,7 +362,7 @@ static function login_error(Conf $conf, $email, $info, $ms) {
                 $args[] = new FmtArg("newaccount", $conf->hoturl_raw("newaccount", ["email" => $email]));
             }
         } else if (isset($info["disabled"])) {
-            $e = "<0>Your account on this site is disabled. Contact the site administrator for more information.";
+            $e = $conf->_i("account_disabled");
         } else if (isset($info["reset"])) {
             $e = "<0>Your password has expired";
             $args[] = new FmtArg("context", "password_expired");

src/conference.php

@@ -4923,6 +4923,7 @@ function fmt() {
             if (($mlist = $this->opt("messageOverrides"))) {
                 expand_json_includes_callback($mlist, [$this->_fmt, "addj"]);
             }
+            $this->_fmt->define_template("site", "<0>" . $this->opt["paperSite"]);
         }
         if ($this->_fmt_override_names !== null) {
             foreach ($this->_fmt_override_names as $id) {
@@ -5131,7 +5132,7 @@ function call_api_on($uf, $fn, Contact $user, Qrequest $qreq, $prow) {
             return JsonResult::make_error(403, "<0>Missing credentials");
         } else if ($user->is_disabled()
                    && (!$uf || !($uf->allow_disabled ?? false))) {
-            return JsonResult::make_error(403, "<0>Your account is disabled");
+            return JsonResult::make_error(403, "<0>Disabled account");
         } else if (!$uf) {
             if ($this->has_api($fn, $user, null)) {
                 return JsonResult::make_error(405, "<0>Method not supported");

src/pages/p_home.php

@@ -33,8 +33,8 @@ function __construct(Contact $user) {
 
     static function disabled_request(Contact $user, Qrequest $qreq) {
         if (!$user->is_empty() && $user->is_disabled()) {
+            $user->conf->warning_msg($user->conf->_i("account_disabled"));
             $qreq->print_header("Account disabled", "home", ["action_bar" => ""]);
-            $user->conf->warning_msg("<0>Your account on this site has been disabled by a site administrator. Please contact them with questions.");
             $qreq->print_footer();
             exit;
         }