';
}
}
diff -r 1316404e4ea8 -r a6ed8b6cdbe1 includes/pageutils.php
--- a/includes/pageutils.php Sun Oct 28 21:19:36 2007 -0400
+++ b/includes/pageutils.php Sun Oct 28 23:50:10 2007 -0400
@@ -1364,6 +1364,7 @@
function rename($page_id, $namespace, $name)
{
global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
$pname = $paths->nslist[$namespace] . $page_id;
@@ -1372,7 +1373,7 @@
if( empty($name))
{
- die('Name is too short');
+ return($lang->get('ajax_rename_too_short'));
}
if( ( $session->get_permissions('rename') && ( ( $prot && $session->get_permissions('even_when_protected') ) || !$prot ) ) && ( $paths->namespace != 'Special' && $paths->namespace != 'Admin' ))
{
@@ -1388,12 +1389,16 @@
}
else
{
- return('The page "' . $paths->pages[$pname]['name'] . '" has been renamed to "' . $name . '". You are encouraged to leave a comment explaining your action.' . "\n\n" . 'You will see the change take effect the next time you reload this page.');
+ $subst = array(
+ 'page_name_old' => $paths->pages[$pname]['name'],
+ 'page_name_new' => $name
+ );
+ return $lang->get('ajax_rename_success', $subst);
}
}
else
{
- return('Access is denied.');
+ return($lang->get('etc_access_denied'));
}
}
@@ -1407,7 +1412,11 @@
function flushlogs($page_id, $namespace)
{
global $db, $session, $paths, $template, $plugins; // Common objects
- if(!$session->get_permissions('clear_logs')) die('Administrative privileges are required to flush logs, you loser.');
+ global $lang;
+ if(!$session->get_permissions('clear_logs'))
+ {
+ return $lang->get('etc_access_denied');
+ }
$e = $db->sql_query('DELETE FROM ' . table_prefix.'logs WHERE page_id=\'' . $db->escape($page_id) . '\' AND namespace=\'' . $db->escape($namespace) . '\';');
if(!$e) $db->_die('The log entries could not be deleted.');
@@ -1422,7 +1431,7 @@
$q='INSERT INTO ' . table_prefix.'logs(log_type,action,time_id,date_string,page_id,namespace,page_text,char_tag,author,edit_summary,minor_edit) VALUES(\'page\', \'edit\', '.time().', \''.date('d M Y h:i a').'\', \'' . $page_id . '\', \'' . $namespace . '\', \'' . $db->escape($row['page_text']) . '\', \'' . $row['char_tag'] . '\', \'' . $session->username . '\', \''."Automatic backup created when logs were purged".'\', '.'false'.');';
if(!$db->sql_query($q)) $db->_die('The history (log) entry could not be inserted into the logs table.');
}
- return('The logs for this page have been cleared. A backup of this page has been added to the logs table so that this page can be restored in case of vandalism or spam later.');
+ return $lang->get('ajax_clearlogs_success');
}
/**
@@ -1436,11 +1445,12 @@
function deletepage($page_id, $namespace, $reason)
{
global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
$perms = $session->fetch_page_acl($page_id, $namespace);
$x = trim($reason);
if ( empty($x) )
{
- return 'Invalid reason for deletion passed';
+ return $lang->get('ajax_delete_need_reason');
}
if(!$perms->get_permissions('delete_page')) return('Administrative privileges are required to delete pages, you loser.');
$e = $db->sql_query('INSERT INTO ' . table_prefix.'logs(time_id,date_string,log_type,action,page_id,namespace,author,edit_summary) VALUES('.time().', \''.date('d M Y h:i a').'\', \'page\', \'delete\', \'' . $page_id . '\', \'' . $namespace . '\', \'' . $session->username . '\', \'' . $db->escape(htmlspecialchars($reason)) . '\')');
@@ -1455,7 +1465,7 @@
if(!$e) $db->_die('The page entry could not be deleted.');
$e = $db->sql_query('DELETE FROM ' . table_prefix.'files WHERE page_id=\'' . $page_id . '\'');
if(!$e) $db->_die('The file entry could not be deleted.');
- return('This page has been deleted. Note that there is still a log of edits and actions in the database, and anyone with admin rights can raise this page from the dead unless the log is cleared. If the deleted file is an image, there may still be cached thumbnails of it in the cache/ directory, which is inaccessible to users.');
+ return $lang->get('ajax_delete_success');
}
/**
@@ -1468,9 +1478,10 @@
function delvote($page_id, $namespace)
{
global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
if ( !$session->get_permissions('vote_delete') )
{
- return 'Access denied';
+ return $lang->get('etc_access_denied');
}
if ( $namespace == 'Admin' || $namespace == 'Special' || $namespace == 'System' )
@@ -1509,7 +1520,7 @@
if ( in_array($session->username, $ips['u']) || in_array($_SERVER['REMOTE_ADDR'], $ips['ip']) )
{
- return 'It appears that you have already voted to have this page deleted.';
+ return $lang->get('ajax_delvote_already_voted');
}
$ips['u'][] = $session->username;
@@ -1521,7 +1532,7 @@
$q = 'UPDATE ' . table_prefix.'pages SET delvotes=' . $cv . ',delvote_ips=\'' . $ips . '\' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
$w = $db->sql_query($q);
- return 'Your vote to have this page deleted has been cast.'."\nYou are encouraged to leave a comment explaining the reason for your vote.";
+ return $lang->get('ajax_delvote_success');
}
/**
@@ -1534,11 +1545,18 @@
function resetdelvotes($page_id, $namespace)
{
global $db, $session, $paths, $template, $plugins; // Common objects
- if(!$session->get_permissions('vote_reset')) die('You need moderator rights in order to do this, stinkin\' hacker.');
+ global $lang;
+ if(!$session->get_permissions('vote_reset'))
+ {
+ return $lang->get('etc_access_denied');
+ }
$q = 'UPDATE ' . table_prefix.'pages SET delvotes=0,delvote_ips=\'' . $db->escape(serialize(array('ip'=>array(),'u'=>array()))) . '\' WHERE urlname=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\'';
$e = $db->sql_query($q);
if(!$e) $db->_die('The number of delete votes was not reset.');
- else return('The number of votes for having this page deleted has been reset to zero.');
+ else
+ {
+ return $lang->get('ajax_delvote_reset_success');
+ }
}
/**
@@ -1599,6 +1617,8 @@
function catedit_raw($page_id, $namespace)
{
global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
+
ob_start();
$_ob = '';
$e = $db->sql_query('SELECT category_id FROM ' . table_prefix.'categories WHERE page_id=\'' . $paths->cpage['urlname_nons'] . '\' AND namespace=\'' . $paths->namespace . '\'');
@@ -1636,11 +1656,11 @@
}
echo 'catlist = new Array();'; // Initialize the client-side category list
- $_ob .= '
Select which categories this page should be included in.
+ $_ob .= '
' . $lang->get('catedit_title') . '
';
+ $_ob .= '
';
$cont = ob_get_contents();
ob_end_clean();
@@ -1776,13 +1796,14 @@
function setpass($page_id, $namespace, $pass)
{
global $db, $session, $paths, $template, $plugins; // Common objects
+ global $lang;
// Determine permissions
if($paths->pages[$paths->nslist[$namespace].$page_id]['password'] != '')
$a = $session->get_permissions('password_reset');
else
$a = $session->get_permissions('password_set');
if(!$a)
- return 'Access is denied';
+ return $lang->get('etc_access_denied');
if(!isset($pass)) return('Password was not set on URL');
$p = $pass;
if ( !preg_match('#([0-9a-f]){40,40}#', $p) )
@@ -1800,9 +1821,12 @@
// Is the new password blank?
if ( $p == '' )
{
- return('The password for this page has been disabled.');
+ return $lang->get('ajax_password_disable_success');
}
- else return('The password for this page has been set.');
+ else
+ {
+ return $lang->get('ajax_password_success');
+ }
}
/**
@@ -1813,7 +1837,8 @@
function genPreview($text)
{
- $ret = '
Reminder: This is only a preview - your changes to this page have not yet been saved.
';
+ global $lang;
+ $ret = '
' . $lang->get('editor_preview_blurb') . '
';
$text = RenderMan::render(RenderMan::preprocess_text($text, false, false));
ob_start();
eval('?>' . $text);
@@ -1850,7 +1875,7 @@
global $db, $session, $paths, $template, $plugins; // Common objects
global $lang;
if(!$session->get_permissions('history_view'))
- return 'Access denied';
+ return $lang->get('etc_access_denied');
if(!preg_match('#^([0-9]+)$#', (string)$id1) ||
!preg_match('#^([0-9]+)$#', (string)$id2 )) return 'SQL injection attempt';
// OK we made it through security
@@ -1878,8 +1903,6 @@
/**
* Gets ACL information about the selected page for target type X and target ID Y.
- * @param string $page_id The page ID
- * @param string $namespace The namespace
* @param array $parms What to select. This is an array purely for JSON compatibility. It should be an associative array with keys target_type and target_id.
* @return array
*/
@@ -1909,7 +1932,7 @@
{
return Array(
'mode' => 'error',
- 'error' => 'It seems that (a) the file acledit.tpl is missing from these theme, and (b) the JSON response is working.',
+ 'error' => 'It seems that (a) the file acledit.tpl is missing from this theme, and (b) the JSON response is working.',
);
}
$return['template'] = $template->extract_vars('acledit.tpl');
diff -r 1316404e4ea8 -r a6ed8b6cdbe1 language/english/enano.json
--- a/language/english/enano.json Sun Oct 28 21:19:36 2007 -0400
+++ b/language/english/enano.json Sun Oct 28 23:50:10 2007 -0400
@@ -17,7 +17,7 @@
var enano_lang = {
categories: [
- 'adm', 'meta', 'user', 'page', 'comment', 'onpage', 'etc', 'editor', 'history',
+ 'adm', 'meta', 'user', 'page', 'comment', 'onpage', 'etc', 'editor', 'history', 'catedit', 'tags', 'delvote', 'ajax',
],
strings: {
meta: {
@@ -26,10 +26,14 @@
user: 'Login, logout, and authentication',
page: 'Page creation and control',
comment: 'Comment display',
- onpage: 'On-page controls',
+ onpage: 'On-page buttons and controls',
etc: 'Miscellaneous strings',
editor: 'Page editor interface',
history: 'Page history and log viewer',
+ catedit: 'Categorization box and editor',
+ tags: 'Page tagging interface',
+ delvote: 'Page deletion vote interface',
+ ajax: 'On-page AJAX applets',
plural: 's'
},
user: {
@@ -165,6 +169,9 @@
postform_field_captcha_cantread_js: 'If you can\'t read the code, click on the image to generate a new one.',
postform_field_captcha_cantread_nojs: 'If you can\'t read the code, please refresh this page to generate a new one.',
postform_btn_submit: 'Submit comment',
+
+ on_friend_list: 'On your friend list',
+ on_foe_list: 'On your foe list',
},
adm: {
cat_general: 'General',
@@ -214,6 +221,7 @@
btn_revert: 'Revert changes',
btn_cancel: 'Cancel and return to page',
btn_closeviewer: 'Close viewer',
+ preview_blurb: 'Reminder: This is only a preview - your changes to this page have not yet been saved.',
},
history: {
summary_clearlogs: 'Automatic backup created when logs were purged',
@@ -246,12 +254,71 @@
log_uploadnew: 'Uploaded new file version',
lbl_comparingrevisions: 'Comparing revisions:',
},
+ catedit: {
+ title: 'Select which categories this page should be included in.',
+ no_categories: 'There are no categories on this site yet.',
+ catbox_lbl_categories: 'Categories:',
+ catbox_lbl_uncategorized: '(Uncategorized)',
+ catbox_link_edit: 'edit categorization',
+ catbox_link_showcategorization: 'show page categorization',
+ },
+ tags: {
+ catbox_link: 'show page tags',
+ lbl_page_tags: 'Page tags:',
+ lbl_no_tags: 'No tags on this page',
+ btn_add_tag: '(add a tag)',
+ lbl_add_tag: 'Add a tag:',
+ btn_add: '+ Add',
+ },
+ delvote: {
+ lbl_votes_one: 'There is one user that thinks this page should be deleted.',
+ lbl_votes_plural: 'There are %num_users% users that think this page should be deleted.',
+ lbl_users_that_voted: 'Users that voted:',
+ btn_deletepage: 'Delete page',
+ btn_resetvotes: 'Reset votes',
+ },
+ ajax: {
+ // Client-side messages
+ protect_prompt_reason: 'Reason for (un)protecting:',
+ rename_prompt: 'What title should this page be renamed to?\nNote: This does not and will never change the URL of this page, that must be done from the admin panel.',
+ delete_prompt_reason: 'Please enter your reason for deleting this page.',
+ delete_confirm: 'You are about to REVERSIBLY delete this page. Do you REALLY want to do this?\n\n(Comments and categorization data, as well as any attached files, will be permanently lost)',
+ delvote_confirm: 'Are you sure that you want to vote that this page be deleted?',
+ delvote_reset_confirm: 'This will reset the number of votes against this page to zero. Do you really want to do this?',
+ clearlogs_confirm: 'You are about to DESTROY all log entries for this page. As opposed to (example) deleting this page, this action is completely IRREVERSIBLE and should not be used except in dire circumstances. Do you REALLY want to do this?',
+ clearlogs_confirm_nag: 'You\'re ABSOLUTELY sure???',
+ changestyle_select: '[Select]',
+ changestyle_title: 'Change your theme',
+ changestyle_pleaseselect_theme: 'Please select a theme from the list.',
+ changestyle_success: 'Your theme preference has been changed.\nWould you like to reload the page now to see the changes?',
+ killphp_confirm: 'Are you really sure you want to do this? Some pages might not function if this emergency-only feature is activated.',
+ killphp_success: 'Embedded PHP in pages has been disabled.',
+
+ // Server-side responses
+ rename_too_short: 'The name you entered is too short. Please enter a longer name for this page.',
+ rename_success: 'The page "%page_name_old%" has been renamed to "%page_name_new%". You are encouraged to leave a comment explaining your action.\n\nYou will see the change take effect the next time you reload this page.',
+ clearlogs_success: 'The logs for this page have been cleared. A backup of this page has been added to the logs table so that this page can be restored in case of vandalism or spam later.',
+ delete_need_reason: 'Invalid reason for deletion passed. Please enter a reason for deleting this page.',
+ delete_success: 'This page has been deleted. Note that there is still a log of edits and actions in the database, and anyone with admin rights can raise this page from the dead unless the log is cleared. If the deleted file is an image, there may still be cached thumbnails of it in the cache/ directory, which is inaccessible to users.',
+ delvote_success: 'Your vote to have this page deleted has been cast.\nYou are encouraged to leave a comment explaining the reason for your vote.',
+ delvote_already_voted: 'It appears that you have already voted to have this page deleted.',
+ delvote_reset_success: 'The number of votes for having this page deleted has been reset to zero.',
+ password_success: 'The password for this page has been set.',
+ password_disable_success: 'The password for this page has been disabled.',
+
+ },
etc: {
redirect_title: 'Redirecting...',
redirect_body: 'Please wait while you are redirected.',
redirect_timeout: 'If you are not redirected within %timeout% seconds, please click here.',
// Generic "Save Changes" button
save_changes: 'Save changes',
+ // Generic "Cancel" button
+ cancel: 'Cancel',
+ // Generic "Notice:" label
+ lbl_notice: 'Notice:',
+ // Generic "Access denied"
+ access_denied: 'Access to the specified file, resource, or action is denied.',
},
}
};
- Users that voted: ' . $hr . '
- Delete page | Reset votes + ' . $lang->get('etc_lbl_notice') . ' ' . $string . '
+ ' . $lang->get('delvote_lbl_users_that_voted') . ' ' . $hr . '
+ ' . $lang->get('delvote_btn_deletepage') . ' | ' . $lang->get('delvote_btn_resetvotes') . '
Select which categories this page should be included in.
+ $_ob .= '' . $lang->get('catedit_title') . '
'; + $_ob .= '