Minahito
minah****@users*****
2006年 8月 18日 (金) 14:35:30 JST
Index: xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.6 xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.7
--- xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php:1.1.2.6 Wed Jul 19 19:21:25 2006
+++ xoops2jp/html/modules/user/forms/AbstractUserEditForm.class.php Fri Aug 18 14:35:30 2006
@@ -31,7 +31,7 @@
$criteria->add(new Criteria('uid', $this->get('uid'), '<>'));
}
if ($userHandler->getCount($criteria) > 0) {
- $this->addErrorMessage(_US_NICKNAMETAKEN);
+ $this->addErrorMessage(_MD_USER_LANG_NICKNAMETAKEN);
}
//
@@ -52,7 +52,7 @@
break;
}
if(preg_match($regex,$this->get('uname'))) {
- $this->addErrorMessage(_US_INVALIDNICKNAME);
+ $this->addErrorMessage(_MD_USER_LANG_INVALIDNICKNAME);
}
//
@@ -60,7 +60,7 @@
//
foreach(explode("|",$this->mConfig['bad_unames']) as $pattern) {
if(!empty($pattern)&&preg_match("/".$pattern."/i",$this->get('uname'))) {
- $this->addErrorMessage(_US_NAMERESERVED);
+ $this->addErrorMessage(_MD_USER_LANG_NAMERESERVED);
break;
}
}
Index: xoops2jp/html/modules/user/forms/EditUserForm.class.php
diff -u xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.11 xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.12
--- xoops2jp/html/modules/user/forms/EditUserForm.class.php:1.1.2.11 Wed Jul 19 19:21:25 2006
+++ xoops2jp/html/modules/user/forms/EditUserForm.class.php Fri Aug 18 14:35:30 2006
@@ -58,41 +58,41 @@
//
$this->mFieldProperties['name'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['name']->setDependsByArray(array('maxlength'));
- $this->mFieldProperties['name']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_REALNAME, "60");
+ $this->mFieldProperties['name']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_NAME, "60");
$this->mFieldProperties['name']->addVar("maxlength", 60);
if ($this->mConfig['allow_chgmail']) {
$this->mFieldProperties['email'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['email']->setDependsByArray(array('required', 'maxlength', 'email'));
- $this->mFieldProperties['email']->addMessage("required", _MD_USER_ERROR_REQUIRED, _US_EMAIL, "60");
- $this->mFieldProperties['email']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_EMAIL, "60");
+ $this->mFieldProperties['email']->addMessage("required", _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_EMAIL, "60");
+ $this->mFieldProperties['email']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_EMAIL, "60");
$this->mFieldProperties['email']->addVar("maxlength", 60);
$this->mFieldProperties['email']->addMessage('email', _MD_USER_ERROR_EMAIL_FORMAT);
}
$this->mFieldProperties['url'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['url']->setDependsByArray(array('maxlength'));
- $this->mFieldProperties['url']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_WEBSITE, "100");
+ $this->mFieldProperties['url']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_WEBSITE, "100");
$this->mFieldProperties['url']->addVar("maxlength", 100);
$this->mFieldProperties['user_icq'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['user_icq']->setDependsByArray(array('maxlength'));
- $this->mFieldProperties['user_icq']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_ICQ, "15");
+ $this->mFieldProperties['user_icq']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_ICQ, "15");
$this->mFieldProperties['user_icq']->addVar("maxlength", 15);
$this->mFieldProperties['user_from'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['user_from']->setDependsByArray(array('maxlength'));
- $this->mFieldProperties['user_from']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_LOCATION, "100");
+ $this->mFieldProperties['user_from']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_FROM, "100");
$this->mFieldProperties['user_from']->addVar("maxlength", 100);
$this->mFieldProperties['user_aim'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['user_aim']->setDependsByArray(array('maxlength'));
- $this->mFieldProperties['user_aim']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_AIM, "18");
+ $this->mFieldProperties['user_aim']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_AIM, "18");
$this->mFieldProperties['user_aim']->addVar("maxlength", 18);
$this->mFieldProperties['user_msnm'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['user_msnm']->setDependsByArray(array('maxlength'));
- $this->mFieldProperties['user_msnm']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _US_MSNM, "100");
+ $this->mFieldProperties['user_msnm']->addMessage("maxlength", _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_MSNM, "100");
$this->mFieldProperties['user_msnm']->addVar("maxlength", 100);
$this->mFieldProperties['pass'] =& new XCube_FieldProperty($this);
@@ -104,7 +104,7 @@
$this->mFieldProperties['vpass'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['vpass']->setDependsByArray(array('maxlength'));
- $this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_VERIFYPASS, '32');
+ $this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_VERIFYPASS, '32');
$this->mFieldProperties['vpass']->addVar('maxlength', 32);
$this->mFieldProperties['timezone_offset'] =& new XCube_FieldProperty($this);
@@ -113,12 +113,12 @@
$this->mFieldProperties['umode'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['umode']->setDependsByArray(array('required'));
- $this->mFieldProperties['umode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_CDISPLAYMODE);
+ $this->mFieldProperties['umode']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UMODE);
$this->mFieldProperties['uorder'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['uorder']->setDependsByArray(array('required','intRange'));
- $this->mFieldProperties['uorder']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_CSORTORDER);
- $this->mFieldProperties['uorder']->addMessage('intRange', _MD_USER_ERROR_INJURY, _US_CSORTORDER);
+ $this->mFieldProperties['uorder']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_UORDER);
+ $this->mFieldProperties['uorder']->addMessage('intRange', _MD_USER_ERROR_INJURY, _MD_USER_LANG_UORDER);
$this->mFieldProperties['uorder']->addVar('min', 0);
$this->mFieldProperties['uorder']->addVar('max', 1);
@@ -138,12 +138,12 @@
$this->mFieldProperties['user_occ'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['user_occ']->setDependsByArray(array('maxlength'));
- $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_OCCUPATION, '100');
+ $this->mFieldProperties['user_occ']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_OCC, '100');
$this->mFieldProperties['user_occ']->addVar('maxlength', 100);
$this->mFieldProperties['user_intrest'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['user_intrest']->setDependsByArray(array('maxlength'));
- $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_INTEREST, '150');
+ $this->mFieldProperties['user_intrest']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_USER_INTEREST, '150');
$this->mFieldProperties['user_intrest']->addVar('maxlength', 150);
}
Index: xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php
diff -u xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.7 xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.8
--- xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php:1.1.2.7 Wed Jul 19 19:21:25 2006
+++ xoops2jp/html/modules/user/forms/UserRegisterEditForm.class.php Fri Aug 18 14:35:30 2006
@@ -65,8 +65,8 @@
$this->mFieldProperties['vpass'] =& new XCube_FieldProperty($this);
$this->mFieldProperties['vpass']->setDependsByArray(array('required', 'maxlength'));
- $this->mFieldProperties['vpass']->addMessage('required', _MD_USER_ERROR_REQUIRED, _US_VERIFYPASS, '32');
- $this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _US_VERIFYPASS, '32');
+ $this->mFieldProperties['vpass']->addMessage('required', _MD_USER_ERROR_REQUIRED, _MD_USER_LANG_VERIFYPASS, '32');
+ $this->mFieldProperties['vpass']->addMessage('maxlength', _MD_USER_ERROR_MAXLENGTH, _MD_USER_LANG_VERIFYPASS, '32');
$this->mFieldProperties['vpass']->addVar('maxlength', 32);
$this->mFieldProperties['timezone_offset'] =& new XCube_FieldProperty($this);
@@ -108,8 +108,8 @@
// set fields
$this->mFieldProperties['agree']=new XCube_FieldProperty($this);
$this->mFieldProperties['agree']->setDependsByArray(array('required','intRange'));
- $this->mFieldProperties['agree']->addMessage("required",_US_UNEEDAGREE);
- $this->mFieldProperties['agree']->addMessage("intRange",_US_UNEEDAGREE);
+ $this->mFieldProperties['agree']->addMessage("required",_MD_USER_ERROR_UNEEDAGREE);
+ $this->mFieldProperties['agree']->addMessage("intRange",_MD_USER_ERROR_UNEEDAGREE);
$this->mFieldProperties['agree']->addVar("min",1);
$this->mFieldProperties['agree']->addVar("max",1);
}