diff --git a/bans.php b/bans.php index 7a038c1..9dd6f8c 100644 --- a/bans.php +++ b/bans.php @@ -16,12 +16,12 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - $page->t("bans_player") => $page->get_avatar($player_name, $row['uuid']), - $page->t("bans_by") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - $page->t("bans_reason") => $page->clean($row['reason']), - $page->t("bans_when") => $page->millis_to_date($row['time']), - $page->t("bans_expiry") => $page->expiry($row), - $page->t("column_server") => $page->server($row), + $page->t("table.player") => $page->get_avatar($player_name, $row['uuid']), + $page->t("table.executor") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + $page->t("table.reason") => $page->clean($row['reason']), + $page->t("table.date") => $page->millis_to_date($row['time']), + $page->t("table.expires") => $page->expiry($row), + $page->t("table.server.name") => $page->server($row), )); } $page->table_end(); diff --git a/check.php b/check.php index a7a00c1..43e2998 100644 --- a/check.php +++ b/check.php @@ -6,7 +6,7 @@ class Check { $page = new Page("check", false); // validate user input if (strlen($name) > 16 || !preg_match("/^[0-9a-zA-Z_]{1,16}$/", $name)) { - $this->println($page->t("check_invalid")); + $this->println($page->t("error.name.invalid")); return; } $history = $page->settings->table['history']; @@ -32,7 +32,7 @@ class Check { return; } $name = htmlspecialchars($name, ENT_QUOTES, 'UTF-8'); - $this->println("$name " . $page->t("check_notjoin")); + $this->println(str_replace("{name}", $name, $page->t("error.name.unseen"))); return; } $href = "history.php?uuid=$uuid"; diff --git a/history.php b/history.php index 142726e..4bf945c 100644 --- a/history.php +++ b/history.php @@ -69,20 +69,21 @@ class History { $page = new Page("history"); -isset($_GET['uuid']) && is_string($_GET['uuid']) or die($page->t("history_missinguuid")); +isset($_GET['uuid']) && is_string($_GET['uuid']) or die($page->t("error.missing-args")); $staffhistory = (isset($_GET['staffhistory']) && $_GET['staffhistory'] === "1"); $uuid = $_GET['uuid']; $name = $page->get_name($uuid); -$name !== null or die($page->t("history_playernotfound")); +$name !== null or die(str_replace("{name}", $name, $page->t("error.name.unseen"))); if ($staffhistory) { - $page->title = $page->t("history_recentby") . $name; + $page->title = $page->t("title.staff-history"); } else { - $page->title = $page->t("history_recentfor") . $name; + $page->title = $page->t("title.player-history"); } +$page->title = str_replace("{name}", $name, $page->title); $page->print_title(); @@ -164,13 +165,13 @@ try { $label = "$label_name"; $page->print_table_rows($row, array( - $page->t("history_tabletype") => $label, - $page->t("history_tableplayer") => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']), - $page->t("history_tablemoderator") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - $page->t("history_tablereason") => $page->clean($row['reason']), - $page->t("history_tabledate") => $page->millis_to_date($row['time']), - $page->t("history_tableexpires") => $page->expiry($row), - $page->t("column_server") => $page->server($row), + $page->t("generic.type") => $label, + $page->t("table.player") => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']), + $page->t("table.executor") => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), + $page->t("table.reason") => $page->clean($row['reason']), + $page->t("table.date") => $page->millis_to_date($row['time']), + $page->t("table.expires") => $page->expiry($row), + $page->t("table.server.name") => $page->server($row), //'i' => $i . "/" . $limit . "/" . $total, )); } @@ -199,11 +200,12 @@ try { $page->print_pager($total, $args, $prevargs); } } else { - echo $page->t("history_nopunishments") . "
"; + echo $page->t("history.error.uuid.no-result") . "
"; } if ($from_href !== null) { - echo "
" . $page->t("history_returnto") . " $from_title "; + $btnlabel = str_replace("{origin}", $from_title, $page->t("action.return")); + echo "
$btnlabel "; } $page->print_footer(); diff --git a/inc/header.php b/inc/header.php index 460cb95..6e48a67 100644 --- a/inc/header.php +++ b/inc/header.php @@ -94,11 +94,11 @@ $settings = $this->page->settings;