From 260d6a67cc6abe7cd2e1a7d0c61a99675ae90244 Mon Sep 17 00:00:00 2001 From: ruan Date: Mon, 4 Dec 2017 06:44:23 +0200 Subject: [PATCH] Big refactor to locale system for fallback language support --- bans.php | 10 +-- check.php | 4 +- history.php | 24 +++---- inc/header.php | 10 +-- inc/page.php | 58 +++++++++------ index.php | 4 +- info.php | 50 ++++++------- kicks.php | 8 +-- lang/cs_CZ.utf8.php | 166 +++++++++++++++++++++---------------------- lang/da_DK.utf8.php | 165 +++++++++++++++++++++---------------------- lang/en_US.utf8.php | 167 ++++++++++++++++++++++---------------------- lang/es_ES.utf8.php | 166 +++++++++++++++++++++---------------------- lang/es_MX.utf8.php | 166 +++++++++++++++++++++---------------------- lang/it_IT.utf8.php | 165 +++++++++++++++++++++---------------------- lang/ja_JP.utf8.php | 165 +++++++++++++++++++++---------------------- lang/nl_NL.utf8.php | 165 +++++++++++++++++++++---------------------- mutes.php | 10 +-- warnings.php | 10 +-- 18 files changed, 771 insertions(+), 742 deletions(-) diff --git a/bans.php b/bans.php index 67df508..f2db419 100644 --- a/bans.php +++ b/bans.php @@ -16,11 +16,11 @@ foreach ($rows as $row) { if ($player_name === null) continue; $page->print_table_rows($row, array( - $page->lang->bans_player => $page->get_avatar($player_name, $row['uuid']), - $page->lang->bans_by => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - $page->lang->bans_reason => $page->clean($row['reason']), - $page->lang->bans_when => $page->millis_to_date($row['time']), - $page->lang->bans_expiry => $page->expiry($row), + $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->table_end(); diff --git a/check.php b/check.php index 83b45d5..a7a00c1 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->lang->check_invalid); + $this->println($page->t("check_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->lang->check_notjoin); + $this->println("$name " . $page->t("check_notjoin")); return; } $href = "history.php?uuid=$uuid"; diff --git a/history.php b/history.php index ea7135b..863dfaf 100644 --- a/history.php +++ b/history.php @@ -69,19 +69,19 @@ class History { $page = new Page("history"); -isset($_GET['uuid']) && is_string($_GET['uuid']) or die($page->lang->history_missinguuid); +isset($_GET['uuid']) && is_string($_GET['uuid']) or die($page->t("history_missinguuid")); $staffhistory = (isset($_GET['staffhistory']) && $_GET['staffhistory'] === "1"); $uuid = $_GET['uuid']; $name = $page->get_name($uuid); -$name !== null or die($page->lang->history_playernotfound); +$name !== null or die($page->t("history_playernotfound")); if ($staffhistory) { - $page->title = $page->lang->history_recentby . $name; + $page->title = $page->t("history_recentby") . $name; } else { - $page->title = $page->lang->history_recentfor . $name; + $page->title = $page->t("history_recentfor") . $name; } @@ -164,12 +164,12 @@ try { $label = "$label_name"; $page->print_table_rows($row, array( - $page->lang->history_tabletype => $label, - $page->lang->history_tableplayer => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']), - $page->lang->history_tablemoderator => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']), - $page->lang->history_tablereason => $page->clean($row['reason']), - $page->lang->history_tabledate => $page->millis_to_date($row['time']), - $page->lang->history_tableexpires => $page->expiry($row), + $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), //'i' => $i . "/" . $limit . "/" . $total, )); } @@ -198,11 +198,11 @@ try { $page->print_pager($total, $args, $prevargs); } } else { - echo $page->lang->history_nopunishments . "
"; + echo $page->t("history_nopunishments") . "
"; } if ($from_href !== null) { - echo "
" . $page->lang->history_returnto . " $from_title"; + echo "
" . $page->t("history_returnto") . " $from_title "; } $page->print_footer(); diff --git a/inc/header.php b/inc/header.php index 5dc3cd3..460cb95 100644 --- a/inc/header.php +++ b/inc/header.php @@ -94,11 +94,11 @@ $settings = $this->page->settings;