Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10941] XoopsCore/branches/2.6.x/2.6.0
|
From: <tr...@us...> - 2013-01-28 20:48:00
|
Revision: 10941
http://sourceforge.net/p/xoops/svn/10941
Author: trabis
Date: 2013-01-28 20:47:51 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
Updating user language
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/extras/login.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/lostpass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_edituser.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/userinfo.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/templates/profile_avatar.html
Modified: XoopsCore/branches/2.6.x/2.6.0/extras/login.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/extras/login.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -67,7 +67,7 @@
$_SESSION['xoopsUserId'] = $user->getVar('uid');
$_SESSION['xoopsUserGroups'] = $user->getGroups();
if (!empty($xoopsConfig['use_ssl'])) {
- xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL . '/misc.php?action=showpopups&type=ssllogin', _US_PRESSLOGIN, XoopsLocale::A_LOGIN);
+ xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL . '/misc.php?action=showpopups&type=ssllogin', XoopsLocale::PRESS_BUTTON_BELLOW_TO_LOGIN, XoopsLocale::A_LOGIN);
} else {
echo sprintf(XoopsLocale::SF_THANK_YOU_FOR_LOGGING_IN, $user->getVar('uname'));
echo '<div style="text-align:center;"><input value="' . XoopsLocale::A_CLOSE . '" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/userutility.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -46,7 +46,6 @@
return false;
}
- $xoops->loadLanguage('user');
$xoopsMailer = $xoops->getMailer();
if ($xoops->getConfig('welcome_type') == 1 || $xoops->getConfig('welcome_type') == 3) {
$xoopsMailer->useMail();
@@ -55,7 +54,7 @@
$xoopsMailer->usePM();
}
$xoopsMailer->setTemplate('welcome.tpl');
- $xoopsMailer->setSubject(sprintf(_US_WELCOME_SUBJECT, $xoops->getConfig('sitename')));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_WELCOME_TO, $xoops->getConfig('sitename')));
$xoopsMailer->setToUsers($user);
if ($xoops->getConfig('reg_disclaimer')) {
$xoopsMailer->assign('TERMSOFUSE', $xoops->getConfig('reg_disclaimer'));
@@ -105,21 +104,20 @@
}
$xoops->getConfigs();
- $xoops->loadLanguage('user');
$stop = '';
// Invalid email address
if (!$xoops->checkEmail($email)) {
- $stop .= _US_INVALIDMAIL . '<br />';
+ $stop .= XoopsLocale::E_INVALID_EMAIL . '<br />';
}
if (strrpos($email, ' ') > 0) {
- $stop .= _US_EMAILNOSPACES . '<br />';
+ $stop .= XoopsLocale::E_EMAIL_SHOULD_NOT_CONTAIN_SPACES . '<br />';
}
// Check forbidden email address if current operator is not an administrator
if (!$xoops->userIsAdmin) {
foreach ($xoops->getConfig('bad_emails') as $be) {
if (!empty($be) && preg_match('/' . $be . '/i', $email)) {
- $stop .= _US_INVALIDMAIL . '<br />';
+ $stop .= XoopsLocale::E_INVALID_EMAIL . '<br />';
break;
}
}
@@ -141,19 +139,19 @@
break;
}
if (empty($uname) || preg_match($restriction, $uname)) {
- $stop .= _US_INVALIDNICKNAME . '<br />';
+ $stop .= XoopsLocale::E_INVALID_USERNAME . '<br />';
}
// Check uname settings if current operator is not an administrator
if (!$xoops->userIsAdmin) {
if (strlen($uname) > $xoops->getConfig('maxuname')) {
- $stop .= sprintf(_US_NICKNAMETOOLONG, $xoops->getConfig('maxuname')) . '<br />';
+ $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_LESS_THAN, $xoops->getConfig('maxuname')) . '<br />';
}
if (strlen($uname) < $xoops->getConfig('minuname')) {
- $stop .= sprintf(_US_NICKNAMETOOSHORT, $xoops->getConfig('minuname')) . '<br />';
+ $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_MORE_THAN, $xoops->getConfig('minuname')) . '<br />';
}
foreach ($xoops->getConfig('bad_unames') as $bu) {
if (!empty($bu) && preg_match('/' . $bu . '/i', $uname)) {
- $stop .= _US_NAMERESERVED . '<br />';
+ $stop .= XoopsLocale::E_NAME_IS_RESERVED . '<br />';
break;
}
}
@@ -170,7 +168,7 @@
}
$count = $user_handler->getCount($criteria);
if ($count > 0) {
- $stop .= _US_NICKNAMETAKEN . '<br />';
+ $stop .= XoopsLocale::E_USERNAME_TAKEN . '<br />';
}
$criteria = new CriteriaCompo(new Criteria('email', $myts->addSlashes($email)));
@@ -179,7 +177,7 @@
}
$count = $user_handler->getCount($criteria);
if ($count > 0) {
- $stop .= _US_EMAILTAKEN . '<br />';
+ $stop .= XoopsLocale::E_EMAIL_TAKEN . '<br />';
}
// If password is not set, skip password validation
@@ -188,13 +186,13 @@
}
if (!isset($pass) || $pass == '' || !isset($vpass) || $vpass == '') {
- $stop .= _US_ENTERPWD . '<br />';
+ $stop .= XoopsLocale::E_MUST_PROVIDE_PASSWORD . '<br />';
}
if ((isset($pass)) && ($pass != $vpass)) {
- $stop .= _US_PASSNOTSAME . '<br />';
+ $stop .= XoopsLocale::E_PASSWORDS_MUST_MATCH . '<br />';
} else {
if (($pass != '') && (strlen($pass) < $xoops->getConfig('minpass'))) {
- $stop .= sprintf(_US_PWDTOOSHORT, $xoops->getConfig('minpass')) . '<br />';
+ $stop .= sprintf(XoopsLocale::EF_PASSWORD_MUST_BE_GREATER_THAN, $xoops->getConfig('minpass')) . '<br />';
}
}
return $stop;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -27,7 +27,7 @@
// If not a user, redirect
if (!$xoops->isUser()) {
- $xoops->redirect('index.php', 3, _US_NOEDITRIGHT);
+ $xoops->redirect('index.php', 3, XoopsLocale::E_NO_ACTION_PERMISSION);
exit();
}
@@ -38,12 +38,12 @@
$myts = MyTextSanitizer::getInstance();
if ($op == 'saveuser') {
if (!$xoops->security()->check()) {
- $xoops->redirect('index.php', 3, _US_NOEDITRIGHT . "<br />" . implode('<br />', $xoops->security()->getErrors()));
+ $xoops->redirect('index.php', 3, XoopsLocale::E_NO_ACTION_PERMISSION . "<br />" . implode('<br />', $xoops->security()->getErrors()));
exit();
}
$uid = $request->asInt('uid', 0);
if (empty($uid) || $xoops->user->getVar('uid') != $uid) {
- $xoops->redirect('index.php', 3, _US_NOEDITRIGHT);
+ $xoops->redirect('index.php', 3, XoopsLocale::E_NO_ACTION_PERMISSION);
exit();
}
$errors = array();
@@ -51,19 +51,19 @@
$email = $request->asStr('email', '');
$email = $myts->stripSlashesGPC(trim($email));;
if ($email == '' || ! $xoops->checkEmail($email)) {
- $errors[] = _US_INVALIDMAIL;
+ $errors[] = XoopsLocale::E_INVALID_EMAIL;
}
}
$password = $request->asStr('password', '');
$password = $myts->stripSlashesGPC(trim($password));
if ($password != '') {
if (strlen($password) < $xoops->getConfig('minpass')) {
- $errors[] = sprintf(_US_PWDTOOSHORT, $xoops->getConfig('minpass'));
+ $errors[] = sprintf(XoopsLocale::EF_PASSWORD_MUST_BE_GREATER_THAN, $xoops->getConfig('minpass'));
}
$vpass = $request->asStr('vpass', '');
$vpass = $myts->stripSlashesGPC(trim($vpass));
if ($password != $vpass) {
- $errors[] = _US_PASSNOTSAME;
+ $errors[] = XoopsLocale::E_PASSWORDS_MUST_MATCH;
}
}
if (count($errors) > 0) {
@@ -113,7 +113,7 @@
echo $edituser->getHtmlErrors();
$xoops->footer();
} else {
- $xoops->redirect('userinfo.php?uid=' . $uid, 1, _US_PROFUPDATED);
+ $xoops->redirect('userinfo.php?uid=' . $uid, 1, XoopsLocale::S_YOUR_PROFILE_UPDATED);
}
exit();
}
@@ -123,10 +123,10 @@
$xoops->header('system_edituser.html');
$xoops->tpl()->assign('uid', $xoops->user->getVar("uid"));
$xoops->tpl()->assign('editprofile', true);
- $form = new XoopsThemeForm(_US_EDITPROFILE, 'userinfo', 'edituser.php', 'post', true);
+ $form = new XoopsThemeForm(XoopsLocale::EDIT_PROFILE, 'userinfo', 'edituser.php', 'post', true);
$uname_label = new XoopsFormLabel(XoopsLocale::USERNAME, $xoops->user->getVar('uname'));
$form->addElement($uname_label);
- $name_text = new XoopsFormText(_US_REALNAME, 'name', 30, 60, $xoops->user->getVar('name', 'E'));
+ $name_text = new XoopsFormText(XoopsLocale::REAL_NAME, 'name', 30, 60, $xoops->user->getVar('name', 'E'));
$form->addElement($name_text);
$email_tray = new XoopsFormElementTray(XoopsLocale::EMAIL, '<br />');
if ($xoops->getConfig('allow_chgmail') == 1) {
@@ -144,32 +144,32 @@
$form->addElement($url_text);
$timezone_select = new XoopsFormSelectTimezone(XoopsLocale::TIME_ZONE, 'timezone_offset', $xoops->user->getVar('timezone_offset'));
- $icq_text = new XoopsFormText(_US_ICQ, 'user_icq', 15, 15, $xoops->user->getVar('user_icq', 'E'));
- $aim_text = new XoopsFormText(_US_AIM, 'user_aim', 18, 18, $xoops->user->getVar('user_aim', 'E'));
- $yim_text = new XoopsFormText(_US_YIM, 'user_yim', 25, 25, $xoops->user->getVar('user_yim', 'E'));
- $msnm_text = new XoopsFormText(_US_MSNM, 'user_msnm', 30, 100, $xoops->user->getVar('user_msnm', 'E'));
- $location_text = new XoopsFormText(_US_LOCATION, 'user_from', 30, 100, $xoops->user->getVar('user_from', 'E'));
- $occupation_text = new XoopsFormText(_US_OCCUPATION, 'user_occ', 30, 100, $xoops->user->getVar('user_occ', 'E'));
- $interest_text = new XoopsFormText(_US_INTEREST, 'user_intrest', 30, 150, $xoops->user->getVar('user_intrest', 'E'));
- $sig_tray = new XoopsFormElementTray(_US_SIGNATURE, '<br />');
+ $icq_text = new XoopsFormText(XoopsLocale::ICQ, 'user_icq', 15, 15, $xoops->user->getVar('user_icq', 'E'));
+ $aim_text = new XoopsFormText(XoopsLocale::AIM, 'user_aim', 18, 18, $xoops->user->getVar('user_aim', 'E'));
+ $yim_text = new XoopsFormText(XoopsLocale::YIM, 'user_yim', 25, 25, $xoops->user->getVar('user_yim', 'E'));
+ $msnm_text = new XoopsFormText(XoopsLocale::MSNM, 'user_msnm', 30, 100, $xoops->user->getVar('user_msnm', 'E'));
+ $location_text = new XoopsFormText(XoopsLocale::LOCATION, 'user_from', 30, 100, $xoops->user->getVar('user_from', 'E'));
+ $occupation_text = new XoopsFormText(XoopsLocale::OCCUPATION, 'user_occ', 30, 100, $xoops->user->getVar('user_occ', 'E'));
+ $interest_text = new XoopsFormText(XoopsLocale::INTEREST, 'user_intrest', 30, 150, $xoops->user->getVar('user_intrest', 'E'));
+ $sig_tray = new XoopsFormElementTray(XoopsLocale::SIGNATURE, '<br />');
$sig_tarea = new XoopsFormDhtmlTextArea('', 'user_sig', $xoops->user->getVar('user_sig', 'E'));
$sig_tray->addElement($sig_tarea);
$sig_cbox_value = $xoops->user->getVar('attachsig') ? 1 : 0;
$sig_cbox = new XoopsFormCheckBox('', 'attachsig', $sig_cbox_value);
- $sig_cbox->addOption(1, _US_SHOWSIG);
+ $sig_cbox->addOption(1, XoopsLocale::ALWAYS_ATTACH_MY_SIGNATURE);
$sig_tray->addElement($sig_cbox);
- $bio_tarea = new XoopsFormTextArea(_US_EXTRAINFO, 'bio', $xoops->user->getVar('bio', 'E'));
+ $bio_tarea = new XoopsFormTextArea(XoopsLocale::EXTRA_INFO, 'bio', $xoops->user->getVar('bio', 'E'));
$cookie_radio_value = empty($_COOKIE[$xoops->getConfig('usercookie')]) ? 0 : 1;
- $cookie_radio = new XoopsFormRadioYN(_US_USECOOKIE, 'usecookie', $cookie_radio_value);
+ $cookie_radio = new XoopsFormRadioYN(XoopsLocale::STORE_USERNAME_IN_COOKIE_FOR_ONE_YEAR, 'usecookie', $cookie_radio_value);
$pwd_text = new XoopsFormPassword('', 'password', 10, 32);
$pwd_text2 = new XoopsFormPassword('', 'vpass', 10, 32);
- $pwd_tray = new XoopsFormElementTray(_US_PASSWORD . '<br />' . _US_TYPEPASSTWICE);
+ $pwd_tray = new XoopsFormElementTray(XoopsLocale::PASSWORD . '<br />' . XoopsLocale::TYPE_NEW_PASSWORD_TWICE_TO_CHANGE_IT);
$pwd_tray->addElement($pwd_text);
$pwd_tray->addElement($pwd_text2);
$mailok_radio = new XoopsFormRadioYN(XoopsLocale::Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS, 'user_mailok', $xoops->user->getVar('user_mailok'));
$uid_hidden = new XoopsFormHidden('uid', $xoops->user->getVar('uid'));
$op_hidden = new XoopsFormHidden('op', 'saveuser');
- $submit_button = new XoopsFormButton('', 'submit', _US_SAVECHANGES, 'submit');
+ $submit_button = new XoopsFormButton('', 'submit', XoopsLocale::SAVE_CHANGES, 'submit');
$form->addElement($timezone_select);
$form->addElement($icq_text);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/checklogin.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -20,7 +20,6 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
$uname = !isset($_POST['uname']) ? '' : trim($_POST['uname']);
$pass = !isset($_POST['pass']) ? '' : trim($_POST['pass']);
@@ -104,7 +103,7 @@
Notifications::getInstance()->getHandlerNotification()->doLoginMaintenance($user->getVar('uid'));
}
- $xoops->redirect($url, 1, sprintf(XoopsLocale::E_INCORRECT_LOGIN, $user->getVar('uname')), false);
+ $xoops->redirect($url, 1, sprintf(XoopsLocale::SF_THANK_YOU_FOR_LOGGING_IN, $user->getVar('uname')), false);
} else {
if (empty($_POST['xoops_redirect'])) {
$xoops->redirect(XOOPS_URL . '/user.php', 5, $xoopsAuth->getHtmlErrors());
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/registerform.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -28,7 +28,7 @@
$uname_size = $xoopsConfigUser['maxuname'] < 25 ? $xoopsConfigUser['maxuname'] : 25;
$reg_form->addElement(new XoopsFormText(XoopsLocale::USERNAME, 'uname', $uname_size, $uname_size, $myts->htmlSpecialChars($uname)), true);
$reg_form->addElement($email_tray);
-$reg_form->addElement(new XoopsFormPassword(_US_PASSWORD, 'pass', 10, 32, $myts->htmlSpecialChars($pass)), true);
+$reg_form->addElement(new XoopsFormPassword(XoopsLocale::PASSWORD, 'pass', 10, 32, $myts->htmlSpecialChars($pass)), true);
$reg_form->addElement(new XoopsFormPassword(XoopsLocale::VERIFY_PASSWORD, 'vpass', 10, 32, $myts->htmlSpecialChars($vpass)), true);
$reg_form->addElement(new XoopsFormText(XoopsLocale::WEBSITE, 'url', 25, 255, $myts->htmlSpecialChars($url)));
$tzselected = ($timezone_offset != '') ? $timezone_offset : $xoopsConfig['default_TZ'];
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php (from rev 10940, XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/_user.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -0,0 +1,130 @@
+<?php
+// $Id$
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+//%%%%%% File Name user.php %%%%%
+//define('_US_NOTREGISTERED', 'Not registered? Click <a href="register.php">here</a>.');
+//define('_US_LOSTPASSWORD', 'Lost your Password?');
+//define('_US_NOPROBLEM', 'No problem. Simply enter the e-mail address we have on file for your account.');
+//define('_US_YOUREMAIL', 'Your Email: ');
+//define('_US_SENDPASSWORD', 'Send Password');
+//define('_US_LOGGEDOUT', 'You are now logged out');
+//define('_US_THANKYOUFORVISIT', 'Thank you for your visit to our site!');
+//define('_US_INCORRECTLOGIN', 'Incorrect Login!');
+//define('_US_LOGGINGU', 'Thank you for logging in, %s.');
+// 2001-11-17 ADD
+//define('_US_NOACTTPADM', 'The selected user has been deactivated or has not been activated yet.<br />Please contact the administrator for details.');
+//define('_US_ACTKEYNOT', 'Activation key not correct!');
+//define('_US_ACONTACT', 'Selected account is already activated!');
+//define('_US_ACTLOGIN', 'Your account has been activated. Please login with the registered password.');
+//define('_US_NOPERMISS', 'Sorry, you do not have the permission to perform this action!');
+//define('_US_SURETODEL', 'Are you sure to delete your account?');
+//define('_US_REMOVEINFO', 'This will remove all your info from our database.');
+//define('_US_BEENDELED', 'Your account has been deleted.');
+//define('_US_ACTFAILD', 'Activation failed!');
+//%%%%%% File Name register.php %%%%%
+//define('_US_USERREG', 'User Registration');
+//define('_US_NICKNAME', 'Username');
+//define('_US_EMAIL', 'Email');
+//define('_US_ALLOWVIEWEMAIL', 'Allow other users to view my email address');
+//define('_US_WEBSITE', 'Website');
+//define('_US_TIMEZONE', 'Time Zone');
+//define('_US_AVATAR', 'Avatar');
+//define('_US_VERIFYPASS', 'Verify Password');
+//define('_US_SUBMIT', 'Submit');
+//define('_US_USERNAME', 'Username');
+//define('_US_FINISH', 'Finish');
+//define('_US_REGISTERNG', 'Could not register new user.');
+//define('_US_MAILOK', 'Receive occasional email notices <br />from administrators and moderators?');
+//define('_US_DISCLAIMER', 'Disclaimer');
+//define('_US_IAGREE', 'I agree to the above');
+//define('_US_UNEEDAGREE', 'Sorry, you have to agree to our disclaimer to get registered.');
+//define('_US_NOREGISTER', 'Sorry, we are currently closed for new user registrations');
+// %s is username. This is a subject for email
+//define('_US_USERKEYFOR', 'User activation key for %s');
+//define('_US_YOURREGISTERED', 'You are now registered. An email containing an user activation key has been sent to the email account you provided. Please follow the instructions in the email to activate your account. ');
+//define('_US_YOURREGMAILNG', 'You are now registered. However, we were unable to send the activation email to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation.');
+//define('_US_YOURREGISTERED2', 'You are now registered. Please wait for your account to be activated by the adminstrators. You will receive an email once you are activated. This could take a while so please be patient.');
+// %s is your site name
+//define('_US_NEWUSERREGAT', 'New user registration at %s');
+// %s is a username
+//define('_US_HASJUSTREG', '%s has just registered!');
+//define('_US_INVALIDMAIL', 'ERROR: Invalid Email');
+//define('_US_EMAILNOSPACES', 'ERROR: Email addresses do not contain spaces.');
+//define('_US_INVALIDNICKNAME', 'ERROR: Invalid Username');
+//define('_US_NICKNAMETOOLONG', 'Username is too long. It must be less than %s characters.');
+//define('_US_NICKNAMETOOSHORT', 'Username is too short. It must be more than %s characters.');
+//define('_US_NAMERESERVED', 'ERROR: Name is reserved.');
+//define('_US_NICKNAMENOSPACES', 'There cannot be any spaces in the Username.');
+//define('_US_NICKNAMETAKEN', 'ERROR: Username taken.');
+//define('_US_EMAILTAKEN', 'ERROR: Email address already registered.');
+//define('_US_ENTERPWD', 'ERROR: You must provide a password.');
+//define('_US_SORRYNOTFOUND', 'Sorry, no corresponding user info was found.');
+// %s is your site name
+//define('_US_NEWPWDREQ', 'New Password Request at %s');
+//define('_US_YOURACCOUNT', 'Your account at %s');
+//define('_US_MAILPWDNG', 'mail_password: could not update user entry. Contact the Administrator');
+// %s is a username
+//define('_US_PWDMAILED', 'Password for %s mailed.');
+//define('_US_CONFMAIL', 'Confirmation email for %s mailed.');
+//define('_US_ACTVMAILNG', 'Failed sending notification email to %s');
+//define('_US_ACTVMAILOK', 'Notification email to %s sent.');
+//%%%%%% File Name userinfo.php %%%%%
+//define('_US_SELECTNG', 'No User Selected! Please go back and try again.');
+//define('_US_PM', 'PM');
+//define('_US_ICQ', 'ICQ');
+//define('_US_AIM', 'AIM');
+//define('_US_YIM', 'YIM');
+//define('_US_MSNM', 'MSNM');
+//define('_US_LOCATION', 'Location');
+//define('_US_OCCUPATION', 'Occupation');
+//define('_US_INTEREST', 'Interest');
+//define('_US_SIGNATURE', 'Signature');
+//define('_US_EXTRAINFO', 'Extra Info');
+//define('_US_EDITPROFILE', 'Edit Profile');
+//define('_US_LOGOUT', 'Logout');
+//define('_US_INBOX', 'Inbox');
+//define('_US_MEMBERSINCE', 'Member Since');
+//define('_US_RANK', 'Rank');
+//define('_US_POSTS', 'Comments/Posts');
+//define('_US_LASTLOGIN', 'Last Login');
+//define('_US_ALLABOUT', 'All about %s');
+//define('_US_STATISTICS', 'Statistics');
+//define('_US_MYINFO', 'My Info');
+//define('_US_BASICINFO', 'Basic information');
+//define('_US_MOREABOUT', 'More About Me');
+//define('_US_SHOWALL', 'Show All');
+//%%%%%% File Name edituser.php %%%%%
+//define('_US_PROFILE', 'Profile');
+//define('_US_REALNAME', 'Real Name');
+//define('_US_SHOWSIG', 'Always attach my signature');
+//define('_US_CDISPLAYMODE', 'Comments Display Mode');
+//define('_US_CSORTORDER', 'Comments Sort Order');
+//define('_US_PASSWORD', 'Password');
+//define('_US_TYPEPASSTWICE', '(type a new password twice to change it)');
+//define('_US_SAVECHANGES', 'Save Changes');
+//define('_US_NOEDITRIGHT', "Sorry, you don't have the right to edit this user's info.");
+//define('_US_PASSNOTSAME', 'Both passwords are different. They must be identical.');
+//define('_US_PWDTOOSHORT', 'Sorry, your password must be at least <strong>%s</strong> characters long.');
+//define('_US_PROFUPDATED', 'Your Profile Updated!');
+//define('_US_USECOOKIE', 'Store my user name in a cookie for 1 year');
+//define('_US_NO', 'No');
+//define('_US_DELACCOUNT', 'Delete Account');
+//define('_US_MYAVATAR', 'My Avatar');
+//define('_US_UPLOADMYAVATAR', 'Upload Avatar');
+//define('_US_MAXPIXEL', 'Max Pixels');
+//define('_US_MAXIMGSZ', 'Max Image Size (Bytes)');
+//define('_US_SELFILE', 'Select file');
+//define('_US_OLDDELETED', 'Your old avatar will be deleted!');
+//define('_US_CHOOSEAVT', 'Choose avatar from the available list');
+//define('_US_PRESSLOGIN', 'Press the button below to login');
+//define('_US_ADMINNO', 'User in the webmasters group cannot be removed');
+//define('_US_GROUPS', 'User\'s Groups');
+//define('_US_REMEMBERME', 'Remember me');
+// Welcoming emai/PM subject
+//define('_US_WELCOME_SUBJECT', 'Welcome to %s');
+
+//XOOPS 2.5.4
+//define('_US_SKYPE', 'Skype');
+//define('_US_FACEBOOK', 'Facebook');
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/user.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -1,132 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-//%%%%%% File Name user.php %%%%%
-//define('_US_NOTREGISTERED', 'Not registered? Click <a href="register.php">here</a>.');
-//define('_US_LOSTPASSWORD', 'Lost your Password?');
-//define('_US_NOPROBLEM', 'No problem. Simply enter the e-mail address we have on file for your account.');
-//define('_US_YOUREMAIL', 'Your Email: ');
-//define('_US_SENDPASSWORD', 'Send Password');
-//define('_US_LOGGEDOUT', 'You are now logged out');
-//define('_US_THANKYOUFORVISIT', 'Thank you for your visit to our site!');
-//define('_US_INCORRECTLOGIN', 'Incorrect Login!');
-//define('_US_LOGGINGU', 'Thank you for logging in, %s.');
-// 2001-11-17 ADD
-//define('_US_NOACTTPADM', 'The selected user has been deactivated or has not been activated yet.<br />Please contact the administrator for details.');
-//define('_US_ACTKEYNOT', 'Activation key not correct!');
-//define('_US_ACONTACT', 'Selected account is already activated!');
-//define('_US_ACTLOGIN', 'Your account has been activated. Please login with the registered password.');
-//define('_US_NOPERMISS', 'Sorry, you do not have the permission to perform this action!');
-//define('_US_SURETODEL', 'Are you sure to delete your account?');
-//define('_US_REMOVEINFO', 'This will remove all your info from our database.');
-//define('_US_BEENDELED', 'Your account has been deleted.');
-//define('_US_ACTFAILD', 'Activation failed!');
-//%%%%%% File Name register.php %%%%%
-//define('_US_USERREG', 'User Registration');
-//define('_US_NICKNAME', 'Username');
-//define('_US_EMAIL', 'Email');
-//define('_US_ALLOWVIEWEMAIL', 'Allow other users to view my email address');
-//define('_US_WEBSITE', 'Website');
-//define('_US_TIMEZONE', 'Time Zone');
-//define('_US_AVATAR', 'Avatar');
-//define('_US_VERIFYPASS', 'Verify Password');
-//define('_US_SUBMIT', 'Submit');
-//define('_US_USERNAME', 'Username');
-//define('_US_FINISH', 'Finish');
-//define('_US_REGISTERNG', 'Could not register new user.');
-//define('_US_MAILOK', 'Receive occasional email notices <br />from administrators and moderators?');
-//define('_US_DISCLAIMER', 'Disclaimer');
-//define('_US_IAGREE', 'I agree to the above');
-//define('_US_UNEEDAGREE', 'Sorry, you have to agree to our disclaimer to get registered.');
-define('_US_NOREGISTER', 'Sorry, we are currently closed for new user registrations');
-// %s is username. This is a subject for email
-define('_US_USERKEYFOR', 'User activation key for %s');
-define('_US_YOURREGISTERED', 'You are now registered. An email containing an user activation key has been sent to the email account you provided. Please follow the instructions in the email to activate your account. ');
-define('_US_YOURREGMAILNG', 'You are now registered. However, we were unable to send the activation email to your email account due to an internal error that had occurred on our server. We are sorry for the inconvenience, please send the webmaster an email notifying him/her of the situation.');
-define('_US_YOURREGISTERED2', 'You are now registered. Please wait for your account to be activated by the adminstrators. You will receive an email once you are activated. This could take a while so please be patient.');
-// %s is your site name
-define('_US_NEWUSERREGAT', 'New user registration at %s');
-// %s is a username
-define('_US_HASJUSTREG', '%s has just registered!');
-define('_US_INVALIDMAIL', 'ERROR: Invalid Email');
-define('_US_EMAILNOSPACES', 'ERROR: Email addresses do not contain spaces.');
-define('_US_INVALIDNICKNAME', 'ERROR: Invalid Username');
-define('_US_NICKNAMETOOLONG', 'Username is too long. It must be less than %s characters.');
-define('_US_NICKNAMETOOSHORT', 'Username is too short. It must be more than %s characters.');
-define('_US_NAMERESERVED', 'ERROR: Name is reserved.');
-define('_US_NICKNAMENOSPACES', 'There cannot be any spaces in the Username.');
-define('_US_NICKNAMETAKEN', 'ERROR: Username taken.');
-define('_US_EMAILTAKEN', 'ERROR: Email address already registered.');
-define('_US_ENTERPWD', 'ERROR: You must provide a password.');
-define('_US_SORRYNOTFOUND', 'Sorry, no corresponding user info was found.');
-// %s is your site name
-define('_US_NEWPWDREQ', 'New Password Request at %s');
-define('_US_YOURACCOUNT', 'Your account at %s');
-define('_US_MAILPWDNG', 'mail_password: could not update user entry. Contact the Administrator');
-// %s is a username
-define('_US_PWDMAILED', 'Password for %s mailed.');
-define('_US_CONFMAIL', 'Confirmation email for %s mailed.');
-define('_US_ACTVMAILNG', 'Failed sending notification email to %s');
-define('_US_ACTVMAILOK', 'Notification email to %s sent.');
-//%%%%%% File Name userinfo.php %%%%%
-define('_US_SELECTNG', 'No User Selected! Please go back and try again.');
-define('_US_PM', 'PM');
-define('_US_ICQ', 'ICQ');
-define('_US_AIM', 'AIM');
-define('_US_YIM', 'YIM');
-define('_US_MSNM', 'MSNM');
-define('_US_LOCATION', 'Location');
-define('_US_OCCUPATION', 'Occupation');
-define('_US_INTEREST', 'Interest');
-define('_US_SIGNATURE', 'Signature');
-define('_US_EXTRAINFO', 'Extra Info');
-define('_US_EDITPROFILE', 'Edit Profile');
-define('_US_LOGOUT', 'Logout');
-define('_US_INBOX', 'Inbox');
-define('_US_MEMBERSINCE', 'Member Since');
-define('_US_RANK', 'Rank');
-define('_US_POSTS', 'Comments/Posts');
-define('_US_LASTLOGIN', 'Last Login');
-define('_US_ALLABOUT', 'All about %s');
-define('_US_STATISTICS', 'Statistics');
-define('_US_MYINFO', 'My Info');
-define('_US_BASICINFO', 'Basic information');
-define('_US_MOREABOUT', 'More About Me');
-define('_US_SHOWALL', 'Show All');
-//%%%%%% File Name edituser.php %%%%%
-define('_US_PROFILE', 'Profile');
-define('_US_REALNAME', 'Real Name');
-define('_US_SHOWSIG', 'Always attach my signature');
-define('_US_CDISPLAYMODE', 'Comments Display Mode');
-define('_US_CSORTORDER', 'Comments Sort Order');
-define('_US_PASSWORD', 'Password');
-define('_US_TYPEPASSTWICE', '(type a new password twice to change it)');
-define('_US_SAVECHANGES', 'Save Changes');
-define('_US_NOEDITRIGHT', "Sorry, you don't have the right to edit this user's info.");
-define('_US_PASSNOTSAME', 'Both passwords are different. They must be identical.');
-define('_US_PWDTOOSHORT', 'Sorry, your password must be at least <strong>%s</strong> characters long.');
-define('_US_PROFUPDATED', 'Your Profile Updated!');
-define('_US_USECOOKIE', 'Store my user name in a cookie for 1 year');
-define('_US_NO', 'No');
-define('_US_DELACCOUNT', 'Delete Account');
-define('_US_MYAVATAR', 'My Avatar');
-define('_US_UPLOADMYAVATAR', 'Upload Avatar');
-define('_US_MAXPIXEL', 'Max Pixels');
-define('_US_MAXIMGSZ', 'Max Image Size (Bytes)');
-define('_US_SELFILE', 'Select file');
-define('_US_OLDDELETED', 'Your old avatar will be deleted!');
-define('_US_CHOOSEAVT', 'Choose avatar from the available list');
-define('_US_PRESSLOGIN', 'Press the button below to login');
-define('_US_ADMINNO', 'User in the webmasters group cannot be removed');
-define('_US_GROUPS', 'User\'s Groups');
-define('_US_REMEMBERME', 'Remember me');
-// Welcoming emai/PM subject
-define('_US_WELCOME_SUBJECT', 'Welcome to %s');
-
-//XOOPS 2.5.4
-define('_US_SKYPE', 'Skype');
-define('_US_FACEBOOK', 'Facebook');
-
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/locale/en_US/en_US.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -49,8 +49,6 @@
class XoopsLocaleEn_US extends Xoops_Locale_Abstract
{
-
- //const PLEASE_WAIT = "Please wait";
const ABOUT = "About";
const ACTION = "Action";
const ACTIONS = "Actions";
@@ -161,6 +159,7 @@
const CATEGORY = "Category";
const CENTER = "Center";
const CF_FOLLOWING_WORDS_SHORTER_THAN_NOT_INCLUDED = "The following words are shorter than allowed minimum length (%u chars) and were not included in your search:";
+ const CF_WROTE = "%s wrote:";
const CHANGE_LOG = "Change log";
const CHARSET = "Charset";
const CHARSETS = "Charsets";
@@ -275,6 +274,7 @@
const EF_FOLDER_NOT_WRITABLE = "Folder '%s' is not writable by the server!";
const EF_IMAGE_SIZE_NOT_FETCHED = "'%s' image size was not fetched, skipping max dimension check...";
const EF_INVALID_SQL = "SQL '%s' is invalid!";
+ const EF_KEYWORDS_MUST_BE_GREATER_THAN = "Keywords must be at least <strong>%s</strong> characters long!";
const EF_NOTIFICATION_EMAIL_NOT_SENT_TO = "Notification email was not sent to '%s'!";
const EF_NOT_CREATED = "'%s' was not created!";
const EF_NOT_DELETED = "'%s' was not deleted!";
@@ -292,7 +292,7 @@
const EF_TABLE_NOT_UPDATED = "Table '%s' was not updated!"; // L134
const EF_UNEXPECTED_ERROR = "Unexpected error: %s";
const EF_USERNAME_MUST_BE_LESS_THAN = "Username is too long, it must be less than '%s' characters!";
- const EF_USERNAME_MUST_BE_LONGER_THAN = "Username is too short, it must be more than '%s' characters!";
+ const EF_USERNAME_MUST_BE_MORE_THAN = "Username is too short, it must be more than '%s' characters!";
const EF_USER_NAME_ALREADY_EXISTS = "User name '%s' already exists!";
const EF_USER_NOT_FOUND_IN_DIRECTORY_SERVER = "User '%s' not found in the directory server (%s) in %s!";
const EMAIL = "Email";
@@ -382,7 +382,7 @@
const E_TEMPLATE_FILE_NOT_OPENED = "Template file was not opened!";
const E_TLS_CONNECTION_NOT_OPENED = "TLS connection was not opened!";
const E_TO_MANY_ATTEMPTS = "Too many attempts!";
- const E_USERNAME_SHOULD_NOT_CONTAIN_SPACES = "There cannot be any spaces in the username!";
+ const E_UPLOAD_DIRECTORY_NOT_SET = "Upload directory not set!";
const E_USERNAME_TAKEN = "Username already taken!";
const E_USERS_NOT_FOUND = "No users found!";
const E_USER_ID_NOT_FETCHED = "User ID was not fetched!";
@@ -416,7 +416,7 @@
const F_AUTHORIZED_MIME_TYPES = "Authorized mime types: %s";
const F_BY_REGISTERED_USERS_ARE_ALWAYS_APPROVED = "%s by registered users are always approved";
const F_CLICK_HERE = "Click <a href='%s'>here</a>.";
- const F_CONFIRMATION_EMAIL_MAILED = "Confirmation email for %s mailed.";
+ const F_CONFIRMATION_EMAIL_SENT = "Confirmation email for %s mailed.";
const F_CURRENT_TEXT_LENGTH = "Current text length: %s";
const F_DAYS = "%s days";
const F_DELETED = "%s deleted";
@@ -433,7 +433,6 @@
const F_INTERESTING_SITE = "Interesting site: %s";
const F_IN_FILE_LINE = "%s in file %s line %s";
const F_IS_REQUIRED = "%s is required";
- const EF_KEYWORDS_MUST_BE_GREATER_THAN = "Keywords must be at least <strong>%s</strong> characters long!";
const F_KEYWORDS_SHORTER_THAN_WILL_BE_IGNORED = "Keywords shorter than <strong>%s</strong> characters will be ignored";
const F_MAXIMUM_ATTEMPTS = "Maximum attempts you can try: %d";
const F_MAX_PIXELS_WIDTH_HEIGHT = "Max Pixels: %s x %s (width x height)";
@@ -465,7 +464,6 @@
const F_USER_FOUND = "%s user found";
const F_USING_AUTHENTICATION_METHOD = "Using %s authentication method";
const F_WELCOME_TO = "Welcome to %s";
- const CF_WROTE = "%s wrote:";
const F_YES_DELETE_ALL = "Yes, delete all %s";
const F_YOUR_ACCOUNT_AT = "Your account at %s";
const GO_BACK = "Go back";
@@ -888,7 +886,6 @@
const NO_FILE_UPLOADED = "No file uploaded";
const NO_MATCH_FOUND_FOR_QUERY = "No match found for your query";
const NO_PROBLEM_ENTER_EMAIL_WE_HAVE_ON_FILE = "No problem. Simply enter the e-mail address we have on file for your account.";
-
const NO_TITLE = "No title";
const NUMBER_OF_ITEMS_PER_PAGE_IN_ADMIN_SIDE = "Number of items to display per page in admin side";
const NUMBER_OF_ITEMS_PER_PAGE_IN_USER_SIDE = "Number of items to display per page in user side";
@@ -923,7 +920,7 @@
const PDF_ICON = "PDF icon";
const PENDING = "Pending";
const PERMISSIONS = "Permissions";
- const PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION = "Please wait for your account to be activated by the administrators. You will receive an email once you are activated. This could take a while so please be patient.";
+ const PLEASE_WAIT_FOR_ACCOUNT_ACTIVATION = "Please wait for your account to be activated by the administrators. You will receive an email once you are activated. This could take a while so please be patient.";
const PM = "PM";
const POSITION = "Position";
const POSITION_CONTAINS = "Position contains";
@@ -950,12 +947,13 @@
const QUERY = "Query";
const QUERY_MODE = "Query mode";
const QUOTE = "Quote";
- const Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES = "Are you sure you want to delete these message(s)?";
const Q_ARE_YOU_SURE = "Are you sure?";
const Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT = "Are you sure to delete your account?";
const Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_ITEM = "Are you sure you want to delete this item?";
+ const Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES = "Are you sure you want to delete these message(s)?";
const Q_LOST_YOUR_PASSWORD = "Lost your Password?";
const Q_NOT_REGISTERED = "Not registered?";
+ const Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS = "Receive occasional email notices <br />from administrators and moderators?";
const Q_USE_HTML = "Use HTML?";
const RANDOM = "Random";
const RANDOM_ITEMS = "Random items";
@@ -965,7 +963,6 @@
const READS = "Reads";
const REAL_NAME = "Real name";
const REAL_PLAYER = "Real Player";
- const Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS = "Receive occasional email notices <br />from administrators and moderators?";
const RECENT_ITEMS = "Recent items";
const RECOMMEND_SITE_TO_FRIEND = "Recommend this site to a friend";
const REGISTERED = "Registered";
@@ -1009,7 +1006,7 @@
const SF_EXTENSION_IS_INSTALLED = "The extension '%s' is installed";
const SF_FOLDER_EXISTS = "The folder '%s' exists!";
const SF_FOUND_MATCHES = "Found <strong>%s</strong> match(es)";
- const SF_NOTIFICATION_EMAIL_SENT = "Notification email sent to %s!";
+ const SF_NOTIFICATION_EMAIL_SENT_TO = "Notification email sent to %s!";
const SF_PASSWORD_SENT_TO = "Password sent to %s!";
const SF_PRIVATE_MESSAGE_SENT_TO = "Private message sent to %s!";
const SF_SAVED = "%s saved";
@@ -1090,7 +1087,6 @@
const UPDATE_NOW = "Update now";
const UPDATE_OPTIONS = "Update options";
const UPLOAD_AVATAR = "Upload avatar";
- const E_UPLOAD_DIRECTORY_NOT_SET = "Upload directory not set!";
const URL = "URL";
const URL_CONTAINS = "URL contains";
const USER = "User";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/lostpass.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -29,7 +29,7 @@
$email = isset($_POST['email']) ? trim($_POST['email']) : $email;
if ($email == '') {
- $xoops->redirect("user.php", 2, _US_SORRYNOTFOUND);
+ $xoops->redirect("user.php", 2, XoopsLocale::NO_);
exit();
}
@@ -38,7 +38,7 @@
$getuser = $member_handler->getUsers(new Criteria('email', $myts->addSlashes($email)));
if (empty($getuser)) {
- $msg = _US_SORRYNOTFOUND;
+ $msg = XoopsLocale::E_NO_USER_FOUND;
$xoops->redirect("user.php", 2, $msg);
} else {
$code = isset($_GET['code']) ? trim($_GET['code']) : '';
@@ -56,7 +56,7 @@
$xoopsMailer->setToUsers($getuser[0]);
$xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
$xoopsMailer->setFromName($xoops->getConfig('sitename'));
- $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ, XOOPS_URL));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_NEW_PASSWORD_REQUEST_AT, XOOPS_URL));
if (!$xoopsMailer->send()) {
echo $xoopsMailer->getErrors();
}
@@ -64,10 +64,10 @@
$sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $xoops->db()->prefix("users"), md5($newpass), $getuser[0]->getVar('uid'));
if (!$xoops->db()->queryF($sql)) {
$xoops->header();
- echo _US_MAILPWDNG;
+ echo XoopsLocale::E_USER_NOT_UPDATED;
$xoops->footer();
}
- $xoops->redirect("user.php", 3, sprintf(_US_PWDMAILED, $getuser[0]->getVar("uname")), false);
+ $xoops->redirect("user.php", 3, sprintf(XoopsLocale::SF_PASSWORD_SENT_TO, $getuser[0]->getVar("uname")), false);
// If no Code, send it
} else {
$xoopsMailer = $xoops->getMailer();
@@ -81,13 +81,13 @@
$xoopsMailer->setToUsers($getuser[0]);
$xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
$xoopsMailer->setFromName($xoops->getConfig('sitename'));
- $xoopsMailer->setSubject(sprintf(_US_NEWPWDREQ, $xoops->getConfig('sitename')));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_NEW_PASSWORD_REQUEST_AT, $xoops->getConfig('sitename')));
$xoops->header();
if (!$xoopsMailer->send()) {
echo $xoopsMailer->getErrors();
}
echo "<h4>";
- printf(_US_CONFMAIL, $getuser[0]->getVar("uname"));
+ printf(XoopsLocale::F_CONFIRMATION_EMAIL_SENT, $getuser[0]->getVar("uname"));
echo "</h4>";
$xoops->footer();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -56,12 +56,12 @@
$xoopsMailer->setToUsers($thisuser);
$xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
$xoopsMailer->setFromName($xoops->getConfig('sitename'));
- $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $xoops->getConfig('sitename')));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_YOUR_ACCOUNT_AT, $xoops->getConfig('sitename')));
$xoops->footer();
if (!$xoopsMailer->send()) {
- printf(_US_ACTVMAILNG, $thisuser->getVar('uname') );
+ printf(XoopsLocale::EF_NOTIFICATION_EMAIL_NOT_SENT_TO, $thisuser->getVar('uname') );
} else {
- printf(_US_ACTVMAILOK, $thisuser->getVar('uname') );
+ printf(XoopsLocale::SF_NOTIFICATION_EMAIL_SENT_TO, $thisuser->getVar('uname') );
}
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
} else {
@@ -78,7 +78,7 @@
$member_handler = $xoops->getHandlerMember();
$getuser = $member_handler->getUsers(new Criteria('email', $myts->addSlashes(trim($_REQUEST['email']))));
if (count($getuser) == 0) {
- $xoops->redirect(XOOPS_URL, 2, _US_SORRYNOTFOUND);
+ $xoops->redirect(XOOPS_URL, 2, XoopsLocale::E_NO_USER_FOUND);
}
/* @var XoopsUser $getuser */
$getuser = $getuser[0];
@@ -94,11 +94,11 @@
$xoopsMailer->setToUsers($getuser[0]);
$xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
$xoopsMailer->setFromName($xoops->getConfig('sitename'));
- $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $getuser->getVar('uname') ));
+ $xoopsMailer->setSubject(sprintf(XoopsLocale::F_USER_ACTIVATION_KEY_FOR, $getuser->getVar('uname') ));
if (!$xoopsMailer->send()) {
- echo _US_YOURREGMAILNG;
+ echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_NOT_BEEN_SENT_WITH_ACTIVATION_KEY;
} else {
- echo _US_YOURREGISTERED;
+ echo XoopsLocale::S_YOU_ARE_NOW_REGISTERED . ' ' . XoopsLocale::EMAIL_HAS_BEEN_SENT_WITH_ACTIVATION_KEY;
}
} else {
$form = new XoopsThemeForm('', 'form', 'activate.php');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -21,6 +21,4 @@
*/
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-XoopsLoad::load('system', 'system');
-$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
\ No newline at end of file
+XoopsLoad::load('system', 'system');
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/user.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/user.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -61,7 +61,7 @@
$obj = $handler->getUser($_REQUEST['id']);
if (in_array(XOOPS_GROUP_ADMIN, $obj->getGroups()) && !in_array(XOOPS_GROUP_ADMIN, $xoops->user->getGroups())) {
// If not webmaster trying to edit a webmaster - disallow
- $xoops->redirect("user.php", 3, _US_NOEDITRIGHT);
+ $xoops->redirect("user.php", 3, XoopsLocale::E_NO_ACTION_PERMISSION);
}
include_once dirname(dirname(__FILE__)) . '/include/forms.php';
$form = profile_getUserForm($obj);
@@ -71,7 +71,7 @@
case "save":
$xoops->loadLanguage("main", $xoops->module->getVar('dirname', 'n'));
if (!$xoops->security()->check()) {
- $xoops->redirect('user.php', 3, _US_NOEDITRIGHT . "<br />" . implode('<br />', $xoops->security()->getErrors()));
+ $xoops->redirect('user.php', 3, XoopsLocale::E_NO_ACTION_PERMISSION . "<br />" . implode('<br />', $xoops->security()->getErrors()));
exit;
}
@@ -174,7 +174,7 @@
if ($user->isNew()) {
$xoops->redirect('user.php', 2, _PROFILE_AM_USERCREATED, false);
} else {
- $xoops->redirect('user.php', 2, _US_PROFUPDATED, false);
+ $xoops->redirect('user.php', 2, XoopsLocale::S_YOUR_PROFILE_UPDATED, false);
}
}
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -21,9 +21,8 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
-
$xoops->getConfigs();
if (!$xoops->user || $xoops->getConfig('allow_chgmail') != 1) {
@@ -35,7 +34,7 @@
if (!isset($_POST['submit']) || !isset($_POST['passwd'])) {
//show change password form
$form = new XoopsThemeForm(_PROFILE_MA_CHANGEMAIL, 'emailform', $_SERVER['REQUEST_URI'], 'post', true);
- $form->addElement(new XoopsFormPassword(_US_PASSWORD, 'passwd', 15, 50), true);
+ $form->addElement(new XoopsFormPassword(XoopsLocale::PASSWORD, 'passwd', 15, 50), true);
$form->addElement(new XoopsFormText(_PROFILE_MA_NEWMAIL, 'newmail', 15, 50), true);
$form->addElement(new XoopsFormButton('', 'submit', XoopsLocale::A_SUBMIT, 'submit'));
$form->assign($xoops->tpl());
@@ -48,7 +47,7 @@
$errors[] = _PROFILE_MA_WRONGPASSWORD;
}
if (!$xoops->checkEmail($email)) {
- $errors[] = _US_INVALIDMAIL;
+ $errors[] = XoopsLocale::E_INVALID_EMAIL;
}
if ($errors) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -23,7 +23,7 @@
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
+
if (!$xoops->isUser()) {
$xoops->redirect(XOOPS_URL, 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
}
@@ -51,10 +51,10 @@
$errors[] = _PROFILE_MA_WRONGPASSWORD;
}
if (strlen($password) < $xoops->getConfig('minpass')) {
- $errors[] = sprintf(_US_PWDTOOSHORT, $xoops->getConfig('minpass'));
+ $errors[] = sprintf(XoopsLocale::EF_PASSWORD_MUST_BE_GREATER_THAN, $xoops->getConfig('minpass'));
}
if ($password != $vpass) {
- $errors[] = _US_PASSNOTSAME;
+ $errors[] = XoopsLocale::E_PASSWORDS_MUST_MATCH;
}
if ($errors) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -23,11 +23,10 @@
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
// If not a user, redirect
if (!$xoops->isUser()) {
- $xoops->redirect(XOOPS_URL, 3, _US_NOEDITRIGHT);
+ $xoops->redirect(XOOPS_URL, 3, XoopsLocale::E_NO_ACTION_PERMISSION);
}
$myts = MyTextSanitizer::getInstance();
@@ -36,7 +35,7 @@
if ($op == 'save') {
if (!$xoops->security()->check()) {
- $xoops->redirect(XOOPS_URL . "/modules/" . $xoops->module->getVar('dirname', 'n') . "/", 3, _US_NOEDITRIGHT . "<br />" . implode('<br />', $xoops->security()->getErrors()));
+ $xoops->redirect(XOOPS_URL . "/modules/" . $xoops->module->getVar('dirname', 'n') . "/", 3, XoopsLocale::E_NO_ACTION_PERMISSION . "<br />" . implode('<br />', $xoops->security()->getErrors()));
exit();
}
$uid = $xoops->user->getVar('uid');
@@ -85,7 +84,7 @@
$profile->setVar('profile_id', $edituser->getVar('uid'));
$profile_handler->insert($profile);
unset($_SESSION['xoopsUserTheme']);
- $xoops->redirect(XOOPS_URL . '/modules/' . $xoops->module->getVar('dirname', 'n') . '/userinfo.php?uid=' . $edituser->getVar('uid'), 2, _US_PROFUPDATED);
+ $xoops->redirect(XOOPS_URL . '/modules/' . $xoops->module->getVar('dirname', 'n') . '/userinfo.php?uid=' . $edituser->getVar('uid'), 2, XoopsLocale::S_YOUR_PROFILE_UPDATED);
}
}
}
@@ -99,6 +98,6 @@
$xoops->tpl()->assign('stop', $stop);
}
- $xoops->appendConfig('profile_breadcrumbs', array('title' => _US_EDITPROFILE));
+ $xoops->appendConfig('profile_breadcrumbs', array('title' => XoopsLocale::EDIT_PROFILE));
}
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/header.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/header.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/header.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -23,7 +23,6 @@
include dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
$xoops = Xoops::getInstance();
-$xoops->loadLanguage('user');
$xoops->setConfig('profile_breadcrumbs', array(
array(
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -58,7 +58,7 @@
$weights[0][] = 0;
$elements[0][] =
- array('element' => new XoopsFormPassword(_US_PASSWORD, 'pass', 5, 32, ''), 'required' => true);
+ array('element' => new XoopsFormPassword(XoopsLocale::PASSWORD, 'pass', 5, 32, ''), 'required' => true);
$weights[0][] = 0;
$elements[0][] =
@@ -133,7 +133,7 @@
$action = $_SERVER['REQUEST_URI'];
}
- $title = $user->isNew() ? _PROFILE_AM_ADDUSER : _US_EDITPROFILE;
+ $title = $user->isNew() ? _PROFILE_AM_ADDUSER : XoopsLocale::EDIT_PROFILE;
$form = new XoopsThemeForm($title, 'userinfo', $action, 'post', true);
@@ -170,7 +170,7 @@
//If the user is an admin and is editing someone else
$pwd_text = new XoopsFormPassword('', 'password', 3, 32);
$pwd_text2 = new XoopsFormPassword('', 'vpass', 3, 32);
- $pwd_tray = new XoopsFormElementTray(_US_PASSWORD . '<br />' . _US_TYPEPASSTWICE);
+ $pwd_tray = new XoopsFormElementTray(XoopsLocale::PASSWORD . '<br />' . XoopsLocale::TYPE_NEW_PASSWORD_TWICE_TO_CHANGE_IT);
$pwd_tray->addElement($pwd_text);
$pwd_tray->addElement($pwd_text2);
$elements[0][] = array('element' => $pwd_tray, 'required' => 0); //cannot set an element tray required
@@ -226,7 +226,7 @@
include_once $xoops->path('modules/system/constants.php');
if ($gperm_handler->checkRight('system_admin', XOOPS_SYSTEM_GROUP, $xoops->user->getGroups(), 1)) {
//add group selection
- $group_select = new XoopsFormSelectGroup(_US_GROUPS, 'groups', false, $user->getGroups(), 5, true);
+ $group_select = new XoopsFormSelectGroup(XoopsLocale::USER_GROUPS, 'groups', false, $user->getGroups(), 5, true);
$elements[0][] = array('element' => $group_select, 'required' => 0);
//set as latest;
$weights[0][] = $count_fields + 1;
@@ -247,6 +247,6 @@
}
$form->addElement(new XoopsFormHidden('uid', $user->getVar('uid')));
- $form->addElement(new XoopsFormButton('', 'submit', _US_SAVECHANGES, 'submit', 'btn primary'));
+ $form->addElement(new XoopsFormButton('', 'submit', XoopsLocale::SAVE_CHANGES, 'submit', 'btn primary'));
return $form;
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php 2013-01-28 20:17:14 UTC (rev 10940)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/install.php 2013-01-28 20:47:51 UTC (rev 10941)
@@ -29,7 +29,6 @@
{
$xoops = Xoops::getInstance();
- $xoops->loadLanguage('user');
$xoops->registry()->set('profile_id', $module->getVar('mid'));
// Create registration steps
@@ -42,29 +41,29 @@
profile_install_addCategory(_PROFILE_MI_CATEGORY_SETTINGS, 3);
profile_install_addCategory(_PROFILE_MI_CATEGORY_COMMUNITY, 4);
- profile_install_addField('name', _US_REALNAME, '', 1, 'textbox', 1, 1, 1, array(), 2, 255);
- profile_install_addField('user_from', _US_LOCATION, '', 1, 'textbox', 1, 2, 1, array(), 2, 255);
+ profile_install_addField('name', XoopsLocale::REAL_NAME, '', 1, 'textbox', 1, 1, 1, array(), 2, 255);
+ profile_install_addField('user_from', XoopsLocale::LOCATION, '', 1, 'textbox', 1, 2, 1, array(), 2, 255);
profile_install_addField('timezone_offset', XoopsLocale::TIME_ZONE, '', 1, 'timezone', 1, 3, 1, array(), 2, 0);
- profile_install_addField('user_occ', _US_OCCUPATION, '', 1, 'textbox', 1, 4, 1, array(), 2, 255);
- profile_install_addField('user_intrest', _US_INTEREST, '', 1, 'textbox', 1, 5, 1, array(), 2, 255);
- profile_install_addField('bio', _US_EXTRAINFO, '', 1, 'textarea', 2, 6, 1, array(), 2, 0);
- profile_install_addField('user_regdate', _US_MEMBERSINCE, '', 1, 'datetime', 3, 7, 0, array(), 0, 10);
+ profile_install_addField('user_occ', XoopsLocale::OCCUPATION, '', 1, 'textbox', 1, 4, 1, array(), 2, 255);
+ profile_install_addField('user_intrest', XoopsLocale::INTEREST, '', 1, 'textbox', 1, 5, 1, array(), 2, 255);
+ profile_install_addField('bio', XoopsLocale::EXTRA_INFO, '', 1, 'textarea', 2, 6, 1, array(), 2, 0);
+ profile_install_addField('user_regdate', XoopsLocale::MEMBER_SINCE, '', 1, 'datetime', 3, 7, 0, array(), 0, 10);
- profile_install_addField('user_icq', _US_ICQ, '', 2, 'textbox', 1, 1, 1, array(), 2, 255);
- profile_install_addField('user_aim', _US_AIM, '', 2, 'textbox', 1, 2, 1, array(), 2, 255);
- profile_install_addField('user_yim', _US_YIM, '', 2, 'textbox', 1, 3, 1, array(), 2, 255);
- profile_install_addField('user_msnm', _US_MSNM, '', 2, 'textbox', 1, 4, 1, array(), 2, 255);
+ profile_install_addField('user_icq', XoopsLocale::ICQ, '', 2, 'textbox', 1, 1, 1, array(), 2, 255);
+ profile_install_addField('user_aim', XoopsLocale::AIM, '', 2, 'textbox', 1, 2, 1, array(), 2, 255);
+ profile_install_addField('user_yim', XoopsLocale::YIM, '', 2, 'textbox', 1, 3, 1, array(), 2, 255);
+ profile_install_addField('user_msnm', XoopsLocale::MSNM, '', 2, 'textbox', 1, 4, 1, array(), 2, 255);
profile_install_addField('user_viewemail', XoopsLocale::ALLOW_OTHER_USERS_TO_VIEW_EMAIL, '', 3, 'yesno', 3, 1, 1, array(), 2, 1, false);
- profile_install_addField('attachsig', _US_SHOWSIG, '', 3, 'yesno', 3, 2, 1, array(), 0, 1, false);
+ profile_install_addField('attachsig', XoopsLocale::ALWAYS_ATTACH_MY_SIGNATURE, '', 3, 'yesno', 3, 2, 1, array(), 0, 1, false);
profile_install_addField('user_mailok', XoopsLocale::Q_RECEIVE_OCCASIONAL_EMAIL_NOTICES_FROM_ADMINISTRATORS, '', 3, 'yesno', 3, 3, 1, array(), 2, 1, false);
profile_install_addField('theme', _PROFILE_MA_THEME, '', 3, 'theme', 1, 4, 1, array(), 0, 0, false);
profile_install_addField('url', _...
[truncated message content] |
