makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Finished switching to lang file I think

Browse source 
git-svn-id: file:///svn/phpbb/trunk@762 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-07-28 18:01:05 +00:00
parent ffed06e503
commit 8356cd0d05
3 changed files with 58 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
phpBB/admin/admin_groupauth.php
View file

@ -54,6 +54,8 @@ else if( $userdata['user_level'] != ADMIN )
// //
// Start program - define vars // Start program - define vars
// //
$forum_auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_sticky", "auth_announce");
$auth_field_match = array( $auth_field_match = array(
"auth_view" => AUTH_VIEW, "auth_view" => AUTH_VIEW,
"auth_read" => AUTH_READ, "auth_read" => AUTH_READ,
@ -64,25 +66,18 @@ $auth_field_match = array(
"auth_sticky" => AUTH_STICKY, "auth_sticky" => AUTH_STICKY,
"auth_announce" => AUTH_ANNOUNCE); "auth_announce" => AUTH_ANNOUNCE);
$forum_auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_sticky", "auth_announce"); $field_names = array(
"auth_view" => $lang['View'],
"auth_read" => $lang['Read'],
"auth_post" => $lang['Post'],
"auth_reply" => $lang['Reply'],
"auth_edit" => $lang['Edit'],
"auth_delete" => $lang['Delete'],
"auth_sticky" => $lang['Sticky'],
"auth_announce" => $lang['Announce']);
$forum_auth_key_fields = array("auth_view", "auth_read", "auth_post", "auth_reply"); $forum_auth_key_fields = array("auth_view", "auth_read", "auth_post", "auth_reply");
//
// Future stuff
//
//, "auth_votecreate", "auth_vote", "auth_attachments", "auth_allow_html", "auth_allow_bbcode", "auth_allow_smilies"
//
/* ,
"auth_vote" => AUTH_VOTE,
"auth_votecreate" => AUTH_VOTECREATE,
"auth_attachments" => AUTH_ATTACH,
"auth_allow_html" => AUTH_ALLOW_HTML
"auth_allow_bbcode" => AUTH_ALLOW_BBCODE
"auth_allow_smilies" => AUTH_ALLOW_SMILIES
);*/
// --------------- // ---------------
// Start Functions // Start Functions
@ -127,11 +122,6 @@ function a_auth_check_user($type, $key, $u_auth, $is_admin)
// ------------- // -------------
//
//
//
$adv = (isset($HTTP_GET_VARS['adv'])) ? $HTTP_GET_VARS['adv'] : -1;
if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_GROUPS_URL])) if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_GROUPS_URL]))
{ {
$group_id = $HTTP_POST_VARS[POST_GROUPS_URL]; $group_id = $HTTP_POST_VARS[POST_GROUPS_URL];
@ -747,15 +737,15 @@ else
$optionlist_acl = "<select name=\"private[$forumkey]\">"; $optionlist_acl = "<select name=\"private[$forumkey]\">";
if( $group_ary['auth_mod'] ) if( $group_ary['auth_mod'] )
{ {
$optionlist_acl .= "<option value=\"1\">Allowed Access</option>"; $optionlist_acl .= "<option value=\"1\">". $lang['Allowed_Access'] . "</option>";
} }
else if( $allowed ) else if( $allowed )
{ {
$optionlist_acl .= "<option value=\"1\" selected>Allowed Access</option><option value=\"0\">Disallowed Access</option>"; $optionlist_acl .= "<option value=\"1\" selected>". $lang['Allowed_Access'] . "</option><option value=\"0\">". $lang['Disallowed_Access'] . "</option>";
} }
else else
{ {
$optionlist_acl .= "<option value=\"1\">Allowed Access</option><option value=\"0\" selected>Disallowed Access</option>"; $optionlist_acl .= "<option value=\"1\">". $lang['Allowed_Access'] . "</option><option value=\"0\" selected>". $lang['Disallowed_Access'] . "</option>";
} }
$optionlist_acl .= "</select>"; $optionlist_acl .= "</select>";
} }
@ -783,22 +773,22 @@ else
{ {
if(!$auth_field_acl[$forum_id][$field_name]) if(!$auth_field_acl[$forum_id][$field_name])
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">On</option><option value=\"0\" selected>Off</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected>" . $lang['OFF'] . "</option>";
} }
else else
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\" selected>On</option><option value=\"0\">Off</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\" selected>" . $lang['ON'] . "</option><option value=\"0\">" . $lang['OFF'] . "</option>";
} }
} }
else else
{ {
if( $group_ary['auth_mod'] ) if( $group_ary['auth_mod'] )
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">On</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option>";
} }
else else
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">On</option><option value=\"0\" selected>Off</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected>" . $lang['OFF'] . "</option>";
} }
} }
@ -812,17 +802,19 @@ else
$optionlist_mod = "<select name=\"moderator[$forumkey]\">"; $optionlist_mod = "<select name=\"moderator[$forumkey]\">";
if($group_ary['auth_mod']) if($group_ary['auth_mod'])
{ {
$optionlist_mod .= "<option value=\"1\" selected>Moderator</option><option value=\"0\">Not Moderator</option>"; $optionlist_mod .= "<option value=\"1\" selected>" . $lang['Is_Moderator'] . "</option><option value=\"0\">" . $lang['Not_Moderator'] . "</option>";
} }
else else
{ {
$optionlist_mod .= "<option value=\"1\">Moderator</option><option value=\"0\" selected>Not Moderator</option>"; $optionlist_mod .= "<option value=\"1\">" . $lang['Is_Moderator'] . "</option><option value=\"0\" selected>" . $lang['Not_Moderator'] . "</option>";
} }
$optionlist_mod .= "</select>"; $optionlist_mod .= "</select>";
$row_class = ($i%2) ? "row2" : "row1"; $row_class = ( !($i%2) ) ? "row2" : "row1";
$row_color = "#" . ( ( !($i%2) ) ? $theme['td_color1'] : $theme['td_color2'] );
$template->assign_block_vars("forums", array( $template->assign_block_vars("forums", array(
"ROW_COLOR" => $row_color,
"ROW_CLASS" => $row_class, "ROW_CLASS" => $row_class,
"FORUM_NAME" => $forum_access[$i]['forum_name'], "FORUM_NAME" => $forum_access[$i]['forum_name'],
@ -873,7 +865,7 @@ else
} }
else else
{ {
$t_usergroup_list = "None"; $t_usergroup_list = $lang['None'];
} }
$s_hidden_fields = "<input type=\"hidden\" name=\"" . POST_GROUPS_URL . "\" value=\"$group_id\">"; $s_hidden_fields = "<input type=\"hidden\" name=\"" . POST_GROUPS_URL . "\" value=\"$group_id\">";
@ -883,7 +875,7 @@ else
if(!$adv) if(!$adv)
{ {
$template->assign_block_vars("acltype", array( $template->assign_block_vars("acltype", array(
"L_UG_ACL_TYPE" => "Simple Auth Setting") "L_UG_ACL_TYPE" => $lang['Simple_Permission'])
); );
$s_column_span++; $s_column_span++;
} }
@ -891,8 +883,10 @@ else
{ {
for($i = 0; $i < count($forum_auth_fields); $i++) for($i = 0; $i < count($forum_auth_fields); $i++)
{ {
$cell_title = $field_names[$forum_auth_fields[$i]];
$template->assign_block_vars("acltype", array( $template->assign_block_vars("acltype", array(
"L_UG_ACL_TYPE" => ucfirst(preg_replace("/auth_/", "", $forum_auth_fields[$i]))) "L_UG_ACL_TYPE" => $cell_title)
); );
$s_column_span++; $s_column_span++;
} }
@ -900,19 +894,22 @@ else
$switch_mode = "admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_id . "&adv="; $switch_mode = "admin_groupauth.$phpEx?" . POST_GROUPS_URL . "=" . $group_id . "&adv=";
$switch_mode .= ( !$adv ) ? "1" : "0"; $switch_mode .= ( !$adv ) ? "1" : "0";
$switch_mode_text = ( !$adv ) ? "Advanced Mode" : "Simple Mode"; $switch_mode_text = ( !$adv ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
$u_switch_mode = '<a href="' . $switch_mode . '">' . $switch_mode_text . '</a>'; $u_switch_mode = '<a href="' . $switch_mode . '">' . $switch_mode_text . '</a>';
$template->assign_vars(array( $template->assign_vars(array(
"USERNAME" => $t_groupname, "USERNAME" => $t_groupname,
"USER_GROUP_MEMBERSHIPS" => "This group has the following members: $t_usergroup_list", "USER_GROUP_MEMBERSHIPS" => $lang['Group_has_members'] . ": " . $t_usergroup_list,
"L_USER_OR_GROUPNAME" => $lang['Group_name'], "L_USER_OR_GROUPNAME" => $lang['Group_name'],
"L_AUTH_TITLE" => $lang['User'] . " " . $lang['Auth_Control'], "L_AUTH_TITLE" => $lang['User'] . " " . $lang['Auth_Control'],
"L_AUTH_EXPLAIN" => $lang['User_auth_explain'], "L_AUTH_EXPLAIN" => $lang['User_auth_explain'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
"L_PERMISSIONS" => $lang['Permissions'], "L_PERMISSIONS" => $lang['Permissions'],
"L_SUBMIT_CHANGES" => $lang['Submit_changes'], "L_SUBMIT_CHANGES" => $lang['Submit_changes'],
"L_RESET_CHANGES" => $lang['Reset_changes'], "L_RESET_CHANGES" => $lang['Reset_changes'],
"U_USER_OR_GROUP" => append_sid("admin_groupauth.$phpEx"), "U_USER_OR_GROUP" => append_sid("admin_groupauth.$phpEx"),
"U_SWITCH_MODE" => $u_switch_mode, "U_SWITCH_MODE" => $u_switch_mode,

26
phpBB/admin/admin_userauth.php
View file

@ -125,7 +125,6 @@ function a_auth_check_user($type, $key, $u_auth, $is_admin)
// //
// //
// //
$adv = (isset($HTTP_GET_VARS['adv'])) ? $HTTP_GET_VARS['adv'] : -1;
if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL])) if(isset($HTTP_POST_VARS['submit']) && !empty($HTTP_POST_VARS[POST_USERS_URL]))
{ {
@ -805,15 +804,15 @@ else
$optionlist_acl = "<select name=\"private[$forumkey]\">"; $optionlist_acl = "<select name=\"private[$forumkey]\">";
if($is_admin || $user_ary['auth_mod']) if($is_admin || $user_ary['auth_mod'])
{ {
$optionlist_acl .= "<option value=\"1\">Allowed Access</option>"; $optionlist_acl .= "<option value=\"1\">". $lang['Allowed_Access'] . "</option>";
} }
else if($allowed) else if($allowed)
{ {
$optionlist_acl .= "<option value=\"1\" selected>Allowed Access</option><option value=\"0\">Disallowed Access</option>"; $optionlist_acl .= "<option value=\"1\" selected>". $lang['Allowed_Access'] . "</option><option value=\"0\">". $lang['Disallowed_Access'] . "</option>";
} }
else else
{ {
$optionlist_acl .= "<option value=\"1\">Allowed Access</option><option value=\"0\" selected>Disallowed Access</option>"; $optionlist_acl .= "<option value=\"1\">". $lang['Allowed_Access'] . "</option><option value=\"0\" selected>". $lang['Disallowed_Access'] . "</option>";
} }
$optionlist_acl .= "</select>"; $optionlist_acl .= "</select>";
} }
@ -841,22 +840,22 @@ else
{ {
if(!$auth_field_acl[$forum_id][$field_name]) if(!$auth_field_acl[$forum_id][$field_name])
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">On</option><option value=\"0\" selected>Off</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected>" . $lang['OFF'] . "</option>";
} }
else else
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\" selected>On</option><option value=\"0\">Off</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\" selected>" . $lang['ON'] . "</option><option value=\"0\">" . $lang['OFF'] . "</option>";
} }
} }
else else
{ {
if($is_admin || $user_ary['auth_mod']) if($is_admin || $user_ary['auth_mod'])
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">On</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option>";
} }
else else
{ {
$optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">On</option><option value=\"0\" selected>Off</option>"; $optionlist_acl_adv[$forum_id][$j] .= "<option value=\"1\">" . $lang['ON'] . "</option><option value=\"0\" selected>" . $lang['OFF'] . "</option>";
} }
} }
@ -870,17 +869,19 @@ else
$optionlist_mod = "<select name=\"moderator[$forumkey]\">"; $optionlist_mod = "<select name=\"moderator[$forumkey]\">";
if($user_ary['auth_mod']) if($user_ary['auth_mod'])
{ {
$optionlist_mod .= "<option value=\"1\" selected>Moderator</option><option value=\"0\">Not Moderator</option>"; $optionlist_mod .= "<option value=\"1\" selected>" . $lang['Is_Moderator'] . "</option><option value=\"0\">" . $lang['Not_Moderator'] . "</option>";
} }
else else
{ {
$optionlist_mod .= "<option value=\"1\">Moderator</option><option value=\"0\" selected>Not Moderator</option>"; $optionlist_mod .= "<option value=\"1\">" . $lang['Is_Moderator'] . "</option><option value=\"0\" selected>" . $lang['Not_Moderator'] . "</option>";
} }
$optionlist_mod .= "</select>"; $optionlist_mod .= "</select>";
$row_class = ($i%2) ? "row2" : "row1"; $row_class = ($i%2) ? "row2" : "row1";
$row_color = "#" . ( ( !($i%2) ) ? $theme['td_color1'] : $theme['td_color2'] );
$template->assign_block_vars("forums", array( $template->assign_block_vars("forums", array(
"ROW_COLOR" => $row_color,
"ROW_CLASS" => $row_class, "ROW_CLASS" => $row_class,
"FORUM_NAME" => $forum_access[$i]['forum_name'], "FORUM_NAME" => $forum_access[$i]['forum_name'],
@ -910,7 +911,7 @@ else
reset($auth_user); reset($auth_user);
$t_username .= $userinf[0]['username']; $t_username .= $userinf[0]['username'];
$s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected>Administrator</option><option value="user">User</option></select>' : '<select name="userlevel"><option value="admin">Administrator</option><option value="user" selected>User</option></select>'; $s_user_type = ($is_admin) ? '<select name="userlevel"><option value="admin" selected>' . $lang['Administrator'] . '</option><option value="user">' . $lang['User'] . '</option></select>' : '<select name="userlevel"><option value="admin">' . $lang['Administrator'] . '</option><option value="user" selected>' . $lang['User'] . '</option></select>';
for($i = 0; $i < count($userinf); $i++) for($i = 0; $i < count($userinf); $i++)
{ {
@ -969,13 +970,14 @@ else
$template->assign_vars(array( $template->assign_vars(array(
"USERNAME" => $t_username, "USERNAME" => $t_username,
"USER_GROUP_MEMBERSHIPS" => "This user is a $s_user_type and belongs to the following groups: $t_usergroup_list", "USER_GROUP_MEMBERSHIPS" => $lang['This_user_is'] . " " . $s_user_type . " " . $lang['and_belongs_groups'] . ": " . $t_usergroup_list,
"L_USER_OR_GROUPNAME" => $lang['Username'], "L_USER_OR_GROUPNAME" => $lang['Username'],
"L_USER_OR_GROUP" => $lang['User'], "L_USER_OR_GROUP" => $lang['User'],
"L_AUTH_TITLE" => $lang['User'] . " " . $lang['Auth_Control'], "L_AUTH_TITLE" => $lang['User'] . " " . $lang['Auth_Control'],
"L_AUTH_EXPLAIN" => $lang['User_auth_explain'], "L_AUTH_EXPLAIN" => $lang['User_auth_explain'],
"L_MODERATOR_STATUS" => $lang['Moderator_status'],
"L_PERMISSIONS" => $lang['Permissions'], "L_PERMISSIONS" => $lang['Permissions'],
"L_SUBMIT_CHANGES" => $lang['Submit_changes'], "L_SUBMIT_CHANGES" => $lang['Submit_changes'],
"L_RESET_CHANGES" => $lang['Reset_changes'], "L_RESET_CHANGES" => $lang['Reset_changes'],

11
phpBB/language/lang_english.php
View file

@ -657,6 +657,7 @@ $lang['Database_size'] = "Database size";
$lang['Not_available'] = "Not available"; $lang['Not_available'] = "Not available";
// Auth pages // Auth pages
$lang['Administrator'] = "Administrator";
$lang['User'] = "User"; $lang['User'] = "User";
$lang['Group'] = "Group"; $lang['Group'] = "Group";
$lang['Forum'] = "Forum"; $lang['Forum'] = "Forum";
@ -672,6 +673,11 @@ $lang['Simple_mode'] = "Simple Mode";
$lang['Advanced_mode'] = "Advanced Mode"; $lang['Advanced_mode'] = "Advanced Mode";
$lang['Moderator_status'] = "Moderator status"; $lang['Moderator_status'] = "Moderator status";
$lang['Allowed_Access'] = "Allowed Access";
$lang['Disallowed_Access'] = "Disallowed Access";
$lang['Is_Moderator'] = "Is Moderator";
$lang['Not_Moderator'] = "Not Moderator";
$lang['Submit_changes'] = "Submit changes"; $lang['Submit_changes'] = "Submit changes";
$lang['Reset_changes'] = "Reset changes"; $lang['Reset_changes'] = "Reset changes";
@ -693,6 +699,11 @@ $lang['Announce'] = "Announce";
$lang['Permissions'] = "Permissions"; $lang['Permissions'] = "Permissions";
$lang['Simple_Permission'] = "Simple Permission"; $lang['Simple_Permission'] = "Simple Permission";
$lang['This_user_is'] = "This user is a"; // followed by User/Administrator and then next line
$lang['and_belongs_groups'] = "and belongs to the following groups"; // followed by list of groups
$lang['Group_has_members'] = "This group has the following members";
// //
// End // End
// ------------------------------------------------- // -------------------------------------------------