Skip to content

Commit

Permalink
Merge pull request #21 from lie2815/fluxbb-2.0-gettext
Browse files Browse the repository at this point in the history 
#367: Start of a new translation system.
  • Loading branch information
@franzliedke
franzliedke committed Sep 19, 2011
2 parents 3066aea + 664cb8b commit 2aa7af9
Show file tree
Hide file tree
Showing 36 changed files with 1,066 additions and 539 deletions.
12 changes: 6 additions & 6 deletions admin_bans.php
View file
Expand Up @@ -15,7 +15,7 @@


if ($pun_user['g_id'] != PUN_ADMIN && ($pun_user['g_moderator'] != '1' || $pun_user['g_mod_ban_users'] == '0'))
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_bans.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_bans.php';
Expand All @@ -30,7 +30,7 @@
{
$user_id = intval($_GET['add_ban']);
if ($user_id < 2)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$result = $db->query('SELECT group_id, username, email FROM '.$db->prefix.'users WHERE id='.$user_id) or error('Unable to fetch user info', __FILE__, __LINE__, $db->error());
if ($db->num_rows($result))
Expand Down Expand Up @@ -84,13 +84,13 @@
{
$ban_id = intval($_GET['edit_ban']);
if ($ban_id < 1)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$result = $db->query('SELECT username, ip, email, message, expire FROM '.$db->prefix.'bans WHERE id='.$ban_id) or error('Unable to fetch ban info', __FILE__, __LINE__, $db->error());
if ($db->num_rows($result))
list($ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire) = $db->fetch_row($result);
else
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$diff = ($pun_user['timezone'] + $pun_user['dst']) * 3600;
$ban_expire = ($ban_expire != '') ? gmdate('Y-m-d', $ban_expire + $diff) : '';
Expand Down Expand Up @@ -305,7 +305,7 @@

$ban_id = intval($_GET['del_ban']);
if ($ban_id < 1)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$db->query('DELETE FROM '.$db->prefix.'bans WHERE id='.$ban_id) or error('Unable to delete ban', __FILE__, __LINE__, $db->error());

Expand Down Expand Up @@ -375,7 +375,7 @@
$start_from = 50 * ($p - 1);

// Generate paging links
$paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'admin_bans.php?find_ban=&amp;'.implode('&amp;', $query_str));
$paging_links = '<span class="pages-label">'.$lang->t('Pages').' </span>'.paginate($num_pages, $p, 'admin_bans.php?find_ban=&amp;'.implode('&amp;', $query_str));

$page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Bans'], $lang_admin_bans['Results head']);
define('PUN_ACTIVE_PAGE', 'admin');
Expand Down
6 changes: 3 additions & 3 deletions admin_categories.php
View file
Expand Up @@ -15,7 +15,7 @@


if ($pun_user['g_id'] != PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_categories.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_categories.php';
Expand All @@ -41,7 +41,7 @@

$cat_to_delete = intval($_POST['cat_to_delete']);
if ($cat_to_delete < 1)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

if (isset($_POST['del_cat_comply'])) // Delete a category with all forums and posts
{
Expand Down Expand Up @@ -125,7 +125,7 @@

$categories = $_POST['cat'];
if (empty($categories))
message($lang_common['Bad request']);
message($lang->t('Bad request'));

foreach ($categories as $cat_id => $cur_cat)
{
Expand Down
2 changes: 1 addition & 1 deletion admin_censoring.php
View file
Expand Up @@ -15,7 +15,7 @@


if ($pun_user['g_id'] != PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_censoring.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_censoring.php';
Expand Down
12 changes: 6 additions & 6 deletions admin_forums.php
View file
Expand Up @@ -15,7 +15,7 @@


if ($pun_user['g_id'] != PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_forums.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_forums.php';
Expand All @@ -27,7 +27,7 @@

$add_to_cat = intval($_POST['add_to_cat']);
if ($add_to_cat < 1)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$db->query('INSERT INTO '.$db->prefix.'forums (forum_name, cat_id) VALUES(\''.$db->escape($lang_admin_forums['New forum']).'\', '.$add_to_cat.')') or error('Unable to create forum', __FILE__, __LINE__, $db->error());

Expand All @@ -44,7 +44,7 @@

$forum_id = intval($_GET['del_forum']);
if ($forum_id < 1)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

if (isset($_POST['del_forum_comply'])) // Delete a forum with all posts
{
Expand Down Expand Up @@ -138,7 +138,7 @@
{
$forum_id = intval($_GET['edit_forum']);
if ($forum_id < 1)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

// Update group permissions for $forum_id
if (isset($_POST['save']))
Expand All @@ -156,7 +156,7 @@
message($lang_admin_forums['Must enter name message']);

if ($cat_id < 1)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$forum_desc = ($forum_desc != '') ? '\''.$db->escape($forum_desc).'\'' : 'NULL';
$redirect_url = ($redirect_url != '') ? '\''.$db->escape($redirect_url).'\'' : 'NULL';
Expand Down Expand Up @@ -210,7 +210,7 @@
// Fetch forum info
$result = $db->query('SELECT id, forum_name, forum_desc, redirect_url, num_topics, sort_by, cat_id FROM '.$db->prefix.'forums WHERE id='.$forum_id) or error('Unable to fetch forum info', __FILE__, __LINE__, $db->error());
if (!$db->num_rows($result))
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$cur_forum = $db->fetch_assoc($result);

Expand Down
12 changes: 6 additions & 6 deletions admin_groups.php
View file
Expand Up @@ -15,7 +15,7 @@


if ($pun_user['g_id'] != PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_censoring.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_groups.php';
Expand All @@ -36,11 +36,11 @@
{
$group_id = intval($_GET['edit_group']);
if ($group_id < 1)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$result = $db->query('SELECT * FROM '.$db->prefix.'groups WHERE g_id='.$group_id) or error('Unable to fetch user group info', __FILE__, __LINE__, $db->error());
if (!$db->num_rows($result))
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$group = $db->fetch_assoc($result);

Expand Down Expand Up @@ -319,12 +319,12 @@

// Make sure it's not the admin or guest groups
if ($group_id == PUN_ADMIN || $group_id == PUN_GUEST)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

// Make sure it's not a moderator group
$result = $db->query('SELECT 1 FROM '.$db->prefix.'groups WHERE g_id='.$group_id.' AND g_moderator=0') or error('Unable to check group moderator status', __FILE__, __LINE__, $db->error());
if (!$db->num_rows($result))
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$db->query('UPDATE '.$db->prefix.'config SET conf_value='.$group_id.' WHERE conf_name=\'o_default_user_group\'') or error('Unable to update board config', __FILE__, __LINE__, $db->error());

Expand All @@ -342,7 +342,7 @@

$group_id = isset($_POST['group_to_delete']) ? intval($_POST['group_to_delete']) : intval($_GET['del_group']);
if ($group_id < 5)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

// Make sure we don't remove the default group
if ($group_id == $pun_config['o_default_user_group'])
Expand Down
2 changes: 1 addition & 1 deletion admin_index.php
View file
Expand Up @@ -15,7 +15,7 @@


if (!$pun_user['is_admmod'])
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_index.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_index.php';
Expand Down
2 changes: 1 addition & 1 deletion admin_maintenance.php
View file
Expand Up @@ -17,7 +17,7 @@


if ($pun_user['g_id'] != PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_maintenance.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_maintenance.php';
Expand Down
14 changes: 7 additions & 7 deletions admin_options.php
View file
Expand Up @@ -15,7 +15,7 @@


if ($pun_user['g_id'] != PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_options.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_options.php';
Expand Down Expand Up @@ -96,11 +96,11 @@

$languages = forum_list_langs();
if (!in_array($form['default_lang'], $languages))
message($lang_common['Bad request']);
message($lang->t('Bad request'));

$styles = forum_list_styles();
if (!in_array($form['default_style'], $styles))
message($lang_common['Bad request']);
message($lang->t('Bad request'));

if ($form['time_format'] == '')
$form['time_format'] = 'H:i:s';
Expand Down Expand Up @@ -175,16 +175,16 @@
$form['disp_posts_default'] = 75;

if ($form['feed_type'] < 0 || $form['feed_type'] > 2)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

if ($form['feed_ttl'] < 0)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

if ($form['report_method'] < 0 || $form['report_method'] > 2)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

if ($form['default_email_setting'] < 0 || $form['default_email_setting'] > 2)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

if ($form['timeout_online'] >= $form['timeout_visit'])
message($lang_admin_options['Timeout error message']);
Expand Down
2 changes: 1 addition & 1 deletion admin_permissions.php
View file
Expand Up @@ -15,7 +15,7 @@


if ($pun_user['g_id'] != PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_permissions.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_permissions.php';
Expand Down
2 changes: 1 addition & 1 deletion admin_ranks.php
View file
Expand Up @@ -15,7 +15,7 @@


if ($pun_user['g_id'] != PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_ranks.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_ranks.php';
Expand Down
2 changes: 1 addition & 1 deletion admin_reports.php
View file
Expand Up @@ -15,7 +15,7 @@


if (!$pun_user['is_admmod'])
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_reports.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_reports.php';
Expand Down
18 changes: 9 additions & 9 deletions admin_users.php
View file
Expand Up @@ -15,7 +15,7 @@


if (!$pun_user['is_admmod'])
message($lang_common['No permission']);
message($lang->t('No permission'));

// Load the admin_users.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_users.php';
Expand All @@ -25,7 +25,7 @@
{
$ip_stats = intval($_GET['ip_stats']);
if ($ip_stats < 1)
message($lang_common['Bad request']);
message($lang->t('Bad request'));

// Fetch ip count
$result = $db->query('SELECT poster_ip, MAX(posted) AS last_used FROM '.$db->prefix.'posts WHERE poster_id='.$ip_stats.' GROUP BY poster_ip') or error('Unable to fetch post info', __FILE__, __LINE__, $db->error());
Expand All @@ -38,7 +38,7 @@
$start_from = 50 * ($p - 1);

// Generate paging links
$paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'admin_users.php?ip_stats='.$ip_stats );
$paging_links = '<span class="pages-label">'.$lang->t('Pages').' </span>'.paginate($num_pages, $p, 'admin_users.php?ip_stats='.$ip_stats );

$page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
define('PUN_ACTIVE_PAGE', 'admin');
Expand Down Expand Up @@ -139,7 +139,7 @@
$start_from = 50 * ($p - 1);

// Generate paging links
$paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'admin_users.php?show_users='.$ip);
$paging_links = '<span class="pages-label">'.$lang->t('Pages').' </span>'.paginate($num_pages, $p, 'admin_users.php?show_users='.$ip);

$page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Users'], $lang_admin_users['Results head']);
define('PUN_ACTIVE_PAGE', 'admin');
Expand Down Expand Up @@ -257,7 +257,7 @@
else if (isset($_POST['move_users']) || isset($_POST['move_users_comply']))
{
if ($pun_user['g_id'] > PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

confirm_referrer('admin_users.php');

Expand Down Expand Up @@ -383,7 +383,7 @@
else if (isset($_POST['delete_users']) || isset($_POST['delete_users_comply']))
{
if ($pun_user['g_id'] > PUN_ADMIN)
message($lang_common['No permission']);
message($lang->t('No permission'));

confirm_referrer('admin_users.php');

Expand Down Expand Up @@ -529,7 +529,7 @@
else if (isset($_POST['ban_users']) || isset($_POST['ban_users_comply']))
{
if ($pun_user['g_id'] != PUN_ADMIN && ($pun_user['g_moderator'] != '1' || $pun_user['g_mod_ban_users'] == '0'))
message($lang_common['No permission']);
message($lang->t('No permission'));

confirm_referrer('admin_users.php');

Expand Down Expand Up @@ -790,7 +790,7 @@
$start_from = 50 * ($p - 1);

// Generate paging links
$paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.paginate($num_pages, $p, 'admin_users.php?find_user=&amp;'.implode('&amp;', $query_str));
$paging_links = '<span class="pages-label">'.$lang->t('Pages').' </span>'.paginate($num_pages, $p, 'admin_users.php?find_user=&amp;'.implode('&amp;', $query_str));

// Some helper variables for permissions
$can_delete = $can_move = $pun_user['g_id'] == PUN_ADMIN;
Expand Down Expand Up @@ -847,7 +847,7 @@
$user_title = get_title($user_data);

// This script is a special case in that we want to display "Not verified" for non-verified users
if (($user_data['g_id'] == '' || $user_data['g_id'] == PUN_UNVERIFIED) && $user_title != $lang_common['Banned'])
if (($user_data['g_id'] == '' || $user_data['g_id'] == PUN_UNVERIFIED) && $user_title != $lang->t('Banned'))
$user_title = '<span class="warntext">'.$lang_admin_users['Not verified'].'</span>';

$actions = '<a href="admin_users.php?ip_stats='.$user_data['id'].'">'.$lang_admin_users['Results view IP link'].'</a> | <a href="search.php?action=show_user_posts&amp;user_id='.$user_data['id'].'">'.$lang_admin_users['Results show posts link'].'</a>';
Expand Down

0 comments on commit 2aa7af9

Please sign in to comment.