* If search returns zero results and current search engine has a "did you mean"
suggestion, results for suggestion will be shown. Can be disabled by setting
$wgSearchRunSuggestedQuery to false.
+* Added several JavaScript libraries for uploading files to MediaWiki
+ from the client-side. See documentation for mw.Upload and its
+ subclasses for more information.
+* Added OOUI dialogs and layout for file upload interfaces. See
+ documentation for mw.Upload.Dialog, mw.Upload.BookletLayout and its
+ subclasses for more information.
== External libraries ==
=== Upgraded external libraries ===
1000 for the latter) are now hard-coded.
* $wgDebugDumpSqlLength was removed (deprecated in 1.24).
* $wgDebugDBTransactions was removed (deprecated in 1.20).
-* $wgRemoteUploadTarget (added in 1.26) removed, replaced by $wgForeignUploadTargets
* $wgUseXVO has been removed, as it provides functionality only used by
custom Wikimedia patches against Squid 2.x that probably noone uses in
production anymore. There is now $wgUseKeyHeader that provides similar
* $wgScriptExtension (and support for '.php5' entry points) was removed. See the
deprecation notice in the release notes for version 1.25 for advice on how to
preserve support for '.php5' entry points via URL rewriting.
+* Password handling via the User object has been deprecated and partially
+ removed, pending the future introduction of AuthManager. In particular:
+** expirePassword(), getPasswordExpireDate(), resetPasswordExpiration(), and
+ getPasswordExpired() have been removed. They were unused outside of core.
+** The mPassword, mNewpassword, mNewpassTime, and mPasswordExpires fields are
+ now private and will be removed in the future.
+** The getPassword() and getTemporaryPassword() methods now throw
+ BadMethodCallException and will be removed in the future.
+** The ability to pass 'password' and 'newpassword' to createNew() has been
+ removed. The only users of it seem to have been using it to set invalid
+ passwords, and so shouldn't be greatly affected.
+** setPassword(), setInternalPassword(), and setNewpassword() have been
+ deprecated, pending the introduction of AuthManager.
+** User::randomPassword() is deprecated in favor of a new method
+ PasswordFactory::generateRandomPasswordString()
+** User::getPasswordFactory() is deprecated, callers should just create a
+ PasswordFactory themselves.
+** A new constructor, User::newSystemUser(), has been added to simplify the
+ creation of passwordless "system" users for logged actions.
=== New features in 1.27 ===
* $wgDataCenterId and $wgDataCenterRoles where added, which will serve as
* $wgCdnMaxageLagged was added, which limits the CDN cache TTL
when any load balancer uses a DB that is lagged beyond the 'max lag'
setting in the relevant section of $wgLBFactoryConf.
-* Added several JavaScript libraries for uploading files to MediaWiki
- from the client-side. See documentation for mw.Upload and its
- subclasses for more information.
-* Added OOUI dialogs and layout for file upload interfaces. See
- documentation for mw.Upload.Dialog, mw.Upload.BookletLayout and its
- subclasses for more information.
+* User::newSystemUser() may be used to simplify the creation of passwordless
+ "system" users for logged actions from scripts and extensions.
==== External libraries ====
"ext-iconv": "*",
"liuggio/statsd-php-client": "1.0.16",
"mediawiki/at-ease": "1.1.0",
- "oojs/oojs-ui": "0.12.11",
+ "oojs/oojs-ui": "0.12.12",
"oyejorge/less.php": "1.7.0.9",
"php": ">=5.3.3",
"psr/log": "1.0.0",
$user: the user (object) marking the revision as patrolled
$wcOnlySysopsCanPatrol: config setting indicating whether the user needs to be a
sysop in order to mark an edit patrolled.
+$auto true if the edit is being marked as patrolled automatically
'MarkPatrolledComplete': After an edit is marked patrolled.
$rcid: ID of the revision marked as patrolled
$user: user (object) who marked the edit patrolled
$wcOnlySysopsCanPatrol: config setting indicating whether the user must be a
sysop to patrol the edit.
+$auto true if the edit is being marked as patrolled automatically
'MediaWikiPerformAction': Override MediaWiki::performAction(). Use this to do
something completely different, after the basic globals have been set up, but
}
}
- // Sort the letters.
- //
- // It's impossible to have the precompiled data file properly sorted,
- // because the sort order changes depending on ICU version. If the
- // array is not properly sorted, the binary search will return random
- // results.
- //
- // We also take this opportunity to remove primary collisions.
+ /* Sort the letters.
+ *
+ * It's impossible to have the precompiled data file properly sorted,
+ * because the sort order changes depending on ICU version. If the
+ * array is not properly sorted, the binary search will return random
+ * results.
+ *
+ * We also take this opportunity to remove primary collisions.
+ */
$letterMap = array();
foreach ( $letters as $letter ) {
$key = $this->getPrimarySortKey( $letter );
}
}
ksort( $letterMap, SORT_STRING );
- // Remove duplicate prefixes. Basically if something has a sortkey
- // which is a prefix of some other sortkey, then it is an
- // expansion and probably should not be considered a section
- // header.
- //
- // For example 'þ' is sometimes sorted as if it is the letters
- // 'th'. Other times it is its own primary element. Another
- // example is '₨'. Sometimes its a currency symbol. Sometimes it
- // is an 'R' followed by an 's'.
- //
- // Additionally an expanded element should always sort directly
- // after its first element due to they way sortkeys work.
- //
- // UCA sortkey elements are of variable length but no collation
- // element should be a prefix of some other element, so I think
- // this is safe. See:
- // * https://ssl.icu-project.org/repos/icu/icuhtml/trunk/design/collation/ICU_collation_design.htm
- // * http://site.icu-project.org/design/collation/uca-weight-allocation
- //
- // Additionally, there is something called primary compression to
- // worry about. Basically, if you have two primary elements that
- // are more than one byte and both start with the same byte then
- // the first byte is dropped on the second primary. Additionally
- // either \x03 or \xFF may be added to mean that the next primary
- // does not start with the first byte of the first primary.
- //
- // This shouldn't matter much, as the first primary is not
- // changed, and that is what we are comparing against.
- //
- // tl;dr: This makes some assumptions about how icu implements
- // collations. It seems incredibly unlikely these assumptions
- // will change, but nonetheless they are assumptions.
+
+ /* Remove duplicate prefixes. Basically if something has a sortkey
+ * which is a prefix of some other sortkey, then it is an
+ * expansion and probably should not be considered a section
+ * header.
+ *
+ * For example 'þ' is sometimes sorted as if it is the letters
+ * 'th'. Other times it is its own primary element. Another
+ * example is '₨'. Sometimes its a currency symbol. Sometimes it
+ * is an 'R' followed by an 's'.
+ *
+ * Additionally an expanded element should always sort directly
+ * after its first element due to they way sortkeys work.
+ *
+ * UCA sortkey elements are of variable length but no collation
+ * element should be a prefix of some other element, so I think
+ * this is safe. See:
+ * - https://ssl.icu-project.org/repos/icu/icuhtml/trunk/design/collation/ICU_collation_design.htm
+ * - http://site.icu-project.org/design/collation/uca-weight-allocation
+ *
+ * Additionally, there is something called primary compression to
+ * worry about. Basically, if you have two primary elements that
+ * are more than one byte and both start with the same byte then
+ * the first byte is dropped on the second primary. Additionally
+ * either \x03 or \xFF may be added to mean that the next primary
+ * does not start with the first byte of the first primary.
+ *
+ * This shouldn't matter much, as the first primary is not
+ * changed, and that is what we are comparing against.
+ *
+ * tl;dr: This makes some assumptions about how icu implements
+ * collations. It seems incredibly unlikely these assumptions
+ * will change, but nonetheless they are assumptions.
+ */
$prev = false;
$duplicatePrefixes = array();
$status = false;
$logMsg = false;
- // According to the documentation, it is possible for stream_select()
- // to fail due to EINTR. I haven't managed to induce this in testing
- // despite sending various signals. If it did happen, the error
- // message would take the form:
- //
- // stream_select(): unable to select [4]: Interrupted system call (max_fd=5)
- //
- // where [4] is the value of the macro EINTR and "Interrupted system
- // call" is string which according to the Linux manual is "possibly"
- // localised according to LC_MESSAGES.
+ /* According to the documentation, it is possible for stream_select()
+ * to fail due to EINTR. I haven't managed to induce this in testing
+ * despite sending various signals. If it did happen, the error
+ * message would take the form:
+ *
+ * stream_select(): unable to select [4]: Interrupted system call (max_fd=5)
+ *
+ * where [4] is the value of the macro EINTR and "Interrupted system
+ * call" is string which according to the Linux manual is "possibly"
+ * localised according to LC_MESSAGES.
+ */
$eintr = defined( 'SOCKET_EINTR' ) ? SOCKET_EINTR : 4;
$eintrMessage = "stream_select(): unable to select [$eintr]";
*/
function wfGetScriptUrl() {
if ( isset( $_SERVER['SCRIPT_NAME'] ) ) {
- #
- # as it was called, minus the query string.
- #
- # Some sites use Apache rewrite rules to handle subdomains,
- # and have PHP set up in a weird way that causes PHP_SELF
- # to contain the rewritten URL instead of the one that the
- # outside world sees.
- #
- # If in this mode, use SCRIPT_URL instead, which mod_rewrite
- # provides containing the "before" URL.
+ /* as it was called, minus the query string.
+ *
+ * Some sites use Apache rewrite rules to handle subdomains,
+ * and have PHP set up in a weird way that causes PHP_SELF
+ * to contain the rewritten URL instead of the one that the
+ * outside world sees.
+ *
+ * If in this mode, use SCRIPT_URL instead, which mod_rewrite
+ * provides containing the "before" URL.
+ */
return $_SERVER['SCRIPT_NAME'];
} else {
return $_SERVER['URL'];
// we may as well not call htmlspecialchars().
// @todo FIXME: Verify that we actually need to
// escape \n\r\t here, and explain why, exactly.
- #
// We could call Sanitizer::encodeAttribute() for this, but we
// don't because we're stubborn and like our marginal savings on
// byte size from not having to encode unnecessary quotes.
}
// Workaround for bug that caused spaces before references
- // to disappear during processing:
- // https://phabricator.wikimedia.org/T55086
- //
- // Please replace with a better fix if one can be found.
+ // to disappear during processing: https://phabricator.wikimedia.org/T55086
+ // TODO: Please replace with a better fix if one can be found.
$html = str_replace( ' <', ' <', $html );
libxml_use_internal_errors( true );
$html = $this->fixLibXml( $html );
if ( wfIsWindows() ) {
// Cleanup for CRLF misprocessing of unknown origin on Windows.
- //
// If this error continues in the future, please track it down in the
// XML code paths if possible and fix there.
$html = str_replace( ' ', '', $html );
# Create a thumbnail. Alignment depends on the writing direction of
# the page content language (right-aligned for LTR languages,
# left-aligned for RTL languages)
- #
# If a thumbnail width has not been provided, it is set
# to the default user option as specified in Language*.php
if ( $fp['align'] == '' ) {
// curid and oldid request parameters would allow page titles to be enumerated even
// when they are not guessable. So we reset the title to Special:Badtitle before the
// permissions error is displayed.
- //
+
// The skin mostly uses $this->context->getTitle() these days, but some extensions
// still use $wgTitle.
-
$badTitle = SpecialPage::getTitleFor( 'Badtitle' );
$this->context->setTitle( $badTitle );
$wgTitle = $badTitle;
// redirecting to HTTPS. It's likely such a request is going
// to fail due to post data being lost, but let's try anyway
// and just log the instance.
- //
+
// @todo FIXME: See if we could issue a 307 or 308 here, need
// to see how clients (automated & browser) behave when we do
wfDebugLog( 'RedirectedPosts', "Redirected from HTTP to HTTPS: $oldUrl" );
if ( $media == $targetMedia ) {
$media = '';
} elseif ( preg_match( $screenMediaQueryRegex, $media ) === 1 ) {
- // This regex will not attempt to understand a comma-separated media_query_list
- //
- // Example supported values for $media:
- // 'screen', 'only screen', 'screen and (min-width: 982px)' ),
- // Example NOT supported value for $media:
- // '3d-glasses, screen, print and resolution > 90dpi'
- //
- // If it's a print request, we never want any kind of screen stylesheets
- // If it's a handheld request (currently the only other choice with a switch),
- // we don't want simple 'screen' but we might want screen queries that
- // have a max-width or something, so we'll pass all others on and let the
- // client do the query.
+ /* This regex will not attempt to understand a comma-separated media_query_list
+ *
+ * Example supported values for $media:
+ * 'screen', 'only screen', 'screen and (min-width: 982px)' ),
+ * Example NOT supported value for $media:
+ * '3d-glasses, screen, print and resolution > 90dpi'
+ *
+ * If it's a print request, we never want any kind of screen stylesheets
+ * If it's a handheld request (currently the only other choice with a switch),
+ * we don't want simple 'screen' but we might want screen queries that
+ * have a max-width or something, so we'll pass all others on and let the
+ * client do the query.
+ */
if ( $targetMedia == 'print' || $media == 'screen' ) {
return null;
}
*/
public function getNsText() {
if ( $this->isExternal() ) {
- // This probably shouldn't even happen. ohh man, oh yuck.
- // But for interwiki transclusion it sometimes does.
- // Shit. Shit shit shit.
- //
+ // This probably shouldn't even happen,
+ // but for interwiki transclusion it sometimes does.
// Use the canonical namespaces if possible to try to
// resolve a foreign namespace.
if ( MWNamespace::exists( $this->mNamespace ) ) {
/**
* The User object encapsulates all of the user-specific settings (user_id,
- * name, rights, password, email address, options, last login time). Client
+ * name, rights, email address, options, last login time). Client
* classes use the getXXX() functions to access these fields. These functions
* do all the work of determining whether the user is logged in,
* whether the requested option can be satisfied from cookies or
*/
const GETOPTIONS_EXCLUDE_DEFAULTS = 1;
- /**
- * @var PasswordFactory Lazily loaded factory object for passwords
- */
- private static $mPasswordFactory = null;
-
/**
* Array of Strings List of member variables which are saved to the
* shared cache (memcached). Any operation which changes the
public $mName;
/** @var string */
public $mRealName;
+
/**
- * @todo Make this actually private
- * @private
- * @var Password
- */
- public $mPassword;
- /**
- * @todo Make this actually private
- * @private
- * @var Password
+ * These fields were marked "@private", but were defined as public to
+ * maintain compatibility with PHP4 code since PHP4 didn't support access
+ * restrictions. AuthManager makes password handling pluggable, meaning
+ * these fields don't make sense anymore. If this broke something, see
+ * T89459 for the context of the change.
+ * @deprecated These are mostly unused, but kept for now to raise errors on attempted access.
*/
- public $mNewpassword;
- /** @var string */
- public $mNewpassTime;
+ // @{
+ private $mPassword = null;
+ private $mNewpassword;
+ private $mNewpassTime;
+ private $mPasswordExpires;
+ // @}
+
/** @var string */
public $mEmail;
/** @var string TS_MW timestamp from the DB */
public $mGroups;
/** @var array */
protected $mOptionOverrides;
- /** @var string */
- protected $mPasswordExpires;
// @}
/**
* The row should have the following fields from the user table in it:
* - either user_name or user_id to load further data if needed (or both)
* - user_real_name
- * - all other fields (email, password, etc.)
+ * - all other fields (email, etc.)
* It is useless to provide the remaining fields if either user_id,
* user_name and user_real_name are not provided because the whole row
* will be loaded once more from the database when accessing them.
return $user;
}
+ /**
+ * Static factory method for creation of a "system" user from username.
+ *
+ * A "system" user is an account that's used to attribute logged actions
+ * taken by MediaWiki itself, as opposed to a bot or human user. Examples
+ * might include the 'Maintenance script' or 'Conversion script' accounts
+ * used by various scripts in the maintenance/ directory or accounts such
+ * as 'MediaWiki message delivery' used by the MassMessage extension.
+ *
+ * This can optionally create the user if it doesn't exist, and "steal" the
+ * account if it does exist.
+ *
+ * @param string $name Username
+ * @param array $options Options are:
+ * - validate: As for User::getCanonicalName(), default 'valid'
+ * - create: Whether to create the user if it doesn't already exist, default true
+ * - steal: Whether to reset the account's password and email if it
+ * already exists, default false
+ * @return User|null
+ */
+ public static function newSystemUser( $name, $options = array() ) {
+ $options += array(
+ 'validate' => 'valid',
+ 'create' => true,
+ 'steal' => false,
+ );
+
+ $name = self::getCanonicalName( $name, $options['validate'] );
+ if ( $name === false ) {
+ return null;
+ }
+
+ $dbw = wfGetDB( DB_MASTER );
+ $row = $dbw->selectRow(
+ 'user',
+ array_merge(
+ self::selectFields(),
+ array( 'user_password', 'user_newpassword' )
+ ),
+ array( 'user_name' => $name ),
+ __METHOD__
+ );
+ if ( !$row ) {
+ // No user. Create it?
+ return $options['create'] ? self::createNew( $name ) : null;
+ }
+ $user = self::newFromRow( $row );
+
+ // A user is considered to exist as a non-system user if it has a
+ // password set, or a temporary password set, or an email set.
+ $passwordFactory = new PasswordFactory();
+ $passwordFactory->init( RequestContext::getMain()->getConfig() );
+ try {
+ $password = $passwordFactory->newFromCiphertext( $row->user_password );
+ } catch ( PasswordError $e ) {
+ wfDebug( 'Invalid password hash found in database.' );
+ $password = PasswordFactory::newInvalidPassword();
+ }
+ try {
+ $newpassword = $passwordFactory->newFromCiphertext( $row->user_newpassword );
+ } catch ( PasswordError $e ) {
+ wfDebug( 'Invalid password hash found in database.' );
+ $newpassword = PasswordFactory::newInvalidPassword();
+ }
+ if ( !$password instanceof InvalidPassword || !$newpassword instanceof InvalidPassword
+ || $user->mEmail
+ ) {
+ // User exists. Steal it?
+ if ( !$options['steal'] ) {
+ return null;
+ }
+
+ $nopass = PasswordFactory::newInvalidPassword()->toString();
+
+ $dbw->update(
+ 'user',
+ array(
+ 'user_password' => $nopass,
+ 'user_newpassword' => $nopass,
+ 'user_newpass_time' => null,
+ ),
+ array( 'user_id' => $user->getId() ),
+ __METHOD__
+ );
+ $user->invalidateEmail();
+ $user->saveSettings();
+ }
+
+ return $user;
+ }
+
// @}
/**
}
}
- /**
- * Expire a user's password
- * @since 1.23
- * @param int $ts Optional timestamp to convert, default 0 for the current time
- */
- public function expirePassword( $ts = 0 ) {
- $this->loadPasswords();
- $timestamp = wfTimestamp( TS_MW, $ts );
- $this->mPasswordExpires = $timestamp;
- $this->saveSettings();
- }
-
- /**
- * Clear the password expiration for a user
- * @since 1.23
- * @param bool $load Ensure user object is loaded first
- */
- public function resetPasswordExpiration( $load = true ) {
- global $wgPasswordExpirationDays;
- if ( $load ) {
- $this->load();
- }
- $newExpire = null;
- if ( $wgPasswordExpirationDays ) {
- $newExpire = wfTimestamp(
- TS_MW,
- time() + ( $wgPasswordExpirationDays * 24 * 3600 )
- );
- }
- // Give extensions a chance to force an expiration
- Hooks::run( 'ResetPasswordExpiration', array( $this, &$newExpire ) );
- $this->mPasswordExpires = $newExpire;
- }
-
- /**
- * Check if the user's password is expired.
- * TODO: Put this and password length into a PasswordPolicy object
- * @since 1.23
- * @return string|bool The expiration type, or false if not expired
- * hard: A password change is required to login
- * soft: Allow login, but encourage password change
- * false: Password is not expired
- */
- public function getPasswordExpired() {
- global $wgPasswordExpireGrace;
- $expired = false;
- $now = wfTimestamp();
- $expiration = $this->getPasswordExpireDate();
- $expUnix = wfTimestamp( TS_UNIX, $expiration );
- if ( $expiration !== null && $expUnix < $now ) {
- $expired = ( $expUnix + $wgPasswordExpireGrace < $now ) ? 'hard' : 'soft';
- }
- return $expired;
- }
-
- /**
- * Get this user's password expiration date. Since this may be using
- * the cached User object, we assume that whatever mechanism is setting
- * the expiration date is also expiring the User cache.
- * @since 1.23
- * @return string|null The datestamp of the expiration, or null if not set
- */
- public function getPasswordExpireDate() {
- $this->load();
- return $this->mPasswordExpires;
- }
-
/**
* Given unvalidated user input, return a canonical username, or false if
* the username is invalid.
/**
* Return a random password.
*
+ * @deprecated since 1.27, use PasswordFactory::generateRandomPasswordString()
* @return string New random password
*/
public static function randomPassword() {
global $wgMinimalPasswordLength;
- // Decide the final password length based on our min password length,
- // stopping at a minimum of 10 chars.
- $length = max( 10, $wgMinimalPasswordLength );
- // Multiply by 1.25 to get the number of hex characters we need
- $length = $length * 1.25;
- // Generate random hex chars
- $hex = MWCryptRand::generateHex( $length );
- // Convert from base 16 to base 32 to get a proper password like string
- return wfBaseConvert( $hex, 16, 32 );
+ return PasswordFactory::generateRandomPasswordString( $wgMinimalPasswordLength );
}
/**
* @param string|bool $name
*/
public function loadDefaults( $name = false ) {
-
- $passwordFactory = self::getPasswordFactory();
-
$this->mId = 0;
$this->mName = $name;
$this->mRealName = '';
- $this->mPassword = $passwordFactory->newFromCiphertext( null );
- $this->mNewpassword = $passwordFactory->newFromCiphertext( null );
- $this->mNewpassTime = null;
$this->mEmail = '';
$this->mOptionOverrides = null;
$this->mOptionsLoaded = false;
$this->mEmailAuthenticated = null;
$this->mEmailToken = '';
$this->mEmailTokenExpires = null;
- $this->mPasswordExpires = null;
- $this->resetPasswordExpiration( false );
$this->mRegistration = wfTimestamp( TS_MW );
$this->mGroups = array();
*/
protected function loadFromRow( $row, $data = null ) {
$all = true;
- $passwordFactory = self::getPasswordFactory();
$this->mGroups = null; // deferred
$all = false;
}
- if ( isset( $row->user_password ) ) {
- // Check for *really* old password hashes that don't even have a type
- // The old hash format was just an md5 hex hash, with no type information
- if ( preg_match( '/^[0-9a-f]{32}$/', $row->user_password ) ) {
- $row->user_password = ":A:{$this->mId}:{$row->user_password}";
- }
-
- try {
- $this->mPassword = $passwordFactory->newFromCiphertext( $row->user_password );
- } catch ( PasswordError $e ) {
- wfDebug( 'Invalid password hash found in database.' );
- $this->mPassword = $passwordFactory->newFromCiphertext( null );
- }
-
- try {
- $this->mNewpassword = $passwordFactory->newFromCiphertext( $row->user_newpassword );
- } catch ( PasswordError $e ) {
- wfDebug( 'Invalid password hash found in database.' );
- $this->mNewpassword = $passwordFactory->newFromCiphertext( null );
- }
-
- $this->mNewpassTime = wfTimestampOrNull( TS_MW, $row->user_newpass_time );
- $this->mPasswordExpires = wfTimestampOrNull( TS_MW, $row->user_password_expires );
- }
-
if ( isset( $row->user_email ) ) {
$this->mEmail = $row->user_email;
$this->mTouched = wfTimestamp( TS_MW, $row->user_touched );
}
}
- /**
- * Load the user's password hashes from the database
- *
- * This is usually called in a scenario where the actual User object was
- * loaded from the cache, and then password comparison needs to be performed.
- * Password hashes are not stored in memcached.
- *
- * @since 1.24
- */
- private function loadPasswords() {
- if ( $this->getId() !== 0 &&
- ( $this->mPassword === null || $this->mNewpassword === null )
- ) {
- $db = ( $this->queryFlagsUsed & self::READ_LATEST )
- ? wfGetDB( DB_MASTER )
- : wfGetDB( DB_SLAVE );
-
- $this->loadFromRow( $db->selectRow(
- 'user',
- array( 'user_password', 'user_newpassword',
- 'user_newpass_time', 'user_password_expires' ),
- array( 'user_id' => $this->getId() ),
- __METHOD__
- ) );
- }
- }
-
/**
* Add the user to the group if he/she meets given criteria.
*
}
/**
+ * @deprecated Removed in 1.27.
* @return Password
* @since 1.24
*/
public function getPassword() {
- $this->loadPasswords();
-
- return $this->mPassword;
+ throw new BadMethodCallException( __METHOD__ . ' has been removed in 1.27' );
}
/**
+ * @deprecated Removed in 1.27.
* @return Password
* @since 1.24
*/
public function getTemporaryPassword() {
- $this->loadPasswords();
-
- return $this->mNewpassword;
+ throw new BadMethodCallException( __METHOD__ . ' has been removed in 1.27' );
}
/**
* wipes it, so the account cannot be logged in until
* a new password is set, for instance via e-mail.
*
+ * @deprecated since 1.27. AuthManager is coming.
* @param string $str New password to set
* @throws PasswordError On failure
- *
* @return bool
*/
public function setPassword( $str ) {
global $wgAuth;
- $this->loadPasswords();
-
if ( $str !== null ) {
if ( !$wgAuth->allowPasswordChange() ) {
throw new PasswordError( wfMessage( 'password-change-forbidden' )->text() );
throw new PasswordError( wfMessage( 'externaldberror' )->text() );
}
- $this->setInternalPassword( $str );
+ $this->setToken();
+ $this->setOption( 'watchlisttoken', false );
+ $this->setPasswordInternal( $str );
return true;
}
/**
* Set the password and reset the random token unconditionally.
*
+ * @deprecated since 1.27. AuthManager is coming.
* @param string|null $str New password to set or null to set an invalid
* password hash meaning that the user will not be able to log in
* through the web interface.
*/
public function setInternalPassword( $str ) {
- $this->setToken();
- $this->setOption( 'watchlisttoken', false );
+ global $wgAuth;
- $passwordFactory = self::getPasswordFactory();
- $this->mPassword = $passwordFactory->newFromPlaintext( $str );
+ if ( $wgAuth->allowSetLocalPassword() ) {
+ $this->setToken();
+ $this->setOption( 'watchlisttoken', false );
+ $this->setPasswordInternal( $str );
+ }
+ }
- $this->mNewpassword = $passwordFactory->newFromCiphertext( null );
- $this->mNewpassTime = null;
+ /**
+ * Actually set the password and such
+ * @param string|null $str New password to set or null to set an invalid
+ * password hash meaning that the user will not be able to log in
+ * through the web interface.
+ */
+ private function setPasswordInternal( $str ) {
+ $id = self::idFromName( $this->getName() );
+ if ( $id ) {
+ $passwordFactory = new PasswordFactory();
+ $passwordFactory->init( RequestContext::getMain()->getConfig() );
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->update(
+ 'user',
+ array(
+ 'user_password' => $passwordFactory->newFromPlaintext( $str )->toString(),
+ 'user_newpassword' => PasswordFactory::newInvalidPassword()->toString(),
+ 'user_newpass_time' => $dbw->timestampOrNull( null ),
+ ),
+ array(
+ 'user_id' => $id,
+ ),
+ __METHOD__
+ );
+ $this->mPassword = null;
+ } else {
+ $this->mPassword = $str;
+ }
}
/**
/**
* Set the password for a password reminder or new account email
*
+ * @deprecated since 1.27, AuthManager is coming
* @param string $str New password to set or null to set an invalid
* password hash meaning that the user will not be able to use it
* @param bool $throttle If true, reset the throttle timestamp to the present
*/
public function setNewpassword( $str, $throttle = true ) {
- $this->loadPasswords();
+ $dbw = wfGetDB( DB_MASTER );
+
+ $passwordFactory = new PasswordFactory();
+ $passwordFactory->init( RequestContext::getMain()->getConfig() );
+ $update = array(
+ 'user_newpassword' => $passwordFactory->newFromPlaintext( $str )->toString(),
+ );
- $this->mNewpassword = self::getPasswordFactory()->newFromPlaintext( $str );
if ( $str === null ) {
- $this->mNewpassTime = null;
+ $update['user_newpass_time'] = null;
} elseif ( $throttle ) {
- $this->mNewpassTime = wfTimestampNow();
+ $update['user_newpass_time'] = $dbw->timestamp();
}
+
+ $dbw->update( 'user', $update, array( 'user_id' => $id ), __METHOD__ );
}
/**
*/
public function isPasswordReminderThrottled() {
global $wgPasswordReminderResendTime;
+
+ if ( !$wgPasswordReminderResendTime ) {
+ return false;
+ }
+
$this->load();
- if ( !$this->mNewpassTime || !$wgPasswordReminderResendTime ) {
+
+ $db = ( $this->queryFlagsUsed & self::READ_LATEST )
+ ? wfGetDB( DB_MASTER )
+ : wfGetDB( DB_SLAVE );
+ $newpassTime = $db->selectField(
+ 'user',
+ 'user_newpass_time',
+ array( 'user_id' => $this->getId() ),
+ __METHOD__
+ );
+
+ if ( $newpassTime === null ) {
return false;
}
- $expiry = wfTimestamp( TS_UNIX, $this->mNewpassTime ) + $wgPasswordReminderResendTime * 3600;
+ $expiry = wfTimestamp( TS_UNIX, $newpassTime ) + $wgPasswordReminderResendTime * 3600;
return time() < $expiry;
}
* @todo Only rarely do all these fields need to be set!
*/
public function saveSettings() {
- global $wgAuth;
-
if ( wfReadOnly() ) {
// @TODO: caller should deal with this instead!
// This should really just be an exception.
}
$this->load();
- $this->loadPasswords();
if ( 0 == $this->mId ) {
return; // anon
}
$oldTouched = $this->mTouched;
$newTouched = $this->newTouchedTimestamp();
- if ( !$wgAuth->allowSetLocalPassword() ) {
- $this->mPassword = self::getPasswordFactory()->newFromCiphertext( null );
- }
-
$dbw = wfGetDB( DB_MASTER );
$dbw->update( 'user',
array( /* SET */
'user_name' => $this->mName,
- 'user_password' => $this->mPassword->toString(),
- 'user_newpassword' => $this->mNewpassword->toString(),
- 'user_newpass_time' => $dbw->timestampOrNull( $this->mNewpassTime ),
'user_real_name' => $this->mRealName,
'user_email' => $this->mEmail,
'user_email_authenticated' => $dbw->timestampOrNull( $this->mEmailAuthenticated ),
'user_token' => strval( $this->mToken ),
'user_email_token' => $this->mEmailToken,
'user_email_token_expires' => $dbw->timestampOrNull( $this->mEmailTokenExpires ),
- 'user_password_expires' => $dbw->timestampOrNull( $this->mPasswordExpires ),
), array( /* WHERE */
'user_id' => $this->mId,
'user_touched' => $dbw->timestamp( $oldTouched ) // CAS check
* @param string $name Username to add
* @param array $params Array of Strings Non-default parameters to save to
* the database as user_* fields:
- * - password: The user's password hash. Password logins will be disabled
- * if this is omitted.
- * - newpassword: Hash for a temporary password that has been mailed to
- * the user.
* - email: The user's email address.
* - email_authenticated: The email authentication timestamp.
* - real_name: The user's real name.
* @return User|null User object, or null if the username already exists.
*/
public static function createNew( $name, $params = array() ) {
+ foreach ( array( 'password', 'newpassword', 'newpass_time', 'password_expires' ) as $field ) {
+ if ( isset( $params[$field] ) ) {
+ wfDeprecated( __METHOD__ . " with param '$field'", '1.27' );
+ unset( $params[$field] );
+ }
+ }
+
$user = new User;
$user->load();
- $user->loadPasswords();
$user->setToken(); // init token
if ( isset( $params['options'] ) ) {
$user->mOptions = $params['options'] + (array)$user->mOptions;
$dbw = wfGetDB( DB_MASTER );
$seqVal = $dbw->nextSequenceValue( 'user_user_id_seq' );
+ $noPass = PasswordFactory::newInvalidPassword()->toString();
+
$fields = array(
'user_id' => $seqVal,
'user_name' => $name,
- 'user_password' => $user->mPassword->toString(),
- 'user_newpassword' => $user->mNewpassword->toString(),
- 'user_newpass_time' => $dbw->timestampOrNull( $user->mNewpassTime ),
+ 'user_password' => $noPass,
+ 'user_newpassword' => $noPass,
'user_email' => $user->mEmail,
'user_email_authenticated' => $dbw->timestampOrNull( $user->mEmailAuthenticated ),
'user_real_name' => $user->mRealName,
*/
public function addToDatabase() {
$this->load();
- $this->loadPasswords();
if ( !$this->mToken ) {
$this->setToken(); // init token
}
$this->mTouched = $this->newTouchedTimestamp();
+ $noPass = PasswordFactory::newInvalidPassword()->toString();
+
$dbw = wfGetDB( DB_MASTER );
$inWrite = $dbw->writesOrCallbacksPending();
$seqVal = $dbw->nextSequenceValue( 'user_user_id_seq' );
array(
'user_id' => $seqVal,
'user_name' => $this->mName,
- 'user_password' => $this->mPassword->toString(),
- 'user_newpassword' => $this->mNewpassword->toString(),
- 'user_newpass_time' => $dbw->timestampOrNull( $this->mNewpassTime ),
+ 'user_password' => $noPass,
+ 'user_newpassword' => $noPass,
'user_email' => $this->mEmail,
'user_email_authenticated' => $dbw->timestampOrNull( $this->mEmailAuthenticated ),
'user_real_name' => $this->mRealName,
}
$this->mId = $dbw->insertId();
+ // Set the password now that it's in the DB, if applicable
+ if ( $this->mPassword !== null ) {
+ $this->setPasswordInternal( $this->mPassword );
+ }
+
// Clear instance cache other than user table data, which is already accurate
$this->clearInstanceCache();
/**
* Check to see if the given clear-text password is one of the accepted passwords
+ * @deprecated since 1.27. AuthManager is coming.
* @param string $password User password
* @return bool True if the given password is correct, otherwise False
*/
public function checkPassword( $password ) {
global $wgAuth, $wgLegacyEncoding;
- $this->loadPasswords();
+ $this->load();
// Some passwords will give a fatal Status, which means there is
// some sort of technical or security reason for this password to
return false;
}
- if ( !$this->mPassword->equals( $password ) ) {
+ $passwordFactory = new PasswordFactory();
+ $passwordFactory->init( RequestContext::getMain()->getConfig() );
+ $db = ( $this->queryFlagsUsed & self::READ_LATEST )
+ ? wfGetDB( DB_MASTER )
+ : wfGetDB( DB_SLAVE );
+
+ try {
+ $mPassword = $passwordFactory->newFromCiphertext( $db->selectField(
+ 'user', 'user_password', array( 'user_id' => $this->getId() ), __METHOD__
+ ) );
+ } catch ( PasswordError $e ) {
+ wfDebug( 'Invalid password hash found in database.' );
+ $mPassword = PasswordFactory::newInvalidPassword();
+ }
+
+ if ( !$mPassword->equals( $password ) ) {
if ( $wgLegacyEncoding ) {
// Some wikis were converted from ISO 8859-1 to UTF-8, the passwords can't be converted
// Check for this with iconv
$cp1252Password = iconv( 'UTF-8', 'WINDOWS-1252//TRANSLIT', $password );
- if ( $cp1252Password === $password || !$this->mPassword->equals( $cp1252Password ) ) {
+ if ( $cp1252Password === $password || !$mPassword->equals( $cp1252Password ) ) {
return false;
}
} else {
}
}
- $passwordFactory = self::getPasswordFactory();
- if ( $passwordFactory->needsUpdate( $this->mPassword ) && !wfReadOnly() ) {
- $this->mPassword = $passwordFactory->newFromPlaintext( $password );
- $this->saveSettings();
+ if ( $passwordFactory->needsUpdate( $mPassword ) && !wfReadOnly() ) {
+ $this->setPasswordInternal( $password );
}
return true;
* Check if the given clear-text password matches the temporary password
* sent by e-mail for password reset operations.
*
+ * @deprecated since 1.27. AuthManager is coming.
* @param string $plaintext
- *
* @return bool True if matches, false otherwise
*/
public function checkTemporaryPassword( $plaintext ) {
global $wgNewPasswordExpiry;
$this->load();
- $this->loadPasswords();
- if ( $this->mNewpassword->equals( $plaintext ) ) {
- if ( is_null( $this->mNewpassTime ) ) {
+
+ $passwordFactory = new PasswordFactory();
+ $passwordFactory->init( RequestContext::getMain()->getConfig() );
+ $db = ( $this->queryFlagsUsed & self::READ_LATEST )
+ ? wfGetDB( DB_MASTER )
+ : wfGetDB( DB_SLAVE );
+
+ $row = $db->selectRow(
+ 'user',
+ array( 'user_newpassword', 'user_newpass_time' ),
+ array( 'user_id' => $this->getId() ),
+ __METHOD__
+ );
+ try {
+ $mNewpassword = $passwordFactory->newFromCiphertext( $row->user_newpassword );
+ } catch ( PasswordError $e ) {
+ wfDebug( 'Invalid password hash found in database.' );
+ $mNewpassword = PasswordFactory::newInvalidPassword();
+ }
+
+ if ( $mNewpassword->equals( $plaintext ) ) {
+ if ( is_null( $row->user_newpass_time ) ) {
return true;
}
- $expiry = wfTimestamp( TS_UNIX, $this->mNewpassTime ) + $wgNewPasswordExpiry;
+ $expiry = wfTimestamp( TS_UNIX, $row->user_newpass_time ) + $wgNewPasswordExpiry;
return ( time() < $expiry );
} else {
return false;
*/
public static function crypt( $password, $salt = false ) {
wfDeprecated( __METHOD__, '1.24' );
- $hash = self::getPasswordFactory()->newFromPlaintext( $password );
+ $passwordFactory = new PasswordFactory();
+ $passwordFactory->init( RequestContext::getMain()->getConfig() );
+ $hash = $passwordFactory->newFromPlaintext( $password );
return $hash->toString();
}
}
}
- $hash = self::getPasswordFactory()->newFromCiphertext( $hash );
+ $passwordFactory = new PasswordFactory();
+ $passwordFactory->init( RequestContext::getMain()->getConfig() );
+ $hash = $passwordFactory->newFromCiphertext( $hash );
return $hash->equals( $password );
}
/**
* Lazily instantiate and return a factory object for making passwords
*
+ * @deprecated since 1.27, create a PasswordFactory directly instead
* @return PasswordFactory
*/
public static function getPasswordFactory() {
- if ( self::$mPasswordFactory === null ) {
- self::$mPasswordFactory = new PasswordFactory();
- self::$mPasswordFactory->init( RequestContext::getMain()->getConfig() );
- }
-
- return self::$mPasswordFactory;
+ wfDeprecated( __METHOD__, '1.27' );
+ $ret = new PasswordFactory();
+ $ret->init( RequestContext::getMain()->getConfig() );
+ return $ret;
}
/**
*
* @todo FIXME: This does not belong here; put it in Html or Linker or somewhere
*
+ * @deprecated since 1.27
* @return array Array of HTML attributes suitable for feeding to
* Html::element(), directly or indirectly. (Don't feed to Xml::*()!
* That will get confused by the boolean attribute syntax used.)
# Note that the pattern requirement will always be satisfied if the
# input is empty, so we need required in all cases.
- #
+
# @todo FIXME: Bug 23769: This needs to not claim the password is required
# if e-mail confirmation is being used. Since HTML5 input validation
# is b0rked anyway in some browsers, just return nothing. When it's
"apihelp-delete-param-title": "Titre de la page que vous voulez supprimer. Impossible de l’utiliser avec <var>$1pageid</var>.",
"apihelp-delete-param-pageid": "ID de la page que vous voulez supprimer. Impossible à utiliser avec <var>$1title</var>.",
"apihelp-delete-param-reason": "Motif de suppression. Si non défini, un motif généré automatiquement sera utilisé.",
+ "apihelp-delete-param-tags": "Modifier les balises à appliquer à l’entrée dans le journal des suppressions.",
"apihelp-delete-param-watch": "Ajouter la page à la liste de suivi de l’utilisateur actuel.",
"apihelp-delete-param-watchlist": "Ajouter ou supprimer sans distinction la page de la liste de suivi de l'utilisateur actuel, utiliser les préférences ou ne rien changer au suivi.",
"apihelp-delete-param-unwatch": "Supprimer la page de la liste de suivi de l'utilisateur actuel.",
"apihelp-delete-param-title": "Título da páxina a eliminar. Non pode usarse xunto con <var>$1pageid</var>.",
"apihelp-delete-param-pageid": "Identificador da páxina a eliminar. Non pode usarse xunto con <var>$1title</var>.",
"apihelp-delete-param-reason": "Razón para o borrado. Se non se indica, usarase unha razón xenerada automaticamente.",
+ "apihelp-delete-param-tags": "Cambiar as etiquetas a aplicar na entrada do rexistro de borrado.",
"apihelp-delete-param-watch": "Engadir esta páxina á lista de vixilancia do usuario actual.",
"apihelp-delete-param-watchlist": "Engadir ou eliminar sen condicións a páxina da lista de vixiancia do usuario actual, use as preferencias ou non cambie a vixiancia.",
"apihelp-delete-param-unwatch": "Eliminar esta páxina da lista de vixilancia do usuario actual.",
"apihelp-paraminfo-description": "API モジュールに関する情報を取得します。",
"apihelp-paraminfo-param-modules": "モジュールの名前のリスト (<var>action</var> および <var>format</var> パラメーターの値, または <kbd>main</kbd>). <kbd>+</kbd> を使用して下位モジュールを指定できます。",
"apihelp-paraminfo-param-helpformat": "ヘルプ文字列の形式。",
+ "apihelp-paraminfo-param-querymodules": "クエリモジュール名のリスト (<var>prop</var>, <var>meta</var> or <var>list</var> パラメータの値)。<kbd>$1querymodules=foo</kbd> の代わりに <kbd>$1modules=query+foo</kbd> を使用してください。",
"apihelp-paraminfo-example-1": "<kbd>[[Special:ApiHelp/parse|action=parse]]</kbd>, <kbd>[[Special:ApiHelp/jsonfm|format=jsonfm]]</kbd>, <kbd>[[Special:ApiHelp/query+allpages|action=query&list=allpages]]</kbd>, and <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> に関する情報を表示する。",
"apihelp-parse-param-summary": "構文解析のための要約",
"apihelp-parse-param-prop": "どの情報を取得するか:",
"apihelp-protect-param-watch": "指定されると、保護(解除)するページが現在の利用者のウォッチリストに追加されます。",
"apihelp-protect-example-protect": "ページを保護する。",
"apihelp-protect-example-unprotect2": "制限を設定されたページ保護を解除します。",
- "apihelp-purge-description": "æ\8c\87å®\9aã\81\95ã\82\8cã\81\9fã\82¿ã\82¤ã\83\88ã\83«のキャッシュをパージします。\n\n利用者がログインしていない場合は、 POST リクエストが必要です。",
+ "apihelp-purge-description": "æ\8c\87å®\9aã\81\95ã\82\8cã\81\9fã\83\9aã\83¼ã\82¸のキャッシュをパージします。\n\n利用者がログインしていない場合は、 POST リクエストが必要です。",
"apihelp-purge-param-forcelinkupdate": "リンクテーブルを更新します。",
"apihelp-purge-example-simple": "ページ <kbd>Main Page</kbd> および <kbd>API</kbd> をパージする。",
"apihelp-purge-example-generator": "標準名前空間にある最初の10ページをパージする。",
"apihelp-query+deletedrevs-example-mode2": "<kbd>Bob</kbd> による、削除された最後の50投稿を一覧表示する(モード 2)。",
"apihelp-query+deletedrevs-example-mode3-main": "標準名前空間にある削除された最初の50版を一覧表示する(モード 3)。",
"apihelp-query+deletedrevs-example-mode3-talk": "{{ns:talk}}名前空間にある削除された最初の50版を一覧表示する(モード 3)。",
- "apihelp-query+disabled-description": "このクエリ モジュールは無効化されています。",
+ "apihelp-query+disabled-description": "このクエリモジュールは無効化されています。",
"apihelp-query+embeddedin-param-title": "検索するページ名。$1pageid とは同時に使用できません。",
"apihelp-query+embeddedin-param-pageid": "検索するページID. $1titleとは同時に使用できません。",
"apihelp-query+embeddedin-param-namespace": "列挙する名前空間。",
"apihelp-revisiondelete-example-revision": "<kbd>Main Page</kbd> の版 <kbd>12345</kbd> の本文を隠す。",
"apihelp-rollback-param-title": "巻き戻すページ名です。<var>$1pageid</var> とは同時に使用できません。",
"apihelp-rollback-param-pageid": "巻き戻すページのページIDです。<var>$1title</var> とは同時に使用できません。",
+ "apihelp-rollback-param-user": "巻き戻し対象の編集を行った利用者名。",
+ "apihelp-rollback-param-markbot": "巻き戻された編集と巻き戻しをボットの編集としてマークする。",
"apihelp-rollback-example-simple": "利用者 <kbd>Example</kbd> による <kbd>Main Page</kbd> への最後の一連の編集を巻き戻す。",
+ "apihelp-rollback-example-summary": "IP利用者 <kbd>192.0.2.5</kbd> による <kbd>Main Page</kbd> への最後の一連の編集を <kbd>Reverting vandalism</kbd> という理由で、それらの編集とその差し戻しをボットの編集としてマークして差し戻す。",
"apihelp-stashedit-param-title": "編集されているページのページ名。",
"apihelp-tag-param-reason": "変更の理由。",
"apihelp-tag-example-log": "<kbd>Wrongly applied</kbd> という理由で <kbd>spam</kbd> タグを 記録項目ID 123 から取り除く",
"apihelp-yamlfm-description": "データを YAML 形式 (HTML に埋め込んだ形式) で出力します。",
"api-format-title": "MediaWiki API の結果",
"api-format-prettyprint-header": "このページは $1 形式を HTML で表現したものです。HTML はデバッグに役立ちますが、アプリケーションでの使用には適していません。\n\n<var>format</var> パラメーターを指定すると出力形式を変更できます 。$1 形式の非 HTML 版を閲覧するには、format=$2 を設定してください。\n\n詳細情報については [[mw:API|完全な説明文書]]または [[Special:ApiHelp/main|API のヘルプ]]を参照してください。",
+ "api-pageset-param-titles": "対象のページ名のリスト。",
+ "api-pageset-param-pageids": "対象のページIDのリスト。",
+ "api-pageset-param-revids": "対象の版IDのリスト。",
+ "api-pageset-param-generator": "クエリモジュールを実行することにより対象のページの一覧を取得する。\n\n<strong>注意</strong> Generator パラメーターの名前は \"g\" で始まります。例を参照してください。",
+ "api-pageset-param-redirects-generator": "<var>$1titles</var>, <var>$1pageids</var>, および <var>$1revids</var>, および <var>$1generator</var> によって返されたページの転送を自動的に解決する。",
"api-help-title": "MediaWiki API ヘルプ",
"api-help-lead": "このページは自動生成された MediaWiki API の説明文書ページです。\n\n説明文書と例: https://www.mediawiki.org/wiki/API",
"api-help-main-header": "メイン モジュール",
// Automatic patrol needs "autopatrol", ordinary patrol needs "patrol"
$right = $auto ? 'autopatrol' : 'patrol';
$errors = array_merge( $errors, $this->getTitle()->getUserPermissionsErrors( $right, $user ) );
- if ( !Hooks::run( 'MarkPatrolled', array( $this->getAttribute( 'rc_id' ), &$user, false ) ) ) {
+ if ( !Hooks::run( 'MarkPatrolled',
+ array( $this->getAttribute( 'rc_id' ), &$user, false, $auto ) )
+ ) {
$errors[] = array( 'hookaborted' );
}
// Users without the 'autopatrol' right can't patrol their
$this->reallyMarkPatrolled();
// Log this patrol event
PatrolLog::record( $this, $auto, $user );
- Hooks::run( 'MarkPatrolledComplete', array( $this->getAttribute( 'rc_id' ), &$user, false ) );
+ Hooks::run(
+ 'MarkPatrolledComplete',
+ array( $this->getAttribute( 'rc_id' ), &$user, false, $auto )
+ );
return array();
}
return $unserializedParams;
}
}
+
}
$x1 = $xoff + (int)( ( $numer + ( $xlim - $xoff ) * $chunk ) / $nchunks );
- // @codingStandardsIgnoreFile Ignore Squiz.WhiteSpace.SemicolonSpacing.Incorrect
+ // @codingStandardsIgnoreStart Ignore Squiz.WhiteSpace.SemicolonSpacing.Incorrect
for ( ; $x < $x1; $x++ ) {
// @codingStandardsIgnoreEnd
$line = $flip ? $this->yv[$x] : $this->xv[$x];
if ( $y > $this->seq[$k - 1] ) {
assert( '$y < $this->seq[$k]' );
// Optimization: this is a common case:
- // next match is just replacing previous match.
+ // next match is just replacing previous match.
$this->in_seq[$this->seq[$k]] = false;
$this->seq[$k] = $y;
$this->in_seq[$y] = 1;
if ( count( $this->extensions ) ) {
$localSettings .= "
-# Enabled Extensions. Most extensions are enabled by including the base extension file here
-# but check specific extension documentation for more details
+# Enabled extensions. Most of the extensions are enabled by adding
+# wfLoadExtensions('ExtensionName');
+# to LocalSettings.php. Check specific extension documentation for more details.
# The following extensions were automatically enabled:\n";
foreach ( $this->extensions as $extName ) {
if ( !preg_match( '/^[a-zA-Z0-9_-]+$/', $extension ) ) {
// Non-alphanumeric extension, unlikely to be registered.
- //
// The regex above is known to match all registered file extensions
// in a default Windows XP installation. It's important to allow
// extensions with ampersands and percent signs, since that reduces
* This class is intended for caching data from primary stores.
* If the get() method does not return a value, then the caller
* should query the new value and backfill the cache using set().
+ * When querying the store on cache miss, the closest DB replica
+ * should be used. Try to avoid heavyweight DB master or quorum reads.
* When the source data changes, a purge method should be called.
* Since purges are expensive, they should be avoided. One can do so if:
* - a) The object cached is immutable; or
* - b) Validity is checked against the source after get(); or
* - c) Using a modest TTL is reasonably correct and performant
+ *
* The simplest purge method is delete().
*
* Instances of this class must be configured to point to a valid
protected $procCache;
/** @var string Cache pool name */
protected $pool;
- /** @var EventRelayer */
+ /** @var EventRelayer Bus that handles purge broadcasts */
protected $relayer;
- /** @var int */
+ /** @var int ERR_* constant for the "last error" registry */
protected $lastRelayError = self::ERR_NONE;
/** Max time expected to pass between delete() and DB commit finishing */
/** Cache format version number */
const VERSION = 1;
- /** Fields of value holder arrays */
const FLD_VERSION = 0;
const FLD_VALUE = 1;
const FLD_TTL = 2;
const FLD_TIME = 3;
- /** Possible values for getLastError() */
const ERR_NONE = 0; // no error
const ERR_NO_RESPONSE = 1; // no response
const ERR_UNREACHABLE = 2; // can't connect
}
/**
- * @return WANObjectCache Cache that wraps EmptyBagOStuff
+ * Get an instance that wraps EmptyBagOStuff
+ *
+ * @return WANObjectCache
*/
public static function newEmpty() {
return new self( array(
* However, pre-snapshot values might still be seen if an update was made
* in a remote datacenter but the purge from delete() didn't relay yet.
*
- * Consider using getWithSetCallback() instead of get()/set() cycles.
+ * Consider using getWithSetCallback() instead of get() and set() cycles.
* That method has cache slam avoiding features for hot/expensive keys.
*
* @param string $key Cache key
*
* @param array $keys List of cache keys
* @param array $curTTLs Map of (key => approximate TTL left) for existing keys [returned]
- * @param array $checkKeys List of "check" keys
+ * @param array $checkKeys List of "check" keys to apply to all of $keys
* @return array Map of (key => value) for keys that exist
*/
final public function getMulti(
}
/**
- * Set the value of a key from cache
+ * Set the value of a key in cache
*
* Simply calling this method when source data changes is not valid because
* the changes do not replicate to the other WAN sites. In that case, delete()
* - d) T1 reads the row and calls set() due to a cache miss
* - e) Stale value is stuck in cache
*
- * Setting 'lag' helps avoids keys getting stuck in long-term stale states.
+ * Setting 'lag' and 'since' help avoids keys getting stuck in stale states.
*
* Example usage:
* @code
* - lag : Seconds of slave lag. Typically, this is either the slave lag
* before the data was read or, if applicable, the slave lag before
* the snapshot-isolated transaction the data was read from started.
- * [Default: 0 seconds]
+ * Default: 0 seconds
* - since : UNIX timestamp of the data in $value. Typically, this is either
* the current time the data was read or (if applicable) the time when
* the snapshot-isolated transaction the data was read from started.
- * [Default: 0 seconds]
+ * Default: 0 seconds
* - lockTSE : if excessive possible snapshot lag is detected,
* then stash the value into a temporary location
* with this TTL. This is only useful if the reads
* use getWithSetCallback() with "lockTSE" set.
- * [Default: WANObjectCache::TSE_NONE]
+ * Default: WANObjectCache::TSE_NONE
* @return bool Success
*/
final public function set( $key, $value, $ttl = 0, array $opts = array() ) {
* This is implemented by storing a special "tombstone" value at the cache
* key that this class recognizes; get() calls will return false for the key
* and any set() calls will refuse to replace tombstone values at the key.
- * For this to always avoid writing stale values, the following must hold:
+ * For this to always avoid stale value writes, the following must hold:
* - a) Replication lag is bounded to being less than HOLDOFF_TTL; or
* - b) If lag is higher, the DB will have gone into read-only mode already
*
+ * Note that set() can also be lag-aware and lower the TTL if it's high.
+ *
* When using potentially long-running ACID transactions, a good pattern is
* to use a pre-commit hook to issue the delete. This means that immediately
* after commit, callers will see the tombstone in cache in the local datacenter
* if the key was evicted from cache, such calculations may show the
* time since expiry as ~0 seconds.
*
- * Note that "check" keys won't collide with other regular keys
+ * Note that "check" keys won't collide with other regular keys.
*
* @param string $key
* @return float UNIX timestamp of the key
* keys, the relevant "check" keys must be supplied for this to work.
*
* The "check" key essentially represents a last-modified field.
- * It is set in the future a few seconds when this is called, to
- * avoid race conditions where dependent keys get updated with a
- * stale value (e.g. from a DB slave).
+ * When touched, keys using it via get(), getMulti(), or getWithSetCallback()
+ * will be invalidated. It is treated as being HOLDOFF_TTL seconds in the future
+ * by those methods to avoid race conditions where dependent keys get updated
+ * with stale values (e.g. from a DB slave).
*
- * This is typically useful for keys with static names or some cases
+ * This is typically useful for keys with hardcoded names or in some cases
* dynamically generated names where a low number of combinations exist.
* When a few important keys get a large number of hits, a high cache
- * time is usually desired as well as lockTSE logic. The resetCheckKey()
+ * time is usually desired as well as "lockTSE" logic. The resetCheckKey()
* method is less appropriate in such cases since the "time since expiry"
* cannot be inferred.
*
- * Note that "check" keys won't collide with other regular keys
+ * Note that "check" keys won't collide with other regular keys.
*
* @see WANObjectCache::get()
+ * @see WANObjectCache::getWithSetCallback()
+ * @see WANObjectCache::resetCheckKey()
*
* @param string $key Cache key
* @return bool True if the item was purged or not found, false on failure
/**
* Delete a "check" key from all datacenters, invalidating keys that use it
*
- * This is similar to touchCheckKey() in that keys using it via
- * getWithSetCallback() will be invalidated. The differences are:
+ * This is similar to touchCheckKey() in that keys using it via get(), getMulti(),
+ * or getWithSetCallback() will be invalidated. The differences are:
* - a) The timestamp will be deleted from all caches and lazily
* re-initialized when accessed (rather than set everywhere)
* - b) Thus, dependent keys will be known to be invalid, but not
* This is typically useful for keys with dynamically generated names
* where a high number of combinations exist.
*
- * Note that "check" keys won't collide with other regular keys
+ * Note that "check" keys won't collide with other regular keys.
*
- * @see WANObjectCache::touchCheckKey()
* @see WANObjectCache::get()
+ * @see WANObjectCache::getWithSetCallback()
+ * @see WANObjectCache::touchCheckKey()
*
* @param string $key Cache key
* @return bool True if the item was purged or not found, false on failure
* Method to fetch/regenerate cache keys
*
* On cache miss, the key will be set to the callback result via set()
- * unless the callback returns false. The arguments supplied to it are:
- * (current value or false, &$ttl, &$setOpts)
- * The callback function returns the new value given the current
- * value (false if not present). Preemptive re-caching and $checkKeys
- * can result in a non-false current value. The TTL of the new value
- * can be set dynamically by altering $ttl in the callback (by reference).
- * The $setOpts array can be altered and is given to set() when called;
- * it is recommended to set the 'since' field to avoid race conditions.
- * Setting 'lag' helps avoids keys getting stuck in long-term stale states.
- *
- * Usually, callbacks ignore the current value, but it can be used
- * to maintain "most recent X" values that come from time or sequence
- * based source data, provided that the "as of" id/time is tracked.
- *
- * Usage of $checkKeys is similar to get() and getMulti(). However,
- * rather than the caller having to inspect a "current time left"
- * variable (e.g. $curTTL, $curTTLs), a cache regeneration will be
- * triggered using the callback.
+ * (unless the callback returns false) and that result will be returned.
+ * The arguments supplied to the callback are:
+ * - $oldValue : current cache value or false if not present
+ * - &$ttl : a reference to the TTL which can be altered
+ * - &$setOpts : a reference to options for set() which can be altered
+ *
+ * It is strongly recommended to set the 'lag' and 'since' fields to avoid race conditions
+ * that can cause stale values to get stuck at keys. Usually, callbacks ignore the current
+ * value, but it can be used to maintain "most recent X" values that come from time or
+ * sequence based source data, provided that the "as of" id/time is tracked. Note that
+ * preemptive regeneration and $checkKeys can result in a non-false current value.
+ *
+ * Usage of $checkKeys is similar to get() and getMulti(). However, rather than the caller
+ * having to inspect a "current time left" variable (e.g. $curTTL, $curTTLs), a cache
+ * regeneration will automatically be triggered using the callback.
*
* The simplest way to avoid stampedes for hot keys is to use
* the 'lockTSE' option in $opts. If cache purges are needed, also:
* - WANObjectCache::TTL_UNCACHEABLE: Do not cache at all
* @param callable $callback Value generation function
* @param array $opts Options map:
- * - checkKeys: List of "check" keys.
+ * - checkKeys: List of "check" keys. The key at $key will be seen as invalid when either
+ * touchCheckKey() or resetCheckKey() is called on any of these keys.
* - lowTTL: Consider pre-emptive updates when the current TTL (sec) of the key is less than
* this. It becomes more likely over time, becoming a certainty once the key is expired.
* Default: WANObjectCache::LOW_TTL seconds.
* network I/O when a key is read several times. This will not cache if the callback
* returns false however. Note that any purges will not be seen while process cached;
* since the callback should use slave DBs and they may be lagged or have snapshot
- * isolation anyway, this should not matter much
+ * isolation anyway, this should not typically matter.
* Default: WANObjectCache::TTL_UNCACHEABLE.
* @param array $oldOpts Unused (mentioned only to avoid PHPDoc warnings)
* @return mixed Value to use for the key
}
/**
+ * Do the actual I/O for getWithSetCallback() when needed
+ *
* @see WANObjectCache::getWithSetCallback()
*
* @param string $key
* timestamp will not be updated(they have already seen it)
* @param Title $title The title to update timestamps for
* @param string $timestamp Set the update timestamp to this value
- * @return int[]
+ * @return int[] Array of user IDs
*/
public static function updateWatchlistTimestamp( User $editor, Title $title, $timestamp ) {
global $wgEnotifWatchlist, $wgShowUpdatedMarker;
<?php
-// @codingStandardsIgnoreFile
-// PHPCS can't handle the level of nesting in this file
/**
* Formatting of image metadata values into human readable form.
*
* Primary entry points:
*
* - ObjectCache::newAccelerator( $fallbackType )
- * Purpose: Cache.
+ * Purpose: Cache for very hot keys.
* Stored only on the individual web server.
* Not associated with other servers.
*
* - ObjectCache::getMainClusterInstance()
- * Purpose: Cache.
+ * Purpose: Memory storage for per-cluster coordination and tracking.
* Stored centrally within the local data-center.
* Not replicated to other DCs.
* Also known as $wgMemc. Configured by $wgMainCacheType.
* @ingroup Cache
*/
class ObjectCache {
- /** @var Array Map of (id => BagOStuff) */
+ /** @var BagOStuff[] Map of (id => BagOStuff) */
public static $instances = array();
-
- /** @var Array Map of (id => WANObjectCache) */
+ /** @var WANObjectCache[] Map of (id => WANObjectCache) */
public static $wanInstances = array();
/**
return $password->needsUpdate();
}
}
+
+ /**
+ * Generate a random string suitable for a password
+ *
+ * @param int $minLength Minimum length of password to generate
+ * @return string
+ */
+ public static function generateRandomPasswordString( $minLength = 10 ) {
+ // Decide the final password length based on our min password length,
+ // stopping at a minimum of 10 chars.
+ $length = max( 10, $minLength );
+ // Multiply by 1.25 to get the number of hex characters we need
+ $length = $length * 1.25;
+ // Generate random hex chars
+ $hex = MWCryptRand::generateHex( $length );
+ // Convert from base 16 to base 32 to get a proper password like string
+ return wfBaseConvert( $hex, 16, 32 );
+ }
+
+ /**
+ * Create an InvalidPassword
+ *
+ * @return InvalidPassword
+ */
+ public static function newInvalidPassword() {
+ static $password = null;
+
+ if ( $password === null ) {
+ $factory = new self();
+ $password = new InvalidPassword( $factory, array( 'type' => '' ), null );
+ }
+
+ return $password;
+ }
}
*
* @param FormOptions $opts
*/
- function setTopText( FormOptions $opts ) {
+ public function setTopText( FormOptions $opts ) {
// nothing by default
}
*
* @param FormOptions $opts
*/
- function setBottomText( FormOptions $opts ) {
+ public function setBottomText( FormOptions $opts ) {
// nothing by default
}
* @param FormOptions $opts
* @return array
*/
- function getExtraOptions( $opts ) {
+ public function getExtraOptions( $opts ) {
return array();
}
$remember = $this->getRequest()->getCookie( 'Token' ) !== null;
$user->setCookies( null, null, $remember );
}
- $user->resetPasswordExpiration();
$user->saveSettings();
+ $this->resetPasswordExpiration( $user );
}
public function requiresUnblock() {
protected function getGroupName() {
return 'users';
}
+
+ /**
+ * For resetting user password expiration, until AuthManager comes along
+ * @param User $user
+ */
+ private function resetPasswordExpiration( User $user ) {
+ global $wgPasswordExpirationDays;
+ $newExpire = null;
+ if ( $wgPasswordExpirationDays ) {
+ $newExpire = wfTimestamp(
+ TS_MW,
+ time() + ( $wgPasswordExpirationDays * 24 * 3600 )
+ );
+ }
+ // Give extensions a chance to force an expiration
+ Hooks::run( 'ResetPasswordExpiration', array( $this, &$newExpire ) );
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw->update(
+ 'user',
+ array( 'user_password_expires' => $dbw->timestampOrNull( $newExpire ) ),
+ array( 'user_id' => $user->getID() ),
+ __METHOD__
+ );
+ }
}
* @return bool|array
*/
public function onSubmit( array $data ) {
- global $wgAuth;
+ global $wgAuth, $wgMinimalPasswordLength;
if ( isset( $data['Domain'] ) ) {
if ( $wgAuth->validDomain( $data['Domain'] ) ) {
$passwords = array();
foreach ( $users as $user ) {
- $password = $user->randomPassword();
+ $password = PasswordFactory::generateRandomPasswordString( $wgMinimalPasswordLength );
$user->setNewpassword( $password );
$user->saveSettings();
$passwords[] = $this->msg( 'passwordreset-emailelement', $user->getName(), $password )
$restored = 0;
foreach ( $result as $row ) {
- // Check for key dupes due to shitty archive integrity.
+ // Check for key dupes due to needed archive integrity.
if ( $row->ar_rev_id ) {
$exists = $dbw->selectField( 'revision', '1',
array( 'rev_id' => $row->ar_rev_id ), __METHOD__ );
} elseif ( $wgBlockDisablesLogin && $u->isBlocked() ) {
// If we've enabled it, make it so that a blocked user cannot login
$retval = self::USER_BLOCKED;
- } elseif ( $u->getPasswordExpired() == 'hard' ) {
+ } elseif ( $this->checkUserPasswordExpired( $u ) == 'hard' ) {
// Force reset now, without logging in
$retval = self::RESET_PASS;
$this->mAbortLoginErrorMsg = 'resetpass-expired';
$this->getContext()->setLanguage( $userLang );
// Reset SessionID on Successful login (bug 40995)
$this->renewSessionId();
- if ( $this->getUser()->getPasswordExpired() == 'soft' ) {
+ if ( $this->checkUserPasswordExpired( $this->getUser() ) == 'soft' ) {
$this->resetLoginForm( $this->msg( 'resetpass-expired-soft' ) );
} elseif ( $wgInvalidPasswordReset
&& !$user->isValidPassword( $this->mPassword )
function mailPasswordInternal( $u, $throttle = true, $emailTitle = 'passwordremindertitle',
$emailText = 'passwordremindertext'
) {
- global $wgNewPasswordExpiry;
+ global $wgNewPasswordExpiry, $wgMinimalPasswordLength;
if ( $u->getEmail() == '' ) {
return Status::newFatal( 'noemail', $u->getName() );
$currentUser = $this->getUser();
Hooks::run( 'User::mailPasswordInternal', array( &$currentUser, &$ip, &$u ) );
- $np = $u->randomPassword();
+ $np = PasswordFactory::generateRandomPasswordString( $wgMinimalPasswordLength );
$u->setNewpassword( $np, $throttle );
$u->saveSettings();
$userLanguage = $u->getOption( 'language' );
protected function getGroupName() {
return 'login';
}
+
+ /**
+ * Private function to check password expiration, until AuthManager comes
+ * along to handle that.
+ * @param User $user
+ * @return string|bool
+ */
+ private function checkUserPasswordExpired( User $user ) {
+ global $wgPasswordExpireGrace;
+ $dbr = wfGetDB( DB_SLAVE );
+ $ts = $dbr->selectField( 'user', 'user_password_expires', array( 'user_id' => $user->getId() ) );
+
+ $expired = false;
+ $now = wfTimestamp();
+ $expUnix = wfTimestamp( TS_UNIX, $ts );
+ if ( $ts !== null && $expUnix < $now ) {
+ $expired = ( $expUnix + $wgPasswordExpireGrace < $now ) ? 'hard' : 'soft';
+ }
+ return $expired;
+ }
+
}
# either a GET parameter or a subpage-style parameter, so have a member
# variable for it.
protected $mTarget;
+ /*
+ * @var null|User $mFetchedUser The user object of the target username or null.
+ */
+ protected $mFetchedUser = null;
protected $isself = false;
public function __construct() {
// any groups, it's a bit silly to give them the user search prompt.
$user = $this->getUser();
+ $request = $this->getRequest();
+ $out = $this->getOutput();
/*
* If the user is blocked and they only have "partial" access
throw new UserBlockedError( $user->getBlock() );
}
- $request = $this->getRequest();
-
if ( $par !== null ) {
$this->mTarget = $par;
} else {
$this->isself = true;
}
+ $fetchedStatus = $this->fetchUser( $this->mTarget );
+ if ( $fetchedStatus->isOk() ) {
+ $this->mFetchedUser = $fetchedStatus->value;
+ }
+
if ( !$this->userCanChangeRights( $user, true ) ) {
if ( $this->isself && $request->getCheck( 'success' ) ) {
// bug 48609: if the user just removed its own rights, this would
// leads it in a "permissions error" page. In that case, show a
// message that it can't anymore use this page instead of an error
$this->setHeaders();
- $out = $this->getOutput();
$out->wrapWikiMsg( "<div class=\"successbox\">\n$1\n</div>", 'userrights-removed-self' );
$out->returnToMain();
throw new PermissionsError( null, array( array( $msg ) ) );
}
+ // show a successbox, if the user rights was saved successfully
+ if ( $request->getCheck( 'success' ) && $this->mFetchedUser !== null ) {
+ $out->wrapWikiMsg(
+ "<div class=\"successbox\">\n$1\n</div>",
+ array( 'savedrights', $this->mFetchedUser->getName() )
+ );
+ }
+
$this->checkReadOnly();
$this->setHeaders();
$this->outputHeader();
- $out = $this->getOutput();
$out->addModuleStyles( 'mediawiki.special' );
$this->addHelpLink( 'Help:Assigning permissions' );
$user->matchEditToken( $request->getVal( 'wpEditToken' ), $this->mTarget )
) {
// save settings
- $status = $this->fetchUser( $this->mTarget );
- if ( !$status->isOK() ) {
- $this->getOutput()->addWikiText( $status->getWikiText() );
+ if ( !$fetchedStatus->isOK() ) {
+ $this->getOutput()->addWikiText( $fetchedStatus->getWikiText() );
return;
}
- $targetUser = $status->value;
+ $targetUser = $this->mFetchedUser;
if ( $targetUser instanceof User ) { // UserRightsProxy doesn't have this method (bug 61252)
$targetUser->clearInstanceCache(); // bug 38989
}
// We're not using the normalized form of the extension.
// Normal form is lowercase, using most common of alternate
// extensions (eg 'jpg' rather than 'JPEG').
- //
+
// Check for another file using the normalized form...
$nt_lc = Title::makeTitle( NS_FILE, "{$partname}.{$normalizedExtension}" );
$file_lc = wfLocalFile( $nt_lc );
// If no key was supplied, make one. a mysql insertid would be totally
// reasonable here, except that for historical reasons, the key is this
// random thing instead. At least it's not guessable.
- //
// Some things that when combined will make a suitably unique key.
// see: http://www.jwz.org/doc/mid.html
list( $usec, $sec ) = explode( ' ', microtime() );
case 'accusative': # Հայցական հոլով
# stub
break;
- case 'instrumental': #
+ case 'instrumental':
# stub
break;
- case 'prepositional': #
+ case 'prepositional':
# stub
break;
}
$datePreference = $this->dateFormat( $format );
# ISO (YYYY-mm-dd) format
- #
# we also output this format for YMD (eg: 2001 January 15)
if ( $datePreference == 'ISO 8601' ) {
$d = substr( $ts, 0, 4 ) . '-' . substr( $ts, 4, 2 ) . '-' . substr( $ts, 6, 2 );
}
# Walloon format
- #
# we output this in all other cases
$m = substr( $ts, 4, 2 );
$n = substr( $ts, 6, 2 );
"recentchanges-page-added-to-category-bundled": "[[:$1]] і яшчэ {{PLURAL:$2|$2 старонка была дададзеная|$2 старонкі былі дададзеныя|$2 старонак былі дададзеныя}} да катэгорыі",
"recentchanges-page-removed-from-category": "[[:$1]] выдаленая з катэгорыі",
"recentchanges-page-removed-from-category-bundled": "[[:$1]] і яшчэ $2 {{PLURAL:$2|старонка была выдаленая|старонкі былі выдаленыя|старонак былі выдаленыя}} з катэгорыі",
+ "autochange-username": "Аўтаматычная зьмена MediaWiki",
"upload": "Загрузіць файл",
"uploadbtn": "Загрузіць файл",
"reuploaddesc": "Скасаваць загрузку і вярнуцца да формы загрузкі",
"prefs-labs": "آزمایشی ئین ویژگی ئان",
"prefs-user-pages": "کار زوروکی تاکدیمان",
"prefs-personal": "کار زوروکی پروفایل",
- "prefs-rc": "آخیرین تغیراتان",
+ "prefs-rc": "نۆکین تغیران",
"prefs-watchlist": "واچلیست",
"prefs-editwatchlist": "واچلیستی ایڈیٹ کورتین",
"prefs-editwatchlist-label": "وتئ واچلیست ئی موچین لڑلیستانئ ایڈیٹ:",
"stub-threshold": "آستانه په کۆنڈ لینکاني قالب بندیا ($1):",
"stub-threshold-sample-link": "نمونه",
"stub-threshold-disabled": "غیرفعال",
- "recentchangesdays": "روچانی اندازه گ بئ آخیر ئین تغیراتانئ تا نشان داته بوته انت:",
+ "recentchangesdays": "روچانی اندازه گ بِه آخیرئین تغیراتانئ تا نشان داته بوته انت:",
"recentchangesdays-max": "حداکثر $1 {{PLURAL:$1|روچ}}",
"recentchangescount": "پیش پرزین نشان داته بوته ئین ایڈیٹ ئانی اندازه گ:",
- "prefs-help-recentchangescount": "اÛ\8c شاÙ\85Û\8cÙ\84 آخÛ\8cرئÛ\8cÙ\86 تغÛ\8cراÙ\86Û\8cØ\8cتاکدÛ\8cÙ\85اÙ\86Û\8c تارÛ\8cØ®Ú\86Ù\87 ئÛ\8c Ù\88 سÛ\8cاÙ\87Ù\87 ئاÙ\86Û\8c است.",
+ "prefs-help-recentchangescount": "اÛ\8c شاÙ\85Û\8cÙ\84 ئÙ\87 بÛ\8cت Ø´Ù\87 آخÛ\8cرئÛ\8cÙ\86 تغÛ\8cراÙ\86Ø\8cÚ©Ù\87 تاکدÛ\8cÙ\85اÙ\86Û\8c تارÛ\8cØ®Ú\86Ù\87 Ù\88 خاÙ\84Û\8cگاÙ\87 اÙ\86ت.",
"savedprefs": "شمی تنظیمات ذخیره بوتنت.",
"timezonelegend": "منطقهٔ زمانی:",
"localtime": "محلی ئن وخت:",
"right-importupload": "تاکدیمئ داخل کورتین شه فایلئ اپلوڈ کورتین ئا",
"right-patrol": "دیگرانئ ایڈیٹانی مارک جتین",
"right-autopatrol": "اوتوماتیکین مارک وارتین ایڈیٹ ئانی",
- "right-patrolmarks": "آخیرئین گشت وارته ئین برچسپ ئی دیستین",
+ "right-patrolmarks": "گشت وارته ئین علامتاني نۆکین تغیرانئ دیستین",
"right-unwatchedpages": "دیستین آ دیمانی لیستی که پدگیری ئه نه بیئنت",
"right-mergehistory": "تاکدیمانی تاریخچه ئی ادغام کورتین",
"right-userrights": "ایڈیٹ کورتین کار زوروکئ موچین اختیارانئ",
"nchanges": "$1 {{PLURAL:$1|ٹگل|ٹگل}}",
"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|شه اخر ئین دیستینا}}",
"enhancedrc-history": "تاریخچه",
- "recentchanges": "آخیرین تغیراتان",
+ "recentchanges": "نۆکین تغیران",
"recentchanges-legend": "آخیر ئین تغیراتانئ آپشن",
- "recentchanges-summary": "ویکی ئی آخیر ئین تغیرانا بئ تاکدیمی تا بچاریت.",
+ "recentchanges-summary": "به ائ ویکیێ تا نۆکین و آخیرئین تغیرانه به ای دیمئ تا بگیندێت.",
"recentchanges-noresult": "هیچ تغیری بئ تعین بوته ئین دوره ئی تا گۆ ای معیاران هموانی نداشت.",
- "recentchanges-feed-description": "اÛ\8c Ù\88Û\8cÚ©Û\8c ئÛ\8c آخÛ\8cر ئÛ\8cÙ\86 تغÛ\8cراÙ\86ا بئ اÛ\8c Ù\88ارگ ئÛ\8c تا بÚ\86ارÛ\8cت.",
+ "recentchanges-feed-description": "بÙ\87 ائ Ù\88Û\8cÚ©Û\8cÛ\8e تا Ù\86Û\86Ú©Û\8cÙ\86 Ù\88 آخÛ\8cرئÛ\8cÙ\86 تغÛ\8cراÙ\86Ù\87 بÙ\87 اÛ\8c Ù\81Û\8cÚ\88ئ تا بگÛ\8cÙ\86دÛ\8eت.",
"recentchanges-label-newpage": "ای ایڈیٹ نوکین تاکدیمی ئا جوڑ کورت",
"recentchanges-label-minor": "ای یک گونڈین ایڈیٹئ است",
"recentchanges-label-bot": "ای ایڈیٹا یک ربات ئی کورته",
"tooltip-n-mainpage-description": "بُنیاد ئین تاکدیمی دیستین",
"tooltip-n-portal": "بی پروژه ئی موریدا٬ آنچه که توانیت انجام دهیت و ای که چی چیزی ئا شه گوجا ودی بکنیت",
"tooltip-n-currentevents": "پدزمینه ئین مئلوماتئ بدست آورتین شه انونین رویداد ئان",
- "tooltip-n-recentchanges": "ویکی ئی آخیرین تغیرايانی لڑ لیست",
+ "tooltip-n-recentchanges": "ائ ویکیێ نۆکین و آخیرئین تغیراني لڑ",
"tooltip-n-randompage": "یک تصادفی ئین دیمی آورتین",
"tooltip-n-help": "جای په ودی کورتین ئا",
"tooltip-t-whatlinkshere": "موچین تاکدیمانی لڑ لیست که گۆ ای دیما لینک وارته انت",
"passwordreset-emailsent-capture": "স্মরণ করিয়ে দেয়ার জন্য একটি ইমেইল করা হয়েছে, যা নিচে দেখানো হচ্ছে।",
"passwordreset-emailerror-capture": "স্মরণ করিয়ে দেয়ার জন্য একটি ইমেইল তৈরী করা হয়েছিল, যা নিচে দেখানো হচ্ছে, তবে $1 {{GENDER:$2|ব্যবহারকারীকে}} এটি পাঠানো যায়নি!",
"changeemail": "ই-মেইল ঠিকানা পরিবর্তন",
- "changeemail-text": "ই-মেইল ঠিকানা পরিবর্তন করতে আপনাকে এই ফরমটি পূরণ করতে হবে। এই পরিবর্তনটি নিশ্চিত করতে আপনার পাসওয়ার্ড প্রদানের প্রয়োজন হবে।",
+ "changeemail-header": "অ্যাকাউন্ট ই-মেইল ঠিকানা পরিবর্তন",
"changeemail-no-info": "এই পাতাটিতে সরাসরি প্রবেশাধিকার পেতে আপনাকে অবশ্যই লগইন করতে হবে।",
"changeemail-oldemail": "বর্তমান ই-মেইল ঠিকানা:",
"changeemail-newemail": "নতুন ই-মেইল ঠিকানা:",
"unblocklink": "блокировкăран кăлар",
"contribslink": "хушни",
"blocklogpage": "Ĕçлеме чарнисен журналĕ",
+ "blocklogentry": "[[$1]] чарса хучĕ $2 пĕтиччен $3",
"unblocklogentry": "«$1» блокировкăран кăларнă",
"block-log-flags-anononly": "анонимлă хутшăнакансем кăна",
"block-log-flags-nocreate": "хутшăнакансене регистрациленме чарнă",
"block-log-flags-noemail": "çыру яма чарнă",
"move-page-legend": "Страницăна куçарнă",
- "movearticle": "Страницăн ятне улăштар",
"newtitle": "Çĕнĕ ят",
"move-watch": "Ку страницăна сăнамаллисем шутне хуш",
"movepagebtn": "Страницăн ятне улăштар",
"htmlform-selectorother-other": "Урăххи",
"htmlform-no": "Çук",
"logentry-delete-delete": "$1 $3 страница {{GENDER:$2|пăсса утрĕ}}",
+ "logentry-block-block": "$1 {{GENDER:$4|$3}} {{GENDER:$2|чарса хучĕ}} $5 пĕтиччен $6",
"logentry-move-move": "$1 страницă {{GENDER:$2|ятне улăштарчĕ}} $3 - $4",
"rightsnone": "(çук)",
"feedback-back": "Каялла",
"viewsource": "Vis kildetekst",
"viewsource-title": "Se kildekoden til $1",
"actionthrottled": "Begrænsning af handling",
- "actionthrottledtext": "For at modvirke spam, er det ikke muligt at udføre denne handling mange gange på kort tid. Du har overskredet grænsen, hvorfor handlingen er blevet afbrudt. Vær venlig at forsøge igen om et par minutter.",
+ "actionthrottledtext": "For at modvirke spam, er det ikke muligt at udføre denne handling mange gange på kort tid. Du har overskredet grænsen, hvorfor handlingen er blevet afbrudt. Du kan forsøge igen om et par minutter.",
"protectedpagetext": "Denne side er blevet beskyttet, for at forhindre redigering eller andre handlinger.",
"viewsourcetext": "Du kan se og kopiere kildekoden til siden:",
- "viewyourtext": "Du kan se og kopiere kildekoden for '''dine redigeringer''' til denne side:",
+ "viewyourtext": "Du kan se og kopiere kildekoden for <strong>dine redigeringer</strong> til denne side.",
"protectedinterface": "Denne side indeholder teksten i brugergrænsefladen til softwaren på denne wiki, og er beskyttet for at forhindre misbrug.\nHvis du vil tilføje eller ændre oversættelser for alle wiki-websteder, så brug venligst [//translatewiki.net/ translatewiki.net], projektet for oversættelse af MediaWiki.",
"editinginterface": "<strong>Advarsel:</strong> Du redigerer en side, som bruges til at give interface-tekst til softwaren.\nÆndringer på denne side vil påvirke udseendet af brugergrænsefladen for andre brugere på denne wiki.",
"translateinterface": "For at tilføje eller ændre oversættelser for alle wikier, skal du bruge [//translatewiki.net/ translatewiki.net], der er MediaWikis lokaliseringsprojekt.",
"createacct-benefit-body2": "{{PLURAL:$1|side|sider}}",
"createacct-benefit-body3": "{{PLURAL:$1|nylig bidragyder|nylige bidragydere}}",
"badretype": "De indtastede adgangskoder er ikke ens.",
+ "usernameinprogress": "En oprettelse af konto for dette brugernavn er allerede i gang.\nVent venligst.",
"userexists": "Det brugernavn, du har valgt, er allerede i brug.\nVælg venligst et andet brugernavn.",
"loginerror": "Logon mislykket",
"createacct-error": "Fejl ved kontooprettelse",
"passwordreset-emailtext-ip": "Nogen (sandsynligvis dig, fra IP-adressen $1) har anmodet om at få nulstillet din adgangskode til {{SITENAME}} ($4). {{PLURAL:$3|Den følgende brugerkonto er associeret|De følgende brugerkonti er associerede}} med denne e-mailadresse:\n\n$2\n\n{{PLURAL:$3|Denne midlertidige adgangskode|Disse midlertidige adgangskoder}} vil udløbe om {{PLURAL:$5|en dag|$5 dage}}.\nDu bør logge på og vælge en ny adgangskode nu. Hvis en anden end dig har lavet denne anmodning, eller hvis du er kommet i tanke om din oprindelig adgangskode og ikke længere ønsker at ændre den, kan du ignorere denne meddelelse og fortsætte med at bruge din gamle adgangskode.",
"passwordreset-emailtext-user": "Brugeren $1 på {{SITENAME}} har anmodet om at få nulstillet din adgangskode til {{SITENAME}} ($4). {{PLURAL:$3|Den følgende brugerkonto er associeret|De følgende brugerkonti er associerede}} med denne e-mailadresse:\n\n$2\n\n{{PLURAL:$3|Denne midlertidige adgangskode|Disse midlertidige adgangskoder}} vil udløbe om {{PLURAL:$5|en dag|$5 dage}}.\nDu bør logge på og vælge en ny adgangskode nu. Hvis en anden end dig har lavet denne anmodning, eller hvis du er kommet i tanke om din oprindelig adgangskode og ikke længere ønsker at ændre den, kan du ignorere denne meddelelse og fortsætte med at bruge din gamle adgangskode.",
"passwordreset-emailelement": "Brugernavn: \n$1\n\nMidlertidig adgangskode: \n$2",
- "passwordreset-emailsent": "En e-mail om nulstilling af adgangskode er blevet sendt.",
+ "passwordreset-emailsent": "Hvis dettte er en registreret e-mail-adresse til din konto, så vil en nulstilling af adgangskoden e-mail blive sendt.",
"passwordreset-emailsent-capture": "En e-mail om nulstilling af adgangskode, som vist nedenfor, er blevet sendt.",
"passwordreset-emailerror-capture": "En mail om nulstilling af adgangskode, som vist nedenfor, blev genereret, men det lykkedes ikke at sende den til {{GENDER:$2|bruger}}: $1",
"changeemail": "Ændr eller fjern e-mailadresse",
- "changeemail-header": "Ændre kontoens e-mailadresse",
+ "changeemail-header": "Udfyld denne formular for at ændre din e-mail-adresse. Hvis du gerne vil fjerne den forbindelsen af e-mail-adresse fra din konto, så lad den nye e-mailadresse være blank, når du sender formularen.",
+ "changeemail-passwordrequired": "Du er nødt til at indtaste din adgangskode for at bekræfte denne ændring.",
"changeemail-no-info": "Du skal være logget på for at komme direkte til denne side.",
"changeemail-oldemail": "Nuværende e-mailadresse:",
"changeemail-newemail": "Ny e-mailadresse:",
"Tiin",
"Freddy2001",
"Luke081515",
- "J. 'mach' wust"
+ "J. 'mach' wust",
+ "R4c0r"
]
},
"tog-underline": "Links unterstreichen:",
"prefs-help-recentchangescount": "This includes recent changes, page histories, and logs.",
"prefs-help-watchlist-token2": "This is the secret key to the web feed of your watchlist.\nAnyone who knows it will be able to read your watchlist, so do not share it.\nIf you need to, [[Special:ResetTokens|you can reset it]].",
"savedprefs": "Your preferences have been saved.",
+ "savedrights": "The user rights of {{GENDER:$1|$1}} have been saved.",
"timezonelegend": "Time zone:",
"localtime": "Local time:",
"timezoneuseserverdefault": "Use wiki default ($1)",
"upload-dialog-button-done": "Done",
"upload-dialog-button-save": "Save",
"upload-dialog-button-upload": "Upload",
- "upload-process-error": "An error occurred",
- "upload-process-warning": "A warning occurred",
"upload-form-label-select-file": "Select file",
"upload-form-label-infoform-title": "Details",
"upload-form-label-infoform-name": "Name",
"passwordreset-emailsent-capture": "Un courriel de réinitialisation de mot de passe a été envoyé, qui est affiché ci-dessous.",
"passwordreset-emailerror-capture": "Un courriel de réinitialisation de mot de passe a été généré, qui est affiché ci-dessous, mais l'envoi à l'{{GENDER:$2|utilisateur|utilisatrice}} a échoué : $1",
"changeemail": "Changer ou supprimer l’adresse de courriel",
- "changeemail-header": "Changer l’adresse de courriel du compte",
+ "changeemail-header": "Complétez ce formulaire pour modifier votre adresse de courriel. Si vous voulez supprimer l’association d’une adresse de courriel avec votre compte, laissez la nouvelle adresse de courriel vide lors de la soumission du formulaire.",
+ "changeemail-passwordrequired": "Vous devrez saisir votre mot de passe pour confirmer cette modification.",
"changeemail-no-info": "Vous devez être connecté pour pouvoir accéder directement à cette page.",
"changeemail-oldemail": "Adresse de courriel actuelle :",
"changeemail-newemail": "Nouvelle adresse de courriel :",
"sig_tip": "Votre signature avec la date",
"hr_tip": "Ligne horizontale (ne pas en abuser)",
"summary": "Résumé :",
- "subject": "Sujet / titre :",
+ "subject": "Sujet :",
"minoredit": "Modification mineure",
"watchthis": "Suivre cette page",
"savearticle": "Enregistrer",
"missingsummary": "'''Rappel :''' vous n'avez pas encore fourni le résumé de votre modification.\nSi vous cliquez de nouveau sur le bouton « {{int:savearticle}} », la publication sera faite sans nouvel avertissement.",
"selfredirect": "<strong>Attention :</strong> Vous êtes en train de rediriger la page vers elle-même.\nVous pouvez avoir spécifié la mauvaise cible pour la redirection, ou vous modifiez peut-être la mauvaise page.\nSi vous cliquez de nouveau sur « {{int:savearticle}} », la redirection sera créée tout de même.",
"missingcommenttext": "Veuillez entrer un commentaire ci-dessous.",
- "missingcommentheader": "'''Rappel :''' vous n'avez pas fourni de sujet ou de titre à ce commentaire.\nSi vous cliquez de nouveau sur « {{int:Savearticle}} », votre modification sera enregistrée sans titre.",
+ "missingcommentheader": "<strong>Rappel :</strong> Vous n’avez pas fourni de sujet pour ce commentaire.\nSi vous cliquez de nouveau sur « {{int:Savearticle}} », votre modification sera enregistrée sans sujet.",
"summary-preview": "Aperçu du résumé :",
- "subject-preview": "Prévisualisation du sujet/titre :",
+ "subject-preview": "Aperçu du sujet :",
"previewerrortext": "Une erreur s’est produite lors de la tentative de prévisualisation de vos modifications.",
"blockedtitle": "L’utilisateur est bloqué.",
"blockedtext": "'''Votre compte utilisateur ou votre adresse IP a été bloqué.'''\n\nLe blocage a été effectué par $1.\nLa raison invoquée est la suivante : ''$2''.\n\n* Début du blocage : $8\n* Expiration du blocage : $6\n* Compte bloqué : $7.\n\nVous pouvez contacter $1 ou un autre [[{{MediaWiki:Grouppage-sysop}}|administrateur]] pour en discuter.\nVous ne pouvez utiliser la fonction « {{int:emailuser}} » que si une adresse de courriel valide est spécifiée dans vos [[Special:Preferences|préférences]] et que si cette fonctionnalité n’a pas été bloquée.\nVotre adresse IP actuelle est $3 et votre identifiant de blocage est $5.\nVeuillez préciser ces indications dans toutes les requêtes que vous ferez.",
"svg-long-error": "Fichier SVG non valide: $1",
"show-big-image": "Fichier d'origine",
"show-big-image-preview": "Taille de cet aperçu : $1.",
+ "show-big-image-preview-differ": "Taille de cet aperçu $3 de ce fichier $2 : $1.",
"show-big-image-other": "{{PLURAL:$2|Autre résolution|Autres résolutions}} : $1.",
"show-big-image-size": "$1 × $2 pixels",
"file-info-gif-looped": "en boucle",
"passwordreset-emailsent-capture": "Enviouse un correo electrónico de restablecemento do contrasinal, mostrado a continuación.",
"passwordreset-emailerror-capture": "Xerouse un correo electrónico de restablecemento do contrasinal, mostrado a continuación, pero o envío {{GENDER:$2|ao usuario|á usuaria}} fallou: $1",
"changeemail": "Cambiar ou eliminar o enderezo de correo electrónico",
- "changeemail-header": "Cambiar o enderezo de correo electrónico da conta",
+ "changeemail-header": "Encha este formulario para cambiar o seu enderezo de correo electrónico. Se vostede quere eliminar a asociación da dirección de correo electrónico da súa conta, deixe en branco a nova dirección de correo electrónico cando envíe o formulario.",
+ "changeemail-passwordrequired": "Terá que escribir o seu contrasinal para confirmar este cambio.",
"changeemail-no-info": "Debe rexistrarse para acceder directamente a esta páxina.",
"changeemail-oldemail": "Enderezo de correo electrónico actual:",
"changeemail-newemail": "Novo enderezo de correo electrónico:",
"sig_tip": "A súa sinatura con data e hora",
"hr_tip": "Liña horizontal (úsea con moderación)",
"summary": "Resumo:",
- "subject": "Asunto/título:",
+ "subject": "Asunto:",
"minoredit": "Esta é unha edición pequena",
"watchthis": "Vixiar esta páxina",
"savearticle": "Gardar a páxina",
"missingsummary": "'''Aviso:''' Esqueceu incluír o texto do campo resumo.\nSe preme en \"{{int:savearticle}}\" a súa edición gardarase sen ningunha descrición da edición.",
"selfredirect": "<strong>Atención:</strong> Está redirecionando esta páxina a ela mesma. Vostede pode ter especificado a páxina incorrecta para a redireción, ou pode que estea a editar a páxina incorrecta. Se preme \"{{int:savearticle}}\" de novo, crearase a redireción de tódolos xeitos.",
"missingcommenttext": "Por favor, escriba un comentario a continuación.",
- "missingcommentheader": "'''Aviso:''' Non escribiu ningún texto no asunto/título deste comentario.\nSe preme sobre \"{{int:savearticle}}\", a súa edición gardarase sen el.",
+ "missingcommentheader": "<strong>Aviso:</strong> Non escribiu ningún texto no asunto deste comentario.\nSe preme sobre \"{{int:savearticle}}\", a súa edición gardarase sen el.",
"summary-preview": "Vista previa do resumo:",
- "subject-preview": "Vista previa do asunto/título:",
+ "subject-preview": "Vista previa do asunto:",
"previewerrortext": "Houbo un erro ó tentar previsualizar os cambios.",
"blockedtitle": "O usuario está bloqueado",
"blockedtext": "'''O seu nome de usuario ou enderezo IP foi bloqueado.'''\n\nO bloqueo foi realizado por $1.\nA razón que deu foi ''$2''.\n\n* Inicio do bloqueo: $8\n* Caducidade do bloqueo: $6\n* Pretendeuse bloquear: $7\n\nPode contactar con $1 ou con calquera outro [[{{MediaWiki:Grouppage-sysop}}|administrador]] para discutir este bloqueo.\nNon pode empregar a característica \"Enviar un correo electrónico a este usuario\" a non ser que dispoña dun enderezo electrónico válido rexistrado nas súas [[Special:Preferences|preferencias de usuario]] e que o seu uso non fose bloqueado.\nO seu enderezo IP actual é $3 e o ID do bloqueo é #$5.\nPor favor, inclúa eses datos nas consultas que faga.",
"foreign-structured-upload-form-label-own-work": "Isto é o meu propio traballo",
"foreign-structured-upload-form-label-infoform-categories": "Categorías",
"foreign-structured-upload-form-label-infoform-date": "Data",
+ "foreign-structured-upload-form-label-own-work-message-local": "Confirmo que estou a cargar este ficheiro seguindo os termos de uso e políticas de licenza de {{SITENAME}}.",
+ "foreign-structured-upload-form-label-not-own-work-local-local": "Quizais tamén queira probar [[Special:Upload|a páxina predeterminada de subidas]].",
+ "foreign-structured-upload-form-label-own-work-message-default": "Comprendo que estou a cargar este ficheiro nun repositorio compartido. Confirmo que fago isto seguindo os termos de uso e políticas de licenza existentes alí.",
"backend-fail-stream": "Non se puido transmitir o ficheiro \"$1\".",
"backend-fail-backup": "Non se puido facer unha copia de seguridade do ficheiro \"$1\".",
"backend-fail-notexists": "O ficheiro \"$1\" non existe.",
"nstab-template": "ઢાંચો",
"nstab-help": "મદદનું પાનું",
"nstab-category": "શ્રેણી",
+ "mainpage-nstab": "મુખપૃષ્ઠ",
"nosuchaction": "આવી કોઇ ક્રિયા નથી",
"nosuchactiontext": "આ URL દ્વારા દર્શાવેલી ક્રિયા અયોગ્ય છે.\nતમે કદાચ ખોટો URL છાપ્યો હશે અથવા ખોટી કડીથી અહીં આવ્યા હશો.\nતમે સોફ્ટવેરની આ ખામી {{SITENAME}} પર દર્શાવી શકો છો.",
"nosuchspecialpage": "એવું ખાસ પાનું નથી",
"passwordreset-emailsent-capture": "પાસવર્ડ બદલવાનો ઇમેલ મોકલવામાં આવ્યો છે, જે નીચે પ્રમાણે છે.",
"passwordreset-emailerror-capture": "પાસવર્ડ ફરી ગોઠવવા માટેનો ઇમેલ બનાવવામાં આવ્યો છે, જે નીચે પ્રમાણે છે, પરંતુ તે {{GENDER:$2|સભ્ય}}ને મોકલવામાં નિષ્ફળ થયો છે: $1",
"changeemail": "ઇમેલ સરનામું બદલો",
- "changeemail-text": "તમારું ઈ-મેઈલ સરનામું બદલવા માટે આ ફોર્મ ભરો. આ ફેરફાર કાયમ કરવા માટે તમારે પાસવર્ડ ભરવાની જરૂર પડશે.",
+ "changeemail-header": "તમારા ખાતાનું ઇમેલ સરનામું બદલો",
"changeemail-no-info": "બારોબાર આ પાનું જોવા માટે પ્રવેશ કરવો આવશ્યક છે.",
"changeemail-oldemail": "હાલનું ઈમેલ સરનામું:",
"changeemail-newemail": "નવું ઈમેલ સરનામું:",
"svg-long-error": "File SVG non valido: $1",
"show-big-image": "File originale",
"show-big-image-preview": "Dimensioni di questa anteprima: $1.",
+ "show-big-image-preview-differ": "Dimensioni di questa anteprima $3 per questo file $2: $1.",
"show-big-image-other": "{{PLURAL:$2|Altra risoluzione|Altre risoluzioni}}: $1.",
"show-big-image-size": "$1 × $2 pixel",
"file-info-gif-looped": "ciclico",
"passwordreset-emailsent-capture": "អ៊ីមែលស្ដារពាក្យសម្ងាត់មួយដូចបង្ហាញខាងក្រោមត្រូវបានផ្ញើទៅហើយ។",
"passwordreset-emailerror-capture": "អ៊ីមែលស្ដារពាក្យសម្ងាត់មួយដូចបង្ហាញខាងក្រោមត្រូវបានបង្កើតហើយ ប៉ុន្តែការផ្ញើទៅកាន់ {{GENDER:$2|អ្នកប្រើប្រាស់}}មិនបានសំរេចទេ៖ $1",
"changeemail": "ផ្លាស់ប្ដូរអាសយដ្ឋានអ៊ីមែល",
- "changeemail-text": "សូមបំពេញសំនុំបែបបទនេះដើម្បីផ្លាស់ប្ដូរអាសយដ្ឋានអ៊ីមែលរបស់អ្នក។ អ្នកនឹងត្រូវបញ្ចូលពាក្យសម្ងាត់ដើម្បីអះអាងលើការផ្លាស់ប្ដូរនេះ។",
+ "changeemail-header": "ផ្លាស់ប្ដូរអាសយដ្ឋានអ៊ីមែលសំរាប់គណនីនេះ",
"changeemail-no-info": "អ្នកចាំបាច់ត្រូវតែកត់ឈ្មោះចូល ដើម្បីចូលទៅកាន់ទំព័រនេះដោយផ្ទាល់។",
"changeemail-oldemail": "អាសយដ្ឋានអ៊ីមែលបច្ចុប្បន្ន៖",
"changeemail-newemail": "អាសយដ្ឋានអ៊ីមែលថ្មី៖",
"passwordreset-emailsent-capture": "Hriat nawntirna e-lehkha thawn a ni, a hnuaia tarlan ang khuan.",
"passwordreset-emailerror-capture": "Hriat nawntirna e-lehkha siam chhuah a ni a, a hnuaia tarlan ang khuan; mahsé thawn hlawhchham a ni: $1",
"changeemail": "E-chenhmun thlâk rawh",
- "changeemail-text": "I e-chenhmun thlâk tùrin hei hi dahkhat vek rawh. I tihdanglam nemngheh nan i thurûk ziahluh i ngai ang.",
+ "changeemail-header": "Siangchan e-chenhmun thlâk rawh",
"changeemail-no-info": "He phêk lut mai tùr chuan i inziahluh a ngai.",
"changeemail-oldemail": "Tùna i e-chenhmun:",
"changeemail-newemail": "E-chenhmun thar:",
"move-page": "$1 hming thlâkna",
"move-page-legend": "Phêk hming thlâkna",
"movepagetext-noredirectfixer": "Hei hi phêk hming thlâkna a ni. A phêk chanchin-hlui zawng zawng pawh a sawn nghâl vek ang.\nA hming hlui kha hming thara hruailuhna phêkah chantir nghal a ni bawk dawn a ni.\n[[Special:DoubleRedirects|Hming thlâk nawn]] leh [[Special:BrokenRedirects|Hming thlâk chhumbung]] a awm loh nan fimkhur ang che.\nHe phêk hlui zawmtute a hmun dik taka hruailuh a nih leh nih lohvah mawh i phur ang.\n\nI hming thar vuah ang hmingpu dang phêk a awm tawh chuan he phêk hming i thlak tum hi a thlak theih loh vang, a ruak emaw, hruailuhna phêk a ni emaw, siamţhat a la ni lo emaw te a nih ngawt loh chuan.\nChumi awmzia chu, phêk awmsa i luahlantir thei lo va, mahsé a phêk hming hlui ngai i puttir leh thei thung tihna a ni.\n\n'''Vaukhanna!'''\nPhêk lar deuh tan chuan hei hi danglamna râpthlâk leh beisei loh tak i thlen thut thei tih hrechiang ang che;\nphêk hming thlâkina a nghawng theih thilte i hrechiang tih infiah ang che.",
- "movearticle": "Phêk hming thlâk tùr:",
"moveuserpage-warning": "'''Vaukhanna:''' Hmangtu phêk i thlak dawn mek. A hmangtu phêk i thlak ringawt ang a, hmangtu hming erawh i thlâk dawn lo tih hria ang che.",
"movenologintext": "Phêk hming thlâk tùrin [[Special:UserLogin|i (inziah)luh]] a ngai.",
"movenotallowed": "Phêk sawn phalna i nei lo.",
"passwordreset-emailsent-capture": "ତଳେ ଦେଖାଯାଉଥିବା ଭଳି, ପାସୱାର୍ଡ଼ ପୁନଃସ୍ଥାପନ ଇମେଲଟିଏ ପଠାଇଦିଆଯାଇଛି ।",
"passwordreset-emailerror-capture": "ପାସୱାର୍ଡ଼ ବଦଳାଇବା ସୂଚନା ସହ ଇମେଲଟିଏ ତିଆରି ହୋଇଛି, ଯାହା ତଳେ ଦେଖିପାରିବେ । କିନ୍ତୁ ଏହାକୁ {{GENDER:$2|ସଭ୍ୟ}}ଙ୍କୁ ପଠାଇବାରେ ବିଫଳ ହେଲୁ, କାରଣ: $1",
"changeemail": "ଇ-ମେଲ ଠିକଣା ବଦଳାଇବେ",
- "changeemail-text": "ଆପଣା ଇ-ମେଲ ଠିକଣା ବଦଳାଇବା ନିମନ୍ତେ ଏହି ଆବେଦନ ପତ୍ରଟି ପୂରଣ କରନ୍ତୁ । ଆପଣଙ୍କୁ ଏହି ବଦଳ ଥୟ କରିବା ପାଇଁ ନିଜର ପାସୱାର୍ଡ଼ ଦେବାକୁ ପଡ଼ିବ ।",
+ "changeemail-header": "ଖାତା ଇ-ମେଲ ଠିକଣା ବଦଳାଇବେ",
"changeemail-no-info": "ଏହି ପୃଷ୍ଠାଟିକୁ ସିଧା ଖୋଲିବା ନିମନ୍ତେ ଆପଣଙ୍କୁ ଲଗ ଇନ କରିବାକୁ ପଡ଼ିବ ।",
"changeemail-oldemail": "ଏବେର ଇ-ମେଲ ଠିକଣା:",
"changeemail-newemail": "ନୂଆ ଇ-ମେଲ ଠିକଣା:",
"svg-long-error": "Nieprawidłowy plik SVG:$1",
"show-big-image": "Rozmiar pierwotny",
"show-big-image-preview": "Rozmiar podglądu – $1.",
+ "show-big-image-preview-differ": "Wielkość pliku podglądu $3 dla pliku $2: $1",
"show-big-image-other": "{{PLURAL:$2|Inna rozdzielczość|Inne rozdzielczości}}: $1.",
"show-big-image-size": "$1 x $2 pikseli",
"file-info-gif-looped": "zapętlony",
"passwordreset-emailsent-capture": "Un mëssagi ëd riampostassion ëd la ciav a l'é stàit mandà, e a l'é mostrà sì-sota.",
"passwordreset-emailerror-capture": "Un mëssagi ëd riampostassion ëd la ciav a l'é stàit generà, e a l'é smonù sì-sota, ma la spedission a {{GENDER:$2|l'utent}} a l'é falìa: $1",
"changeemail": "Cangé l'adrëssa ëd pòsta eletrònica",
- "changeemail-text": "Ch'a completa 's formolari për cangé soa adrëssa eletrònica. A dev anserì soa ciav për confirmé costa modìfica.",
+ "changeemail-header": "Cangé l'adrëssa ëd pòsta eletrònica dël cont",
"changeemail-no-info": "A dev esse intrà ant ël sistema për andé diretament a costa pàgina.",
"changeemail-oldemail": "Adrëssa ëd pòsta eletrònica atual:",
"changeemail-newemail": "Adrëssa ëd pòsta eletrònica neuva:",
"passwordreset-emailsent-capture": "اک یاد کران والی ای-میل پیج دتی گئی اے، جیہڑی تھلے دسی گئی اے۔",
"passwordreset-emailerror-capture": "اک یادکراؤ ای-میل بنائی گئی اے، جیہڑی کہ تھلے دسی گئی اے، پر ورتن والے تک پیجنا نئیں ہوسکیا:$1",
"changeemail": "ای-میل پتہ بدلو",
- "changeemail-text": "اس فارم نوں پورا کر کے ای-میل پتہ بدلو۔ اس کم نوں پورا کرن واسطے توانوں اپنی کنجی لکھنی پۓ گی۔",
+ "changeemail-header": "کھاتے دا ای-میل پتہ بدلو",
"changeemail-no-info": "تسی لاگ ان ہوکے ای اس صفحے نوں ویکھ سکدے او۔",
"changeemail-oldemail": "ہلے دا ای-میل پتہ:",
"changeemail-newemail": "نواں ای-میل پتہ:",
"prefs-help-recentchangescount": "Used in [[Special:Preferences]], tab \"Recent changes\".",
"prefs-help-watchlist-token2": "Used in [[Special:Preferences]], tab Watchlist. (Formerly in {{msg-mw|prefs-help-watchlist-token}}.)",
"savedprefs": "This message appears after saving changes to your user preferences.",
+ "savedrights": "This message appears after saving the user rights on [[Special:UserRights]].\n* $1 - The user name of the user which rights was saved.",
"timezonelegend": "{{Identical|Time zone}}",
"localtime": "Used as label in [[Special:Preferences#mw-prefsection-datetime|preferences]].",
"timezoneuseserverdefault": "[[Special:Preferences]] > Date and time > Time zone\n\nThis option lets your time zone setting use the one that is used on the wiki (often UTC).\n\nParameters:\n* $1 - timezone name, or timezone offset (in \"%+03d:%02d\" format)",
"upload-dialog-button-done": "Button to close the dialog once upload is complete\n{{Identical|Done}}",
"upload-dialog-button-save": "Button to save the file\n{{Identical|Save}}",
"upload-dialog-button-upload": "Button to initiate upload\n{{Identical|Upload}}",
- "upload-process-error": "Error message from upload",
- "upload-process-warning": "Warning message from upload",
"upload-form-label-select-file": "Label for the select file widget\n{{Identical|Select file}}",
"upload-form-label-infoform-title": "Title for the information form\n{{Identical|Detail}}",
"upload-form-label-infoform-name": "Label for the file name input\n{{Identical|Name}}",
"redirectedfrom": "(Redirecționat de la $1)",
"redirectpagesub": "Pagină de redirecționare",
"redirectto": "Redirecționare către:",
- "lastmodifiedat": "Ultima modificare efectuată pe $1, la $2.",
+ "lastmodifiedat": "Ultima modificare a paginii efectuată la $1, ora $2.",
"viewcount": "Pagina a fost accesată {{PLURAL:$1|o dată|de $1 ori|de $1 de ori}}.",
"protectedpage": "Pagină protejată",
"jumpto": "Salt la:",
"svg-long-error": "Fișier SVG invalid: $1",
"show-big-image": "Fișier original",
"show-big-image-preview": "Mărimea acestei previzualizări: $1.",
+ "show-big-image-preview-differ": "Mărimea acestei previzualizări $3 a acestui fișier $2: $1.",
"show-big-image-other": "{{PLURAL:$2|Altă rezoluție|Alte rezoluții}}: $1.",
"show-big-image-size": "$1 × $2 pixeli",
"file-info-gif-looped": "în buclă",
"passwordreset-emailsent-capture": "परिवर्तितकूटशब्दस्य वि-पत्रं प्रेषितम् अस्ति । तत् अधः द्रष्टुं शक्यते ।",
"passwordreset-emailerror-capture": "परिवर्तितकूटशब्दस्य वि-पत्रं निर्मितम् अस्ति । तत् अधः द्रष्टुं शक्यते । परन्तु {{GENDER:$2|योजकाय}} प्रेषणकाले तत् निरस्तम् अभवत् : $1",
"changeemail": "वि-पत्रसङ्केतः परिवर्त्यताम्",
- "changeemail-text": "स्वस्य वि-पत्रसङ्केतं परिवर्तयितुम् अधः दत्तं प्रपत्रं पूरयतु । एतस्यै प्रक्रियायै कूटशब्दः आवश्यकः ।",
+ "changeemail-header": "प्रयोक्तृनाम्नः ई-पत्रसङ्केतः परिवर्त्यताम्",
"changeemail-no-info": "एतत् पृष्ठं सम्पादयितुं प्रवेशः अनिवार्यः ।",
"changeemail-oldemail": "वर्तमानः वि-पत्रसङ्केतः",
"changeemail-newemail": "नूतनः वि-पत्रसङ्केतः :",
"svg-long-error": "Neveljavna datoteka SVG: $1",
"show-big-image": "Izvirna datoteka",
"show-big-image-preview": "Velikost predogleda: $1.",
+ "show-big-image-preview-differ": "Velikost predogleda $3 datoteke $2: $1.",
"show-big-image-other": "{{PLURAL:$2|Druga ločljivost|Drugi ločljivosti|Druge ločljivosti}}: $1.",
"show-big-image-size": "$1 × $2 točk",
"file-info-gif-looped": "ponavljajoče",
"passwordreset-emailsent-capture": "Një email për rivendosjen e fjalëkalimit është dërguar, i cili tregohet më poshtë.",
"passwordreset-emailerror-capture": "U dërgua një e-mail kujtesë, i cili tregohet më poshtë, por dërgesa për tek përdoruesi qe e pamundur: $1",
"changeemail": "Ndrysho postën elektronike",
- "changeemail-text": "Plotësoni këtë formular për të ndryshuar adresën tuaj të postës elektronike. Ju duhet të shkruani fjalëkalimin tuaj për të konfirmuar këtë ndryshim.",
+ "changeemail-header": "Ndrysho llogarinë e adresës së postës elektronike",
"changeemail-no-info": "Ju duhet të identifikoheni në mënyrë që të keni të drejtë hyrjeje në këtë faqe.",
"changeemail-oldemail": "Adresa aktuale e emailit:",
"changeemail-newemail": "Adresa e re e emailit:",
"passwordreset-email": "Adresse emile:",
"passwordreset-emailtitle": "Detays do contre so {{SITENAME}}",
"changeemail": "Candjî l' emile",
- "changeemail-text": "Rimplixhoz l' formulrece po candjî voste adresse emile. Vos dvroz dner vosse sicret po-z acertiner l' candjmint.",
+ "changeemail-header": "Candjî l' adresse emile do conte",
"changeemail-no-info": "Vos dvoz esse elodjî po pleur aveur accès a cisse pådje ci.",
"changeemail-oldemail": "Adresse emile pol moumint:",
"changeemail-newemail": "Novele adresse emile:",
"spam_reverting": "Loppantib sumb mu mujj mu amul lëkkalekaay buy jëme $1",
"spam_blanking": "Setal nañ wecc sumb yi amoon lëkkalekaay buy jëme $1",
"simpleantispam-label": "Caytu lànk-spam.\n<strong>Bu</strong> fi yokk lenn!",
- "pageinfo-toolboxlink": "Xibaar ci xëtu wi",
+ "pageinfo-toolboxlink": "Xibaar ci xët wi",
"previousdiff": "← Coppite yi gën a yàgg",
"nextdiff": "Coppite yi mujj →",
"file-info": "Réyaayu file bi : $1, type MIME : $2",
"sig_tip": "您的簽名與日期時間",
"hr_tip": "水平線 (少用)",
"summary": "摘要：",
- "subject": "主題/標題：",
+ "subject": "主旨：",
"minoredit": "這是一個小修訂",
"watchthis": "監視此頁面",
"savearticle": "儲存頁面",
"missingcommenttext": "請在下方輸入評論。",
"missingcommentheader": "<strong>提醒：</strong>您未填寫此評論的主旨/標題。\n若您再點選 \"{{int:savearticle}}\" 一次，將略過主旨/標題直接儲存您的評論。",
"summary-preview": "摘要預覽：",
- "subject-preview": "主旨/標題預覽：",
+ "subject-preview": "主旨預覽：",
"previewerrortext": "嘗試預覽您的變更時發生錯誤。",
"blockedtitle": "使用者已被封鎖",
"blockedtext": "<strong>您的使用者名稱或 IP 位址以被封鎖。</strong>\n\n您被 $1 封鎖，\n原因爲 <em>$2</em>。\n\n* 封鎖開始時間：$8\n* 封鎖結束時間：$6\n* 相關封鎖對象：$7\n\n您可以聯絡 $1 或其他的 [[{{MediaWiki:Grouppage-sysop}}|管理員]] 討論封鎖的相關問題。\n若您已在 [[Special:Preferences|偏好設定]] 中設定了一個有效的電子郵件地址，且尚未被封鎖郵件功能，則您可透過 \"Email 聯絡此使用者\" 的功能來聯絡相關管理員。\n您目前的 IP 位址是 $3，此次封鎖的 ID 為 #$5。\n請您在詢問時附註以上詳細訊息。",
"Urhixidur",
"Wong128hk",
"Zerng07",
- "לערי ריינהארט"
+ "לערי ריינהארט",
+ "LNDDYL",
+ "Carrotkit"
]
},
- "tog-underline": "連結標注底線",
- "tog-justify": "段落對齊",
- "tog-hideminor": "近期變動中隱藏細微修改",
- "tog-usenewrc": "使用強化的近期變動 (需要JavaScript)",
- "tog-numberheadings": "自動編號標題",
- "tog-showtoolbar": "顯示編輯工具欄 （需要JavaScript）",
- "tog-watchcreations": "將我建立的頁面加進我的監視列表",
- "tog-watchdefault": "將我更改的頁面添加到我的監視列表中",
- "tog-minordefault": "預設將編輯設定為細微修改",
- "tog-enotifwatchlistpages": "當我監視的頁面改變時發電子郵件給我",
- "tog-enotifusertalkpages": "當我的對話頁有更動時發電子郵件通知我",
- "tog-shownumberswatching": "顯示監視數目",
- "tog-uselivepreview": "使用即時預覽 (JavaScript) (試驗中)",
- "tog-watchlisthideminor": "監視列表中隱藏細微修改",
- "tog-ccmeonemails": "當我寄電子郵件給其他使用者時，也寄一份複本到我的信箱。",
- "saturday": "星期六",
- "sun": "日",
- "mon": "一",
- "tue": "二",
- "wed": "三",
- "thu": "四",
- "fri": "五",
- "january": "一月",
- "february": "二月",
- "march": "三月",
- "april": "四月",
- "may_long": "五月",
- "june": "六月",
- "july": "七月",
- "august": "八月",
- "september": "九月",
- "october": "十月",
- "november": "十一月",
- "december": "十二月",
- "january-gen": "一月",
- "february-gen": "二月",
- "march-gen": "三月",
- "april-gen": "四月",
- "may-gen": "五月",
- "june-gen": "六月",
- "july-gen": "七月",
- "august-gen": "八月",
- "september-gen": "九月",
- "october-gen": "十月",
- "november-gen": "十一月",
- "december-gen": "十二月",
- "jan": "1月",
- "feb": "2月",
- "mar": "3月",
- "apr": "4月",
- "may": "5月",
- "jun": "6月",
- "jul": "7月",
- "aug": "8月",
- "sep": "9月",
- "oct": "10月",
- "nov": "11月",
- "dec": "12月",
- "subcategories": "子分類",
- "qbfind": "尋找",
- "vector-action-protect": "保護",
- "vector-view-create": "建立",
- "vector-view-view": "閱讀",
- "help": "使用說明",
- "search": "搜尋",
- "searchbutton": "搜尋",
- "history": "修訂記錄",
- "history_short": "歷史",
- "edit": "編輯",
- "create": "建立",
- "delete": "刪除",
- "protect_change": "更改",
- "postcomment": "新段落",
- "toolbox": "工具箱",
- "userpage": "檢視使用者頁面",
"projectpage": "檢視計畫頁面",
- "lastmodifiedat": "本頁最後更動時間在 $1 $2。",
- "jumptosearch": "搜尋",
- "aboutsite": "關於 {{SITENAME}}",
"copyright": "本站的文字內容除另有聲明外，全部以 $1 條款授權使用。",
- "disclaimers": "免責聲明",
- "edithelp": "編輯說明",
- "mainpage": "首頁",
- "portal": "社群入口",
- "portal-url": "Project:社群入口",
- "badaccess-groups": "您剛才的請求只有{{PLURAL:$2|這個|這些}}使用者組的使用者才能使用: $1",
- "editold": "編輯",
- "editsectionhint": "编辑段落：$1",
- "showtoc": "顯示",
- "hidetoc": "隱藏",
- "thisisdeleted": "檢視或復原$1?",
- "site-rss-feed": "訂閱 $1 的 RSS 資料來源",
- "site-atom-feed": "訂閱 $1 的 Atom 資料來源",
- "page-rss-feed": "訂閱「$1」的 RSS 資料來源",
- "page-atom-feed": "訂閱「$1」的 Atom 資料來源",
- "red-link-title": "$1 (頁面不存在)",
- "nstab-main": "頁面",
- "nstab-user": "使用者頁面",
- "nstab-special": "特殊頁面",
"nstab-project": "計畫頁面",
"nstab-mediawiki": "介面",
- "nstab-help": "說明頁面",
- "nosuchactiontext": "該URL所指定的動作無效。\n您可能打錯URL，或點了錯誤連結。\n這也可能是{{SITENAME}}所使用的軟件出現了錯誤。",
- "readonlytext": "資料庫目前禁止輸入新內容及更改，\n這很可能是由於資料庫正在維修，之後即可復原。\n管理員有如下解釋:\n<p>$1</p>",
- "cannotdelete": "無法刪除選定的頁面或圖片（它可能已經被其他人刪除了）。",
- "actionthrottledtext": "系統因為反垃圾編輯的考量，禁止如此頻繁地修改資料，請數分鐘後再嘗試。",
- "viewsourcetext": "你可以檢視並複製本頁面的原始碼。",
- "editinginterface": "'''警告：''' 您正在編輯的頁面是正用在軟體上的介面文字。改變此頁將影響其他用戶的介面外觀。如要翻譯，請考慮使用 [//translatewiki.net/wiki/Main_Page?setlang=zh-hant translatewiki.net]，一個用來為MediaWiki軟體本地化的計畫。",
- "ns-specialprotected": "在{{ns:special}}名字空間中的頁面是不可以編輯的。",
- "logouttext": "您現在已經登出。\n\n您可以以匿名方式繼續使用{{SITENAME}}，或者以相同或不同用戶身份[[Special:UserLogin|登入]]。\n請注意，如果你再次登入，此頁或會繼續顯示，直到您清除瀏覽器快取。",
- "welcomecreation": "== 歡迎，$1！ ==\n您的帳號已經建立。\n請不要忘記設定[[Special:Preferences|{{SITENAME}}的個人參數]]。",
- "yourname": "您的使用者名:",
- "yourpassword": "密碼：",
- "login": "登入",
- "nav-login-createaccount": "登入／建立新帳號",
- "userlogin": "登入／建立新帳號",
- "logout": "登出",
- "userlogout": "登出",
- "nologin": "您還沒有帳號嗎？$1。",
- "nologinlink": "建立新帳號",
- "createaccount": "建立新帳號",
- "gotaccount": "已經擁有帳號？$1。",
- "badretype": "你所輸入的密碼並不相同。",
- "userexists": "您所輸入的使用者名稱已經存在，請另選一個名稱。",
- "nocookiesnew": "已成功建立新帳號！偵測到您已關閉 Cookies，請開啟它並登入。",
- "nocookieslogin": "本站利用 Cookies 進行使用者登入，偵測到您已關閉 Cookies，請開啟它並重新登入。",
- "noname": "你沒有輸入一個有效的使用者帳號。",
- "loginsuccess": "你現在以 \"$1\"的身份登入{{SITENAME}}。",
- "nosuchuser": "找不到使用者 \"$1\"。\n檢查您的拼寫，或者用下面的表格[[Special:UserLogin/signup|建立一個新帳號]]。",
- "nosuchusershort": "沒有一個名為「$1」的使用者。請檢查您輸入的文字是否有錯誤。",
- "nouserspecified": "你需要指定一個使用者帳號。",
- "passwordtooshort": "您的密碼不正確或太短，不能少於$1個字元，而且必須跟使用者名不同。",
- "passwordremindertitle": "{{SITENAME}}密碼提醒",
- "passwordremindertext": "有人（來自IP位址$1，可能是您）已請求{{SITENAME}}的新密碼 （$4）。\n用戶\"$2\"現在已設定新臨時密碼\"$3\"。\n如果這個動作是您所指示的，您需要立即登入並選擇一個新的密碼。\n您的臨時密碼會在{{PLURAL:$5|一|$5}}天內過期。\n\n如果是其他人發出了該請求，或者您已經想起了您的密碼而且並不打算換掉，\n您可以忽略此消息並繼續使用您的舊密碼。",
- "noemail": "使用者\"$1\"沒有登記電子郵件地址。",
- "passwordsent": "使用者\"$1\"的新密碼已經寄往所登記的電子郵件地址。\n請在收到後再登入。",
- "blocked-mailpassword": "由於這個使用者被封鎖，我們暫時禁止您請求申請新密碼。造成不便敬請見諒",
- "eauthentsent": "一封確認信已經發送到所示的地址。在發送其它郵件到此帳號前，您必須首先依照這封信中的指導確認這個電子郵件信箱真實有效。",
- "acct_creation_throttle_hit": "抱歉，使用您的IP位址拜訪此wiki網站的訪客已經在昨天創建了$1個帳號，達到了該時段的上限，所以目前使用這個IP位址的訪客不能再繼續創建帳號。",
- "emailauthenticated": "您的電子郵件地址已經於$2 $3確認有效。",
- "emailnotauthenticated": "您的電子郵件地址<strong>還沒被認證</strong>。以下功能將不會發送任何郵件。",
- "noemailprefs": "指定一個電子郵件地址以使用此功能",
- "emailconfirmlink": "確認您的電子郵件地址",
- "invalidemailaddress": "電子郵件地址格式不正確，請輸入正確的電子郵件位址或清空該輸入框。",
- "accountcreated": "已建立帳號",
- "accountcreatedtext": "$1的帳號已經被建立。",
- "createaccount-title": "在{{SITENAME}}中建立新帳號",
- "createaccount-text": "有人在{{SITENAME}}中為 $2 建立了一個新帳號($4)。 \"$2\" 的密碼是 \"$3\" 。您應該立即登入並更改密碼。\n\n如果該帳號建立錯誤的話，您可以忽略此訊息。",
- "resetpass": "更換密碼",
- "resetpass_announce": "您是透過臨時發送到郵件中的代碼登入的。要完成登入，您必須在這裡設定一個新密碼:",
- "resetpass_header": "更換帳號密碼",
- "oldpassword": "舊密碼",
- "newpassword": "新密碼",
- "resetpass_success": "您的密碼已經被成功更改﹗現下正為您登入...",
- "resetpass_forbidden": "無法更改密碼",
- "image_tip": "嵌入圖片",
- "media_tip": "媒體檔案連結",
- "summary": "摘要",
- "minoredit": "這是一個細微修改",
- "savearticle": "儲存頁面",
- "blockedtitle": "使用者被封鎖",
- "confirmedittext": "在編輯此頁之前您必須確認您的電子郵件地址。請透過[[Special:Preferences|偏好設定]]設定並驗證您的電子郵件地址。",
- "accmailtext": "'[[User talk:$1|$1]]'的隨機產生密碼已經寄到$2。\n\n這個新帳號的密碼可以在登入後的''[[Special:ChangePassword|更改密碼]]''頁面中更改。",
- "newarticletext": "您進入了一個尚未建立的頁面。\n要建立該頁面，請在下面的編輯框中輸入內容(詳情參見[[{{MediaWiki:Helppage}}|說明]])。\n如果您是不小心來到此頁面，直接點擊您瀏覽器中的「返回」按鈕返回。",
- "anontalkpagetext": "---- ''這是一個還未建立帳號的匿名使用者的對話頁。我們因此只能用IP地址來與他／她聯絡。該IP地址可能由幾名使用者共享。如果您是一名匿名使用者並認為本頁上的評語與您無關，請[[Special:UserLogin|建立新帳號或登入]]以避免在未來於其他匿名使用者混淆。''",
- "noarticletext": "此頁目前沒有內容，您可以在其它頁[[Special:Search/{{PAGENAME}}|搜索此頁標題]]，\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 搜索有關日誌]，\n或[{{fullurl:{{FULLPAGENAME}}|action=edit}} 編輯此頁]</span>。",
- "userpage-userdoesnotexist": "使用者帳號「<nowiki>$1</nowiki>」未曾建立。請在建立／編輯這個頁面前先檢查一下。",
- "usercsspreview": "'''注意您只是在預覽您的個人 CSS, 還沒有儲存﹗'''",
- "userjspreview": "'''注意您只是在測試／預覽您的個人 JavaScript，還沒有儲存﹗'''",
- "previewnote": "'''請記住這只是預覽，內容尚未儲存！'''",
- "session_fail_preview": "'''很抱歉！由於部份資料遺失，我們無法處理您的編輯。'''\n請再試一次。\n如果仍然失敗，請[[Special:UserLogout|登出]]後重新登入。",
- "session_fail_preview_html": "'''很抱歉！部份資料已遺失，我們無法處理您的編輯。''''''如果這個編輯過程沒有問題，請再試一次。如果仍然有問題，請登出後再重新登入一次。'''",
- "token_suffix_mismatch": "'''由於您使用者端中的編輯信符毀損了一些標點符號字元，為防止編輯的文字損壞，您的編輯已經被拒絕。\n這種情況通常出現於使用含有很多臭蟲、以網路為主的匿名代理服務的時候。'''",
- "editingcomment": "正在編輯$1（新段落）",
- "storedversion": "已保存版本",
- "nonunicodebrowser": "'''警告: 您的瀏覽器不相容Unicode編碼。這裡有一個工作區將使您能安全地編輯頁面: 非ASCII字元將以十六進製編碼模式出現在編輯框中。'''",
- "editingold": "'''警告：你正在編輯的是本頁的舊版本。\n如果你保存它的話，在本版本之後的任何修改都會遺失。'''",
- "longpageerror": "'''錯誤: 您所提交的文字長度有$1KB，這大於$2KB的最大值。該文字不能被儲存。'''",
- "protectedpagewarning": "'''警告: 本頁已經被保護，只有擁有管理員許可權的使用者才可修改。'''",
- "semiprotectedpagewarning": "'''注意:''' 本頁面被鎖定，僅限註冊使用者編輯。",
- "cascadeprotectedwarning": "警告: 本頁已經被保護，只有擁有管理員權限的使用者才可修改，因為本頁已被以下連鎖保護的{{PLURAL:$1|一個|多個}}頁面所包含:",
- "nocreatetitle": "建立頁面受限",
- "nocreatetext": "此網站限制了建立新頁面的功能。你可以返回並編輯已有的頁面，或者[[Special:UserLogin|登錄或建立新帳號]]。",
- "nocreate-loggedin": "您在這個wiki中並無許可權去建立新頁面。",
- "recreate-moveddeleted-warn": "'''警告: 你現在重新建立一個先前曾經刪除過的頁面。'''\n\n你應該要考慮一下繼續編輯這一個頁面是否合適。\n為方便起見，這一個頁面的刪除記錄已經在下面提供:",
- "edit-hook-aborted": "編輯被鉤取消。\n它並無給出解釋。",
- "post-expand-template-argument-category": "包含著略過模板參數的頁面",
- "cantcreateaccounttitle": "無法建立帳號",
- "cantcreateaccount-text": "從這個IP地址 (<b>$1</b>) 建立帳號已經被[[User:$3|$3]]禁止。\n\n當中被$3封鎖的原因是''$2''",
- "histlegend": "差異選擇：標記要比較版本的單選按鈕並點擊底部的按鈕進行比較。<br />\n說明：(目前) 指與目前版本比較，(先前) 指與前一個修訂版本比較，小 = 細微修改。",
- "history-feed-title": "修訂沿革",
- "history-feed-description": "本站上此頁的修訂沿革",
- "history-feed-empty": "所請求的頁面不存在。它可能已被刪除或重新命名。\n嘗試[[Special:Search|搜尋本站]]獲得相關的新建頁面。",
- "rev-deleted-comment": "（註釋已除）",
- "rev-deleted-user": "(使用者名已移除)",
- "rev-deleted-event": "（日誌已除）",
- "rev-deleted-text-permission": "該頁面修訂已經被從公共文件中移除。\n在[{{fullurl:{{#Special:Log}}/suppress|page={{PAGENAMEE}}}} 刪除日誌]中您可能會檢視到詳細的訊息。",
- "rev-deleted-text-view": "該頁面修訂已經被從公共文件中移除。作為此網站的管理員，您可以檢視它；\n在[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} 刪除日誌]中您可能會檢視到詳細的訊息。",
- "revisiondelete": "刪除/復原刪除修訂",
- "revdelete-nooldid-title": "沒有目標修訂",
- "revdelete-nooldid-text": "您沒有指定此操作的目標修訂。",
- "logdelete-selected": "'''選取的$1個日誌項目:'''",
- "revdelete-text": "'''刪除的修訂仍將顯示在修訂記錄中, 但它們的文字內容已不能被公眾訪問。'''\n\n在此網站的其他管理員將仍能訪問隱藏的內容並透過與此相同的介面復原刪除，除非網站工作者進行了一些附加的限制。",
- "revdelete-legend": "設定修訂限制:",
- "revdelete-hide-user": "隱藏編輯者的使用者名/IP",
- "revdelete-hide-restricted": "將此限制同樣應用於管理員",
- "revdelete-suppress": "同時壓制由操作員以及其他使用者的資料",
- "revdelete-unsuppress": "在已復原的修訂中移除限制",
- "revdelete-success": "修訂的可見性已經成功設定。",
- "logdelete-success": "事件的可見性已經成功設定。",
- "mergehistory": "合併修訂記錄",
- "mergehistory-header": "這一頁可以講您合併一個來源頁面的歷史到另一個新頁面中。\n請確認這次更改會繼續保留該頁面先前的歷史版本。\n\n'''最少該來源頁面的現時修訂必定會保持。'''",
- "mergehistory-merge": "以下[[:$1]]的修訂可以合併到[[:$2]]。用該選項按鈕欄去合併只有在指定時間以前所建立的修訂。要留意的是使用導航連結便會重設這一欄。",
- "mergelogpagetext": "以下是一個最近由一個頁面的修訂沿革合併到另一個頁面的列表。",
- "history-title": "「$1」的修訂沿革",
- "compareselectedversions": "比較選定的版本",
- "searchresults": "搜尋結果",
- "searchresulttext": "有關搜尋{{SITENAME}}的更多詳情,參見[[{{MediaWiki:Helppage}}|{{int:help}}]]。",
- "searchsubtitle": "查詢'''[[:$1]]'''（[[Special:Prefixindex/$1|所有以 \"$1\" 開頭的頁面]]{{int:pipe-separator}}[[Special:WhatLinksHere/$1|所有鏈接到 \"$1\" 的頁面]]）",
- "nonefound": "'''注意''': 只有一些名稱空間是會作為預設搜尋。嘗試''all:''去搜尋全部的頁面（包埋討論頁面、模板等），或可用需要的名稱空間作為前綴。",
- "powersearch": "搜尋",
- "searchdisabled": "{{SITENAME}}由於性能方面的原因，全文搜尋已被暫時停用。您可以暫時透過Google搜尋。請留意他們的索引可能會過時。",
- "preferences": "偏好設定",
- "mypreferences": "我的偏好設定",
- "prefsnologintext": "您必須先[[Special:UserLogin|登入]]才能設定個人參數。",
- "prefs-personal": "使用者資料",
- "prefs-rc": "近期變動",
- "prefs-watchlist-days": "監視列表中顯示記錄的最長天數:",
- "resetprefs": "重設參數",
- "searchresultshead": "搜尋結果設定",
- "recentchangesdays": "近期變動中的顯示日數:",
- "recentchangescount": "近期變動中的編輯數:",
- "savedprefs": "您的個人偏好設定已經儲存。",
- "timezonelegend": "時區",
- "localtime": "當地時間",
- "timezoneoffset": "時差¹",
- "servertime": "伺服器時間",
- "allowemail": "接受來自其他使用者的郵件",
- "defaultns": "否則在這些名字空間搜尋：",
- "username": "使用者名:",
- "uid": "使用者ID:",
- "yournick": "暱稱:",
- "badsig": "錯誤的原始簽名；請檢查HTML標籤。",
- "badsiglength": "你的簽名過長；簽名長度必須在$1個字元以下。",
- "prefs-help-gender": "可選：用於軟體中的性別指定。此項資料將會被公開。",
- "prefs-help-realname": "真實姓名是選填的，如果您選擇提供它，那它便用以對您的貢獻署名。",
- "prefs-help-email": "電子郵件是選填的，但當啟用它後可以在您忘記您的個密碼時需要將新密碼重設寄回給您。而在您未公開自己的使用者身分時也能透過您的用戶頁或用戶討論頁與您聯繫。",
- "userrights": "使用者權限管理",
- "userrights-lookup-user": "管理使用者群組",
- "userrights-user-editname": "輸入使用者帳號:",
- "editusergroup": "編輯使用者群組",
- "editinguser": "正在編輯使用者'''[[User:$1|$1]]''' ([[User talk:$1|{{int:talkpagelinktext}}]] | [[Special:Contributions/$1|{{int:contribslink}}]])",
- "userrights-editusergroup": "編輯使用者群組",
- "saveusergroups": "保存使用者群組",
- "group-autoconfirmed": "自動確認使用者",
- "group-autoconfirmed-member": "自動確認使用者",
- "grouppage-autoconfirmed": "{{ns:project}}:自動確認使用者",
- "rightslog": "使用者權限日誌",
- "rightslogtext": "以下記錄了使用者權限的更改記錄。",
- "recentchanges": "近期變動",
- "recentchanges-feed-description": "追蹤此訂閱在 wiki 上的近期變動。",
- "rcnotefrom": "下面是自<b>$2</b>(最多顯示<b>$1</b>):",
- "rcshowhideminor": "$1細微修改",
- "rcshowhidebots": "$1機器人的編輯",
- "rcshowhideliu": "$1具名使用者的編輯",
- "rcshowhideanons": "$1匿名使用者的編輯",
- "rcshowhidepatr": " $1檢查過的編輯",
- "number_of_watching_users_pageview": "[$1個關注使用者]",
- "recentchangeslinked": "相關頁面修訂記錄",
- "recentchangeslinked-feed": "相關頁面修訂記錄",
- "recentchangeslinked-toolbox": "相關頁面修訂記錄",
- "recentchangeslinked-title": "$1 內連結頁面的修訂記錄",
- "recentchangeslinked-summary": "這一個特殊頁面列示這一頁連出頁面的近期變動。在您監視列表中的頁面會以'''粗體'''表示。",
- "upload": "上傳檔案",
- "reuploaddesc": "返回上載表單。",
- "uploadtext": "使用下面的表單來上傳用在頁面內新的圖片檔案。\n要檢視或搜尋以前上傳的圖片\n可以進入[[Special:FileList|圖片清單]]，\n上傳和刪除將在[[Special:Log/upload|上傳日誌]]中記錄。\n\n要在頁面中加入圖片，使用以下形式的連接:\n'''<nowiki>[[</nowiki>{{ns:file}}:file.jpg<nowiki>]]</nowiki>'''，\n'''<nowiki>[[</nowiki>{{ns:file}}:file.png|替換文字<nowiki>]]</nowiki>''' 或\n'''<nowiki>[[</nowiki>{{ns:media}}:file.ogg<nowiki>]]</nowiki>'''。",
- "uploadlogpagetext": "以下是最近上傳的檔案的一覽表。",
- "ignorewarning": "忽略警告並儲存檔案。",
- "illegalfilename": "檔案名\"$1\"包含有頁面標題所禁止的字符。請改名後重新上傳。",
- "badfilename": "檔案名已被改為\"$1\"。",
- "hookaborted": "您所嘗試的修改被擴展鉤捨棄。",
- "fileexists-thumbnail-yes": "這個檔案好像是一幅圖片的縮圖版本''(縮圖)''。 [[$1|thumb]]\n請檢查清楚該檔案'''<tt>[[:$1]]</tt>'''。\n如果檢查後的檔案是同原本圖片的大小是一樣的話，就不用再上載多一幅縮圖。",
- "file-thumbnail-no": "該檔名是以'''<tt>$1</tt>'''開始。它好像一幅圖片的縮圖版本''(縮圖)''。\n如果你有該圖片的完整大小，如不是請再修改檔名。",
- "fileexists-forbidden": "已存在相同名稱的檔案；請返回並用一個新的名稱來上傳此檔案。[[File:$1|thumb|center|$1]]",
- "fileexists-shared-forbidden": "在共享檔案庫中已存在此名稱的檔案；請返回並用一個新的名稱來上傳此檔案。[[File:$1|thumb|center|$1]]",
- "uploaddisabledtext": "檔案上傳在此網站不可用。",
- "watchthisupload": "監視此頁",
- "upload-proto-error": "協訂錯誤",
- "upload-file-error-text": "當試圖在伺服器上建立臨時檔案時發生內部錯誤。請與系統管理員聯繫。",
- "upload-misc-error-text": "在上傳時發生未知的錯誤. 請驗証使用了正確並可訪問的 URL，然後進行重試。如果問題仍然存在，請與系統管理員聯繫。",
- "listfiles_search_for": "按圖片名稱搜尋:",
- "listfiles_user": "使用者",
- "filehist": "檔案歷史",
- "filehist-deleteone": "刪除這個",
- "filehist-revert": "復原",
- "filehist-datetime": "日期/時間",
- "filehist-user": "使用者",
- "imagelinks": "連結",
- "filerevert": "復原$1",
- "filerevert-legend": "復原檔案",
- "filerevert-intro": "<span class=\"plainlinks\">您現正在復原'''[[Media:$1|$1]]'''到[$4 於$2 $3的版本]。</span>",
- "filerevert-defaultcomment": "已經復原到於$1 $2的版本",
- "filerevert-submit": "復原",
- "filerevert-success": "<span class=\"plainlinks\">'''[[Media:$1|$1]]'''已經復原到[$4 於$2 $3的版本]。</span>",
- "filedelete-intro": "您現正刪除'''[[Media:$1|$1]]'''。",
- "filedelete-intro-old": "<span class=\"plainlinks\">你現正刪除'''[[Media:$1|$1]]'''於[$4 $2 $3]的版本。</span>",
- "filedelete-comment": "註解:",
- "filedelete-nofile": "'''$1'''在這個網站中不存在。",
- "filedelete-nofile-old": "在已指定屬性的情況下，這裡沒有'''$1'''於 $2 $3 的版本。",
- "mimesearch": "MIME 搜尋",
- "unusedtemplatestext": "本頁面列出模板名字空間下所有未被其他頁面使用的頁面。請在刪除這些模板前檢查其他鏈入該模板的頁面。",
- "randompage-nopages": "在這個名字空間中沒有頁面。",
- "randomredirect-nopages": "在這個名字空間中沒有重定向頁面。",
- "statistics-header-users": "使用者統計",
- "disambiguations": "消歧義",
- "disambiguations-text": "以下的頁面都有到<b>消歧義頁</b>的鏈接,\n但它們應該是連到適當的標題。<br />\n個頁面會被視為消含糊頁如果它是連自[[MediaWiki:Disambiguationspage]]。",
- "withoutinterwiki-summary": "以下的頁面是未有語言鏈接到其它語言版本:",
- "lonelypagestext": "以下頁面尚未被這個wiki中的其它頁面連結。",
- "uncategorizedimages": "待分類圖片",
- "unusedimages": "未使用圖片",
- "mostimages": "最多連結圖片",
- "prefixindex": "所有頁面之前綴",
- "deadendpagestext": "以下頁面沒有連結到這個wiki中的其它頁面。",
- "listusers": "使用者列表",
- "newpages-username": "使用者帳號:",
- "move": "移動",
- "unusedimagestext": "請注意其它網站可能直接透過 URL 連結此圖片，所以這裡列出的圖片有可能依然被使用。",
- "notargettext": "您還沒有指定一個目標頁面或使用者以進行此項操作。",
- "specialloguserlabel": "使用者:",
- "alllogstext": "綜合顯示 {{SITENAME}} 的上傳、刪除、保護、查封以及站務日誌。",
- "listusersfrom": "給定顯示使用者條件:",
- "listusers-noresult": "找不到使用者。",
- "activeusers-hidebots": "隱藏機器人",
- "mailnologin": "無E-mail地址",
- "mailnologintext": "您必須先[[Special:UserLogin|登入]]\n並在[[Special:Preferences|偏好設定]]\n中有一個有效的e-mail地址才可以E-mail其他使用者。",
- "emailuser": "E-mail該使用者",
- "emailpage": "E-mail使用者",
- "emailpagetext": "如果該使用者已經在他或她的偏好設定頁中輸入了有效的e-mail地址，以下的表格將寄一個訊息給該使用者。您在您偏好設定中所輸入的e-mail地址將出現在郵件「發件人」一欄中，這樣該使用者就可以回覆您。",
- "noemailtext": "該使用者還沒有指定一個有效的e-mail地址，\n或者選擇不接受來自其他使用者的e-mail。",
- "emailfrom": "發件人",
- "emailto": "收件人",
- "emailsubject": "主題",
- "emailmessage": "訊息",
- "emailccme": "將我的消息的副本發送一份到我的E-mail信箱。",
- "addedwatchtext": "頁面「[[:$1]]」已經被加入到您的[[Special:Watchlist|監視清單]]中。將來有關此頁面及其討論頁的任何修改將會在那裡列出，而且還會在[[Special:RecentChanges|近期變動]]中以'''粗體'''形式列出以使起更容易識別。",
- "removedwatchtext": "頁面「[[:$1]]」已經從您的監視頁面中移除。",
- "watchlist-details": "不包含討論頁，您的監視列表共有 $1 頁。",
- "enotif_impersonal_salutation": "{{SITENAME}}使用者",
- "enotif_anon_editor": "匿名使用者$1",
- "enotif_body": "親愛的 $WATCHINGUSERNAME,\n\n$PAGEEDITOR 已經在 $PAGEEDITDATE $CHANGEDORCREATED{{SITENAME}}的 $PAGETITLE 頁面，請到 $PAGETITLE_URL 檢視目前版本。\n\n$NEWPAGE\n\n編輯摘要: $PAGESUMMARY $PAGEMINOREDIT\n\n聯繫此編輯者:\n\n郵件: $PAGEEDITOR_EMAIL\n\n本站: $PAGEEDITOR_WIKI\n\n在您訪問此頁之前，將來的更改將不會向您發通知。您也可以重設您所有監視頁面的通知標記。\n\n {{SITENAME}}通知系統\n\n--\n要改變您的監視列表設定，請參閱\n{{canonicalurl:{{#special:EditWatchlist}}}}\n\n回饋和進一步的說明:\n{{canonicalurl:{{MediaWiki:Helppage}}}}",
- "confirmdeletetext": "您即將從資料庫中永遠刪除一個頁面或圖片以及其歷史。\n請確定您要進行此項操作，並且了解其後果，同時您的行為符合[[{{MediaWiki:Policy-url}}]]。",
- "deletedtext": "「$1」已經被刪除。\n最近刪除的紀錄請參見$2。",
- "dellogpagetext": "以下是最近刪除的紀錄列表。\n所有的時間都是使用伺服器時間。",
- "reverted": "復原到早期版本",
- "deletecomment": "原因：",
- "rollback": "復原",
- "rollback_short": "復原",
- "rollbacklink": "復原",
- "rollbackfailed": "無法復原",
- "cantrollback": "無法復原編輯；最後的貢獻者是本文的唯一作者。",
- "alreadyrolled": "無法復原由[[User:$2|$2]] ([[User talk:$2|討論]])進行的[[$1]]的最後編輯；\n其他人已經編輯或是復原了該頁。\n\n最後編輯者: [[User:$3|$3]] ([[User talk:$3|討論]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]])。",
- "editcomment": "編輯說明: \"''$1''\"。",
- "revertpage": "復原由[[Special:Contributions/$2|$2]] ([[User talk:$2|對話]])的編輯；更改回[[User:$1|$1]]的最後一個版本",
- "rollback-success": "復原由$1的編輯；更改回$2的最後一個版本。",
- "protect-title": "更改「$1」的保護等級",
- "protect-locked-blocked": "您不能在被封鎖時更改保護級別。\n以下是'''$1'''現時的保護級別:",
- "protect-locked-access": "您的帳號權限不能修改保護級別。\n以下是'''$1'''現時的保護級別:",
- "protect-cascadeon": "以下的{{PLURAL:$1|一個|多個}}頁面包含著本頁面的同時，啟動了連鎖保護，因此本頁面目前也被保護，未能編輯。您可以設定本頁面的保護級別，但這並不會對連鎖保護有所影響。",
- "protect-default": "(預設)",
- "protect-level-autoconfirmed": "禁止未註冊使用者",
- "protect-expiry-options": "2小時:2 hours,1天:1 day,1周:1 week,2周:2 weeks,1個月:1 month,3個月:3 months,6個月:6 months,1年:1 year,永久:infinite",
- "maximum-size": "最大大小",
- "undelete": "復原被刪頁面",
- "undeletepage": "瀏覽及復原被刪頁面",
- "undeletepagetext": "以下頁面已經被刪除，但依然在檔案中並可以被復原。\n檔案庫可能被定時清理。",
- "undeleteextrahelp": "復原整個頁面時，請清除所有複選框後按 '''''復原''''' 。 復原特定版本時，請選擇相應版本前的複選框後按'''''復原''''' 。按 '''''重設''''' 將清除評論內容及所有複選框。",
- "undeletehistory": "如果您復原了該頁面，所有版本都會被復原到修訂沿革中。\n如果本頁刪除後有一個同名的新頁面建立，被復原的版本將會稱為較新的歷史。",
- "undeleterevdel": "如果把最新修訂部份刪除，反刪除便無法進行。如果遇到這種情況，您必須反選或反隱藏最新已刪除的修訂。對於您沒有權限去檢視的修訂是無法復原的。",
- "undeletehistorynoadmin": "這個頁面已經被刪除，刪除原因顯示在下方編輯摘要中。被刪除前的所有修訂版本，連同刪除前貢獻使用者等等細節只有管理員可以看見。",
- "undelete-revision": "刪除$1時由$3（在$2）所編寫的修訂版本:",
- "undeleterevision-missing": "此版本的內容不正確或已經遺失。可能連結錯誤、被移除或已經被復原。",
- "undeletebtn": "復原",
- "undeletedrevisions": "$1個修訂版本已經復原",
- "undeletedrevisions-files": "$1 個版本和 $2 個檔案被復原",
- "undeletedfiles": "$1 個檔案被復原",
- "cannotundelete": "復原失敗；可能之前已經被其他人復原。",
- "undeletedpage": "'''$1已經被復原''' 請參考[[Special:Log/delete|刪除日誌]]來查詢刪除及復原記錄。",
- "undelete-missing-filearchive": "由於檔案存檔 ID $1 不在資料庫中，不能在檔案存檔中復原。它可能已經反刪除了。",
- "contributions": "使用者編修記錄",
- "mycontris": "我的編修記錄",
- "contribsub2": "$1的編修記錄 ($2)",
- "uctop": "（最新修改）",
- "sp-contributions-newbies": "只顯示新建立之使用者的編修記錄",
- "sp-contributions-blocklog": "封鎖記錄",
- "sp-contributions-userrights": "使用者權限管理",
- "sp-contributions-username": "IP位址或使用者名稱：",
- "blockip": "封鎖使用者",
- "ipadressorusername": "IP地址或使用者名:",
- "ipbreason-dropdown": "*一般的封鎖理由\n** 屢次增加不實資料\n** 刪除頁面內容\n** 外部連結廣告\n** 在頁面中增加無意義文字\n** 無禮的行為、攻擊／騷擾別人\n** 濫用多個帳號\n** 不能接受的使用者名",
- "ipbcreateaccount": "阻止建立新帳號",
- "ipbemailban": "阻止使用者傳送E-mail",
- "ipbenableautoblock": "自動封鎖此使用者最後所用的IP位址，以及後來試圖編輯所用的所有位址",
- "ipbsubmit": "封鎖該地址",
- "ipbhidename": "在封鎖日誌、活躍封鎖列表以及使用者列表中隱藏使用者名／IP",
- "blockipsuccesssub": "封鎖成功",
- "blockipsuccesstext": "[[Special:Contributions/$1|$1]]已經被封鎖。\n<br />參看[[Special:BlockList|被封IP地址列表]]以覆審封鎖。",
- "ipb-edit-dropdown": "編輯封鎖原因",
- "ipb-unblock-addr": "解除封鎖$1",
- "ipb-unblock": "解除禁封使用者名或IP地址",
- "ipb-blocklist": "檢視現有的封鎖",
- "unblockip": "解除禁封IP地址",
- "unblockiptext": "用下面的表單來復原先前被禁封的IP地址的書寫權。",
- "ipusubmit": "解除禁封",
- "unblocked": "[[User:$1|$1]] 的封鎖已經解除。",
- "unblocked-id": "封鎖 $1 已經被移除",
- "ipblocklist-legend": "搜尋一位已經被封鎖的使用者",
- "anononlyblock": "僅限匿名使用者",
- "noautoblockblock": "禁用自動封鎖",
- "createaccountblock": "禁止建立帳號",
- "ipblocklist-empty": "封鎖列表為空。",
- "ipblocklist-no-results": "所要求的IP地址/使用者名沒有被封鎖。",
- "blocklink": "禁封",
- "blocklogentry": "[[$1]]已被封鎖 $3 ，終止時間為$2",
- "blocklogtext": "這是關於使用者封鎖和解除封鎖操作的記錄。被自動封鎖的IP地址沒有被列出。請參閱[[Special:BlockList|被封鎖的IP地址和使用者列表]]。",
- "block-log-flags-anononly": "僅限匿名使用者",
- "block-log-flags-nocreate": "禁止此IP/使用者建立新帳號",
- "block-log-flags-noautoblock": "停用自動封鎖",
- "range_block_disabled": "只有管理員才能建立禁止封鎖的範圍。",
- "ipb_cant_unblock": "錯誤: 找不到封鎖ID$1。可能已經解除封鎖。",
- "ipb_blocked_as_range": "錯誤: 該IP $1 無直接封鎖，不可以解除封鎖。但是它是在 $2 的封鎖範圍之內，該段範圍是可以解除封鎖的。",
- "blockme": "封鎖我",
- "sorbsreason": "您的IP位址被 DNSBL列為屬於開放代理服務器.",
- "sorbs_create_account_reason": "由於您的IP位址被 DNSBL列為屬於開放代理服務器，所以您無法建立帳號。",
- "lockdbtext": "鎖住資料庫將禁止所有使用者進行編輯頁面、更改參數、編輯監視列表以及其他需要更改資料庫的操作。\n請確認您的決定，並且保證您在維護工作結束後會重新開放資料庫。",
- "unlockdbtext": "開放資料庫將會復原所有使用者進行編輯頁面、修改參數、編輯監視列表以及其他需要更改資料庫的操作。\n請確認您的決定。",
- "movepagetext": "用下面的表單來重新命名一個頁面，並將其修訂沿革同時移動到新頁面。\n老的頁面將成為新頁面的重定向頁。\n連結到老頁面的連結並不會自動更改；\n請檢查雙重或損壞重定向連結。\n您應當負責確定所有連結依然會連到指定的頁面。\n\n注意如果新頁面已經有內容的話，頁面將'''不會'''被移動，\n除非新頁面無內容或是重定向頁，而且沒有修訂沿革。\n這意味著您再必要時可以在移動到新頁面後再移回老的頁面，\n同時您也無法覆蓋現有頁面。\n\n<b>警告！</b>\n對一個經常被訪問的頁面而言這可能是一個重大與唐突的更改；\n請在行動前先了結其所可能帶來的後果。",
- "movenologintext": "您必須是一名登記使用者並且[[Special:UserLogin|登入]]\n後才可移動一個頁面。",
- "movenotallowed": "您在這個wiki中度並沒有許可權去移動頁面。",
- "movetalk": "如果可能的話，請同時移動對話頁。",
- "movelogpagetext": "以下是已經移動的頁面清單:",
- "revertmove": "復原該移動",
- "exporttext": "您可以將特定頁面或一組頁面的文字以及編輯歷史以 XML 格式匯出；這樣可以將有關頁面透過「[[Special:Import|匯入頁面]]」頁面匯入到另一個執行 MediaWiki 的網站。\n\n要匯出頁面，請在下面的文字框中輸入頁面標題，每行一個標題，\n並選擇你是否需要匯出帶有修訂紀錄的以前的版本，\n或是只選擇匯出帶有最後一次編輯訊息的目前版本。\n\n此外你還可以利用連結匯出檔案，例如你可以使用 [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] 匯出「[[{{MediaWiki:Mainpage}}]]」頁面。",
- "export-download": "提供一個檔案以供另存",
- "allmessages": "系統介面",
- "allmessagestext": "這裡列出所有可定製的系統介面。",
- "allmessagesnotsupportedDB": "系統介面功能處於關閉狀態 (wgUseDatabaseMessages)。",
- "thumbnail_error": "建立縮圖錯誤: $1",
- "import-interwiki-history": "複製此頁的所有歷史版本",
- "import-interwiki-namespace": "將頁面轉移到名字空間:",
- "importtext": "請使用 Special:Export 功能從源 wiki 匯出檔案，儲存到您的磁片並上傳到這裡。",
- "importfailed": "匯入失敗: $1",
- "importsuccess": "匯入成功﹗",
- "importhistoryconflict": "存在衝突的修訂沿革(可能在之前已經匯入過此頁面)",
- "tooltip-pt-userpage": "用戶頁",
- "tooltip-pt-anonuserpage": "您編輯本站所用IP的對應使用者頁",
- "tooltip-pt-mytalk": "討論頁",
- "tooltip-pt-preferences": "我的偏好設定",
- "tooltip-pt-watchlist": "我的監視列表",
- "tooltip-pt-mycontris": "編修記錄",
- "tooltip-ca-addsection": "於本討論頁增加新的討論主題",
- "tooltip-ca-history": "本頁面的早前版本。",
- "tooltip-ca-undelete": "將這個頁面復原到被刪除以前的狀態",
- "tooltip-p-logo": "首頁",
- "tooltip-n-help": "尋求說明",
- "tooltip-feed-rss": "訂閱本修訂記錄的RSS資訊",
- "tooltip-feed-atom": "訂閱本修訂記錄的Atom訊息",
- "tooltip-t-contributions": "檢視該使用者的編修記錄",
- "tooltip-t-emailuser": "向該使用者發送電子郵件",
- "tooltip-t-upload": "上傳圖片或多媒體檔",
- "tooltip-t-permalink": "這個頁面版本的永久連結",
- "tooltip-ca-nstab-user": "檢視使用者頁",
- "tooltip-ca-nstab-image": "查詢圖片頁面",
- "tooltip-ca-nstab-template": "檢視模板",
- "tooltip-ca-nstab-help": "檢視說明頁面",
- "tooltip-ca-nstab-category": "檢視分類頁面",
- "tooltip-minoredit": "標記為細微修改",
- "tooltip-compareselectedversions": "檢視本頁被點選的兩個版本間的差異",
- "tooltip-rollback": "『{{int:rollbacklink}}』可以一按恢復上一位貢獻者對這個頁面的編輯",
- "tooltip-undo": "『{{int:editundo}}』可以在編輯模式上開啟編輯表格以便復原。它容許在摘要中加入原因。",
- "anonymous": "{{SITENAME}}的匿名{{PLURAL:$1|使用者|使用者}}",
- "siteuser": "{{SITENAME}}使用者$1",
- "anonuser": "{{SITENAME}}匿名使用者$1",
- "siteusers": "{{SITENAME}}{{PLURAL:$2|使用者|使用者}}$1",
- "anonusers": "{{SITENAME}}匿名{{PLURAL:$2|使用者|使用者}}$1",
- "spamprotectiontext": "垃圾過濾器禁止保存您剛才提交的頁面，這可能是由於您所加入的外部網站連結所產生的問題。",
- "spam_reverting": "復原到不包含連結至$1的最近版本",
- "markedaspatrolledtext": "選定的版本已被標記為已檢查.",
- "patrol-log-page": "巡查記錄",
- "previousdiff": "←上一個",
- "nextdiff": "下一個→",
- "imagemaxsize": "在圖片描述頁對圖片大小限制為:",
- "file-nohires": "無更高解析度可提供。",
- "show-big-image": "完整解析度",
- "newimages": "新建圖片畫廊",
- "imagelisttext": "以下是按$2排列的$1個檔案列表。",
- "showhidebots": "(機器人$1)",
- "noimages": "無可檢視圖片。",
- "bad_image_list": "請根據以下的格式去編寫:\n\n只有列示項目（以 * 開頭的項目）會被考慮。第一個連結一定要連接去壞圖片中。\n然後在同一行的連結會考慮作例外，即是幅圖片可以在哪一個頁面中同時顯示。",
- "variantname-zh-tw": "台灣繁體",
- "metadata-help": "此檔案中包含有擴展的訊息。這些訊息可能是由數位相機或掃描器在建立或數位化過程中所增加的。\n\n如果此檔案的源檔案已經被修改，一些訊息在修改後的檔案中將不能完全反映出來。",
- "exif-bitspersample": "每像素位元數",
- "exif-photometricinterpretation": "像素合成",
- "exif-samplesperpixel": "像素數",
- "exif-xresolution": "水準解析度",
- "exif-yresolution": "垂直解析度",
- "exif-stripoffsets": "圖片數據區",
- "exif-imagedescription": "圖片標題",
- "exif-compressedbitsperpixel": "圖片壓縮模式",
- "exif-pixelydimension": "有效圖片寬度",
- "exif-pixelxdimension": "有效圖片高度",
- "exif-usercomment": "使用者註釋",
- "exif-focalplanexresolution": "X軸焦平面解析度",
- "exif-focalplaneyresolution": "Y軸焦平面解析度",
- "exif-focalplaneresolutionunit": "焦平面解析度單位",
- "exif-customrendered": "自定義圖片處理",
- "exif-imageuniqueid": "唯一圖片ID",
- "exif-gpsimgdirectionref": "圖片方位參照",
- "exif-gpsimgdirection": "圖片方位",
- "exif-lightsource-2": "螢光燈",
- "exif-lightsource-12": "日光螢光燈（色溫 D 5700 7100K）",
- "exif-lightsource-13": "日溫白色螢光燈（N 4600 5400K）",
- "exif-lightsource-14": "冷白色螢光燈（W 3900 4500K）",
- "exif-lightsource-15": "白色螢光 （WW 3200 3700K）",
- "edit-externally-help": "請參見[//www.mediawiki.org/wiki/Manual:External_editors 設定步驟]了解詳細資訊。",
- "confirmemail": "確認電子郵件地址",
- "confirmemail_noemail": "您沒有在您的[[Special:Preferences|使用者設定]]裡面輸入一個有效的 email 位址。",
- "confirmemail_text": "此網站要求您在使用郵件功能之前驗證您的電子郵件地址。\n點擊以下按鈕可向您的郵箱發送一封確認郵件。該郵件包含有一行代碼連結；\n請在您的瀏覽器中加載此連結以確認您的電子郵件地址是有效的。",
- "confirmemail_sendfailed": "不能發送確認郵件，請檢查電子郵件地址是否包含非法字元。\n\n郵件傳送員回應: $1",
- "confirmemail_needlogin": "您需要$1以確認您的電子郵件地址。",
- "confirmemail_success": "您的郵箱已經被確認。您現下可以登錄並使用此網站了。",
- "confirmemail_loggedin": "您的電子郵件地址現下已被確認。",
- "confirmemail_subject": "{{SITENAME}}電子郵件地址確認",
- "scarytranscludefailed": "[抱歉，模板$1讀取失敗]",
- "scarytranscludetoolong": "[抱歉，URL 地址太長]",
- "confirmrecreate": "在您編輯這個頁面後，使用者[[User:$1|$1]]([[User talk:$1|對話]])以下列原因刪除了這個頁面: $2。請在重新建立頁面前三思。",
- "autosumm-blank": "移除所有頁面內容",
- "autosumm-replace": "正在將頁面替換為 '$1'",
- "autoredircomment": "正在重定向到 [[$1]]",
- "autosumm-new": "新頁面: $1",
- "livepreview-failed": "即時預覽失敗! 嘗試標準預覽。",
- "version-parserhooks": "語法鉤",
- "version-hooks": "鉤",
- "version-parser-function-hooks": "語法函數鉤",
- "version-hook-name": "鉤名",
- "specialpages": "特殊頁面"
+ "welcomecreation": "== 歡迎，$1！ ==\n您的帳號已經建立。\n請勿忘記設定 [[Special:Preferences|{{SITENAME}} 的個人偏好]]。"
}
$this->progress( "Spawning database subprocess: $cmd" );
$this->spawnProc = proc_open( $cmd, $spec, $pipes );
if ( !$this->spawnProc ) {
- // shit
$this->progress( "Subprocess spawn failed." );
return false;
$this->error( "\$wgCapitalLinks is on -- no need for caps links cleanup.", true );
}
- $this->user = User::newFromName( 'Conversion script' );
+ $this->user = User::newSystemUser( 'Conversion script', array( 'steal' => true ) );
$this->namespace = intval( $this->getOption( 'namespace', 0 ) );
$this->dryrun = $this->hasOption( 'dry-run' );
global $IP, $wgLocalDatabases, $wgUser;
$username = wfMessage( 'spambot_username' )->text();
- $wgUser = User::newFromName( $username );
+ $wgUser = User::newSystemUser( $username );
if ( !$wgUser ) {
$this->error( "Invalid username specified in 'spambot_username' message: $username", true );
}
public function execute() {
global $wgUser;
- $wgUser = User::newFromName( 'Conversion script' );
$this->dryrun = $this->hasOption( 'dry-run' );
if ( $this->dryrun ) {
+ $wgUser = User::newFromName( 'Conversion script' );
$this->output( "Checking for bad titles...\n" );
} else {
+ $wgUser = User::newSystemUser( 'Conversion script', array( 'steal' => true ) );
$this->output( "Checking and fixing bad titles...\n" );
}
$this->runTable( $this->defaultParams );
chdir( $oldCwd );
# Options processing
- $username = $this->getOption( 'u', 'Delete page script' );
+ $username = $this->getOption( 'u', false );
$reason = $this->getOption( 'r', '' );
$interval = $this->getOption( 'i', 0 );
- $user = User::newFromName( $username );
+ if ( $username === false ) {
+ $user = User::newSystemUser( 'Delete page script', array( 'steal' => true ) );
+ } else {
+ $user = User::newFromName( $username );
+ }
if ( !$user ) {
$this->error( "Invalid username", true );
}
return;
}
- $user = User::newFromName( 'MediaWiki default' );
+ $user = User::newSystemUser( 'MediaWiki default', array( 'steal' => true ) );
if ( !$user ) {
$this->error( "Invalid username", true );
}
public function execute() {
global $wgUser;
- $userName = $this->getOption( 'user', 'Maintenance script' );
+ $userName = $this->getOption( 'user', false );
$summary = $this->getOption( 'summary', '' );
$minor = $this->hasOption( 'minor' );
$bot = $this->hasOption( 'bot' );
$autoSummary = $this->hasOption( 'autosummary' );
$noRC = $this->hasOption( 'no-rc' );
- $wgUser = User::newFromName( $userName );
+ if ( $userName === false ) {
+ $wgUser = User::newSystemUser( 'Maintenance script', array( 'steal' => true ) );
+ } else {
+ $wgUser = User::newFromName( $userName );
+ }
if ( !$wgUser ) {
$this->error( "Invalid username", true );
}
# Initialise the user for this operation
$user = isset( $options['user'] )
? User::newFromName( $options['user'] )
- : User::newFromName( 'Maintenance script' );
+ : User::newSystemUser( 'Maintenance script', array( 'steal' => true ) );
if ( !$user instanceof User ) {
- $user = User::newFromName( 'Maintenance script' );
+ $user = User::newSystemUser( 'Maintenance script', array( 'steal' => true ) );
}
$wgUser = $user;
public function execute() {
global $wgUser;
- $user = User::newFromName( $this->getOption( 'username', 'ScriptImporter' ) );
+ $username = $this->getOption( 'username', false );
+ if ( $username === false ) {
+ $user = User::newSystemUser( 'ScriptImporter', array( 'steal' => true ) );
+ } else {
+ $user = User::newFromName( $username );
+ }
$wgUser = $user;
$baseUrl = $this->getArg( 1 );
chdir( $oldCwd );
# Options processing
- $user = $this->getOption( 'u', 'Move page script' );
+ $user = $this->getOption( 'u', false );
$reason = $this->getOption( 'r', '' );
$interval = $this->getOption( 'i', 0 );
$noredirects = $this->getOption( 'noredirects', false );
if ( !$file ) {
$this->error( "Unable to read file, exiting", true );
}
- $wgUser = User::newFromName( $user );
+ if ( $user === false ) {
+ $wgUser = User::newSystemUser( 'Move page script', array( 'steal' => true ) );
+ } else {
+ $wgUser = User::newFromName( $user );
+ }
if ( !$wgUser ) {
$this->error( "Invalid username", true );
}
foreach ( $spaces as $name => $ns ) {
if ( $ns != 0 ) {
- // Fix up link destinations for non-interwiki links only.
- //
- // For example if a page has [[Foo:Bar]] and then a Foo namespace
- // is introduced, pagelinks needs to be updated to have
- // page_namespace = NS_FOO.
- //
- // If instead an interwiki prefix was introduced called "Foo",
- // the link should instead be moved to the iwlinks table. If a new
- // language is introduced called "Foo", or if there is a pagelink
- // [[fr:Bar]] when interlanguage magic links are turned on, the
- // link would have to be moved to the langlinks table. Let's put
- // those cases in the too-hard basket for now. The consequences are
- // not especially severe.
- //
- // @fixme Handle interwiki links, and pagelinks to Category:, File:
- // which probably need reparsing.
+ /* Fix up link destinations for non-interwiki links only.
+ *
+ * For example if a page has [[Foo:Bar]] and then a Foo namespace
+ * is introduced, pagelinks needs to be updated to have
+ * page_namespace = NS_FOO.
+ *
+ * If instead an interwiki prefix was introduced called "Foo",
+ * the link should instead be moved to the iwlinks table. If a new
+ * language is introduced called "Foo", or if there is a pagelink
+ * [[fr:Bar]] when interlanguage magic links are turned on, the
+ * link would have to be moved to the langlinks table. Let's put
+ * those cases in the too-hard basket for now. The consequences are
+ * not especially severe.
+ * @fixme Handle interwiki links, and pagelinks to Category:, File:
+ * which probably need reparsing.
+ */
$this->checkLinkTable( 'pagelinks', 'pl', $ns, $name, $options );
$this->checkLinkTable( 'templatelinks', 'tl', $ns, $name, $options );
$this->db->delete( 'page', array( 'page_id' => $id ), __METHOD__ );
- // Call LinksDeletionUpdate to delete outgoing links from the old title,
- // and update category counts.
- //
- // Calling external code with a fake broken Title is a fairly dubious
- // idea. It's necessary because it's quite a lot of code to duplicate,
- // but that also makes it fragile since it would be easy for someone to
- // accidentally introduce an assumption of title validity to the code we
- // are calling.
+ /* Call LinksDeletionUpdate to delete outgoing links from the old title,
+ * and update category counts.
+ *
+ * Calling external code with a fake broken Title is a fairly dubious
+ * idea. It's necessary because it's quite a lot of code to duplicate,
+ * but that also makes it fragile since it would be easy for someone to
+ * accidentally introduce an assumption of title validity to the code we
+ * are calling.
+ */
$update = new LinksDeletionUpdate( $wikiPage );
$update->doUpdate();
$this->db->commit( __METHOD__ );
}
public function execute() {
- $userName = $this->getOption( 'u', 'Maintenance script' );
+ $userName = $this->getOption( 'u', false );
$reason = $this->getOption( 'r', '' );
$cascade = $this->hasOption( 'cascade' );
$protection = "";
}
- $user = User::newFromName( $userName );
+ if ( $userName === false ) {
+ $user = User::newSystemUser( 'Maintenance script', array( 'steal' => true ) );
+ } else {
+ $user = User::newFromName( $userName );
+ }
if ( !$user ) {
$this->error( "Invalid username", true );
}
return;
}
- $doer = User::newFromName( 'Maintenance script' );
+ $doer = User::newSystemUser( 'Maintenance script', array( 'steal' => true ) );
foreach ( $titles as $t ) {
$page = WikiPage::factory( $t );
return;
}
- // Check to see if the target text_ids have been moved already.
- //
- // We originally read from the slave, so this can happen when a single
- // text_id is shared between multiple pages. It's rare, but possible
- // if a delete/move/undelete cycle splits up a null edit.
- //
- // We do a locking read to prevent closer-run race conditions.
+ /* Check to see if the target text_ids have been moved already.
+ *
+ * We originally read from the slave, so this can happen when a single
+ * text_id is shared between multiple pages. It's rare, but possible
+ * if a delete/move/undelete cycle splits up a null edit.
+ *
+ * We do a locking read to prevent closer-run race conditions.
+ */
$dbw = wfGetDB( DB_MASTER );
$dbw->begin( __METHOD__ );
$res = $dbw->select( 'blob_tracking',
--
user_editcount int,
- -- Expiration date for user password. Use $user->expirePassword()
- -- to force a password reset.
+ -- Expiration date for user password.
user_password_expires varbinary(14) DEFAULT NULL
) /*$wgDBTableOptions*/;
public function execute() {
global $wgUser;
- $user = $this->getOption( 'user', 'Command line script' );
+ $user = $this->getOption( 'user', false );
$reason = $this->getOption( 'reason', '' );
$pageName = $this->getArg();
if ( !$title ) {
$this->error( "Invalid title", true );
}
- $wgUser = User::newFromName( $user );
+ if ( $user === false ) {
+ $wgUser = User::newSystemUser( 'Command line script', array( 'steal' => true ) );
+ } else {
+ $wgUser = User::newFromName( $user );
+ }
if ( !$wgUser ) {
$this->error( "Invalid username", true );
}
'xmlns' => 'http://a9.com/-/spec/opensearch/1.1/',
'xmlns:moz' => 'http://www.mozilla.org/2006/browser/search/' ) );
-// The spec says the ShortName must be no longer than 16 characters,
-// but 16 is *realllly* short. In practice, browsers don't appear to care
-// when we give them a longer string, so we're no longer attempting to trim.
-//
-// Note: ShortName and the <link title=""> need to match; they are used as
-// a key for identifying if the search engine has been added already, *and*
-// as the display name presented to the end-user.
-//
-// Behavior seems about the same between Firefox and IE 7/8 here.
-// 'Description' doesn't appear to be used by either.
+/* The spec says the ShortName must be no longer than 16 characters,
+ * but 16 is *realllly* short. In practice, browsers don't appear to care
+ * when we give them a longer string, so we're no longer attempting to trim.
+ *
+ * Note: ShortName and the <link title=""> need to match; they are used as
+ * a key for identifying if the search engine has been added already, *and*
+ * as the display name presented to the end-user.
+ *
+ * Behavior seems about the same between Firefox and IE 7/8 here.
+ * 'Description' doesn't appear to be used by either.
+ */
$fullName = wfMessage( 'opensearch-desc' )->inContentLanguage()->text();
print Xml::element( 'ShortName', null, $fullName );
print Xml::element( 'Description', null, $fullName );
'mediawiki.jqueryMsg',
),
'messages' => array(
- 'upload-process-error',
- 'upload-process-warning',
'upload-form-label-select-file',
'upload-form-label-infoform-title',
'upload-form-label-infoform-name',
'mediawiki.legacy.commonPrint' => array(
'position' => 'top',
'styles' => array(
- // @todo: Remove mediawiki.page.gallery when cache has cleared
- 'resources/src/mediawiki/page/gallery-print.css' => array( 'media' => 'print' ),
'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
),
),
'mediawiki.legacy.shared' => array(
'position' => 'top',
'styles' => array(
- // @todo: Remove when mediawiki.page.gallery in cached html.
- 'resources/src/mediawiki/page/gallery.css',
'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
),
),
"ooui-dialog-process-dismiss": "Lukk",
"ooui-dialog-process-retry": "Prøv igjen",
"ooui-dialog-process-continue": "Fortsett",
+ "ooui-selectfile-button-select": "Velg en fil",
"ooui-selectfile-not-supported": "Filvalg er ikke støttet",
- "ooui-selectfile-placeholder": "Ingen fil er valgt"
+ "ooui-selectfile-placeholder": "Ingen fil er valgt",
+ "ooui-selectfile-dragdrop-placeholder": "Slipp fil her"
}
},
"ooui-outline-control-move-down": "ਨੀਚੇ ਲੈਕੇ ਜਾਓ",
"ooui-outline-control-move-up": "ਉੱਤੇ ਲੈਕੇ ਜਾਓ",
+ "ooui-outline-control-remove": "ਆਈਟਮ ਹਟਾਓ",
"ooui-toolbar-more": "ਹੋਰ",
"ooui-toolgroup-expand": "ਹੋਰ",
"ooui-toolgroup-collapse": "ਥੋੜ੍ਹੇ",
"ooui-dialog-process-error": "ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ",
"ooui-dialog-process-dismiss": "ਰੱਦ ਕਰੋ",
"ooui-dialog-process-retry": "ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ",
- "ooui-dialog-process-continue": "ਜਾਰੀ ਰੱਖੋ"
+ "ooui-dialog-process-continue": "ਜਾਰੀ ਰੱਖੋ",
+ "ooui-selectfile-button-select": "ਫ਼ਾਈਲ ਚੁਣੋ",
+ "ooui-selectfile-not-supported": "ਚੁਣੀ ਗਈ ਫ਼ਾਈਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ",
+ "ooui-selectfile-placeholder": "ਕੋਈ ਫ਼ਾਈਲ ਚੁਣੀ ਨਹੀਂ ਗਈ",
+ "ooui-selectfile-dragdrop-placeholder": "ਫ਼ਾਈਲ ਇੱਥੇ ਸਿੱਟੋ"
}
/*!
- * OOjs UI v0.12.11
+ * OOjs UI v0.12.12
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-10-07T20:48:23Z
+ * Date: 2015-10-13T20:38:26Z
*/
@-webkit-keyframes oo-ui-progressBarWidget-slide {
from {
width: 100%;
}
.oo-ui-capsuleMultiSelectWidget-handle {
- background: #ffffff;
+ background-color: #ffffff;
cursor: text;
min-height: 2.4em;
margin-right: 0.5em;
/*!
- * OOjs UI v0.12.11
+ * OOjs UI v0.12.12
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-10-07T20:48:15Z
+ * Date: 2015-10-13T20:38:18Z
*/
/**
* @class
/*!
- * OOjs UI v0.12.11
+ * OOjs UI v0.12.12
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-10-07T20:48:23Z
+ * Date: 2015-10-13T20:38:26Z
*/
@-webkit-keyframes oo-ui-progressBarWidget-slide {
from {
min-width: 1em;
border-radius: 2px;
position: relative;
- -webkit-transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
- -moz-transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
- -ms-transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
- -o-transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
- transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
+ -webkit-transition: background 100ms ease, color 100ms ease, border-color 100ms ease, box-shadow 100ms ease;
+ -moz-transition: background 100ms ease, color 100ms ease, border-color 100ms ease, box-shadow 100ms ease;
+ -ms-transition: background 100ms ease, color 100ms ease, border-color 100ms ease, box-shadow 100ms ease;
+ -o-transition: background 100ms ease, color 100ms ease, border-color 100ms ease, box-shadow 100ms ease;
+ transition: background 100ms ease, color 100ms ease, border-color 100ms ease, box-shadow 100ms ease;
}
.oo-ui-buttonElement-framed > .oo-ui-buttonElement-button:hover,
.oo-ui-buttonElement-framed > .oo-ui-buttonElement-button:focus {
opacity: 0;
z-index: 1;
position: relative;
+ cursor: pointer;
margin: 0;
width: 1.6em;
height: 1.6em;
max-width: none;
}
.oo-ui-checkboxInputWidget input[type="checkbox"] + span {
- cursor: pointer;
-webkit-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
-moz-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
-ms-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
opacity: 0;
z-index: 1;
position: relative;
+ cursor: pointer;
margin: 0;
width: 1.6em;
height: 1.6em;
max-width: none;
}
.oo-ui-radioInputWidget input[type="radio"] + span {
- cursor: pointer;
-webkit-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
-moz-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
-ms-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
margin-right: 0;
}
.oo-ui-dropdownWidget-handle {
- padding: 0.3em 0;
+ padding: 0.5em 0;
height: 2.275em;
border: 1px solid #cccccc;
border-radius: 0.1em;
width: 100%;
}
.oo-ui-capsuleMultiSelectWidget-handle {
- background: #ffffff;
+ background-color: #ffffff;
cursor: text;
min-height: 2.4em;
margin-right: 0.5em;
/*!
- * OOjs UI v0.12.11
+ * OOjs UI v0.12.12
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-10-07T20:48:15Z
+ * Date: 2015-10-13T20:38:18Z
*/
/**
* @class
*/
OO.ui.MediaWikiTheme.prototype.getElementClasses = function ( element ) {
// Parent method
- var variant,
+ var variant, isFramed, isActive,
variants = {
warning: false,
invert: false,
destructive: false
},
// Parent method
- classes = OO.ui.MediaWikiTheme.parent.prototype.getElementClasses.call( this, element ),
- isFramed;
+ classes = OO.ui.MediaWikiTheme.parent.prototype.getElementClasses.call( this, element );
if ( element.supports( [ 'hasFlag' ] ) ) {
isFramed = element.supports( [ 'isFramed' ] ) && element.isFramed();
+ isActive = element.supports( [ 'isActive' ] ) && element.isActive();
if (
- ( isFramed && ( element.isDisabled() || element.hasFlag( 'primary' ) ) ) ||
+ ( isFramed && ( isActive || element.isDisabled() || element.hasFlag( 'primary' ) ) ) ||
( !isFramed && element.hasFlag( 'primary' ) )
) {
variants.invert = true;
/*!
- * OOjs UI v0.12.11
+ * OOjs UI v0.12.12
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2015 OOjs UI Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-10-07T20:48:15Z
+ * Date: 2015-10-13T20:38:18Z
*/
( function ( OO ) {
* @cfg {Array} [content] An array of content elements to append (after #text).
* Strings will be html-escaped; use an OO.ui.HtmlSnippet to append raw HTML.
* Instances of OO.ui.Element will have their $element appended.
- * @cfg {jQuery} [$content] Content elements to append (after #text)
+ * @cfg {jQuery} [$content] Content elements to append (after #text).
+ * @cfg {jQuery} [$element] Wrapper element. Defaults to a new element with #getTagName.
* @cfg {Mixed} [data] Custom data of any type or combination of types (e.g., string, number, array, object).
* Data can also be specified with the #setData method.
*/
* @param {OO.ui.Element} element Element for which to get classes
* @return {Object.<string,string[]>} Categorized class names with `on` and `off` lists
*/
-OO.ui.Theme.prototype.getElementClasses = function ( /* element */ ) {
+OO.ui.Theme.prototype.getElementClasses = function () {
return { on: [], off: [] };
};
};
/**
- * Set the button to its 'active' state.
+ * Set the button's active state.
*
* The active state occurs when a {@link OO.ui.ButtonOptionWidget ButtonOptionWidget} or
* a {@link OO.ui.ToggleButtonWidget ToggleButtonWidget} is pressed. This method does nothing
* for other button types.
*
- * @param {boolean} [value] Make button active
+ * @param {boolean} value Make button active
* @chainable
*/
OO.ui.mixin.ButtonElement.prototype.setActive = function ( value ) {
- this.$element.toggleClass( 'oo-ui-buttonElement-active', !!value );
+ this.active = !!value;
+ this.$element.toggleClass( 'oo-ui-buttonElement-active', this.active );
return this;
};
+/**
+ * Check if the button is active
+ *
+ * @return {boolean} The button is active
+ */
+OO.ui.mixin.ButtonElement.prototype.isActive = function () {
+ return this.active;
+};
+
/**
* Any OOjs UI widget that contains other widgets (such as {@link OO.ui.ButtonWidget buttons} or
* {@link OO.ui.OptionWidget options}) mixes in GroupElement. Adding, removing, and clearing
* @param {jQuery.Event} event
*/
OO.ui.CapsuleMultiSelectWidget.prototype.onInputBlur = function () {
+ if ( this.allowArbitrary && this.$input.val().trim() !== '' ) {
+ this.addItemsFromData( [ this.$input.val() ] );
+ }
this.clearInput();
};
}
};
+/**
+ * Focus the widget.
+ *
+ * Focusses the select file button.
+ *
+ * @chainable
+ */
+OO.ui.SelectFileWidget.prototype.focus = function () {
+ this.selectButton.$button[ 0 ].focus();
+ return this;
+};
+
/**
* Update the user interface when a file is selected or unselected
*
opts = $.extend( {}, defaults, opts );
- var $spinner = $( '<div>', { 'class': 'mw-spinner', title: '...' } );
+ var $spinner = $( '<div>' ).addClass( 'mw-spinner' ).attr( 'title', '...' );
if ( opts.id !== undefined ) {
$spinner.attr( 'id', 'mw-spinner-' + opts.id );
}
function detectParserForColumn( table, rows, column ) {
var l = parsers.length,
+ config = $( table ).data( 'tablesorter' ).config,
cellIndex,
nodeValue,
// Start with 1 because 0 is the fallback parser
needed = ( rows.length > 4 ) ? 5 : rows.length;
while ( i < l ) {
- if ( rows[ rowIndex ] ) {
+ // if this is a child row, continue to the next row (as buildCache())
+ if ( rows[ rowIndex ] && !$( rows[ rowIndex ] ).hasClass( config.cssChildRow ) ) {
if ( rowIndex !== lastRowIndex ) {
lastRowIndex = rowIndex;
cellIndex = $( rows[ rowIndex ] ).data( 'columnToCell' )[ column ];
new RegExp( /(https?|ftp|file):\/\// )
],
isoDate: [
- new RegExp( /^([-+]?\d{1,4})-([01]\d)-([0-3]\d)([T\s]((([01]\d|2[0-3])(:?[0-5]\d)?|24:?00)?(:?([0-5]\d))?([.,]\d+)?)([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?/ ),
+ new RegExp( /^([-+]?\d{1,4})-([01]\d)-([0-3]\d)([T\s]((([01]\d|2[0-3])(:?[0-5]\d)?|24:?00)?(:?([0-5]\d|60))?([.,]\d+)?)([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?/ ),
new RegExp( /^([-+]?\d{1,4})-([01]\d)-([0-3]\d)/ )
],
usLongDate: [
return $.tablesorter.formatFloat( 0 );
}
} else {
- isodate = new Date( $.trim( s ) );
+ matches = s.match( ts.rgx.isoDate[ 0 ] );
+ if ( matches ) {
+ isodate = new Date( $.trim( matches[ 0 ] ) );
+ } else {
+ return $.tablesorter.formatFloat( 0 );
+ }
}
return $.tablesorter.formatFloat( ( isodate !== undefined ) ? isodate.getTime() : 0 );
},
$row = $( '<tr class="mw-metadata-show-hide-extended"></tr>' );
$col = $( '<td colspan="2"></td>' );
- $link = $( '<a>', {
- text: showText,
- href: '#'
- } ).click( function () {
+ $link = $( '<a>' )
+ .text( showText )
+ .attr( 'href', '#' )
+ .click( function () {
if ( $table.hasClass( 'collapsed' ) ) {
$( this ).text( hideText );
} else {
* @param {OO.ui.OptionWidget} item Chosen item
*/
mw.widgets.TitleSearchWidget.prototype.onTitleSearchResultsChoose = function ( item ) {
- // TOOD: Pressing enter can incorrectly trigger 'choose' with null.
- // Remove this check when oojs-ui 0.12.10 lands.
- if ( item ) {
- this.getQuery().setValue( item.getData() );
- }
+ this.getQuery().setValue( item.getData() );
};
/**
'\n|date=' +
this.getDate() +
'\n|source=' +
- this.getUser() +
+ this.getSource() +
'\n|author=' +
this.getUser() +
'\n}}\n\n' +
};
/**
- * Gets the wikitext for the license of the upload. Abstract for now.
+ * Gets the wikitext for the license of the upload.
*
* @private
* @return {string}
*/
ForeignStructuredUpload.prototype.getLicense = function () {
- return '';
+ // Make sure this matches the messages for different targets in
+ // mw.ForeignStructuredUpload.BookletLayout.prototype.renderUploadForm
+ return this.target === 'shared' ? '{{self|cc-by-sa-4.0}}' : '';
+ };
+
+ /**
+ * Get the source. This should be some sort of localised text for "Own work".
+ *
+ * @private
+ * @return {string}
+ */
+ ForeignStructuredUpload.prototype.getSource = function () {
+ return '{{own}}';
};
/**
// actual API call methods to wait for the apiPromise to resolve
// before continuing.
mw.Upload.call( this, null );
+
+ if ( this.target !== 'local' ) {
+ // Keep these untranslated. We don't know the content language of the foreign wiki, best to
+ // stick to English in the text.
+ this.setComment( 'Cross-wiki upload from ' + location.host );
+ }
}
OO.inheritClass( ForeignUpload, mw.Upload );
$fileName = $this->getNewTempFile();
// Converting the temporary /file/ to a /directory/
- //
// The following is not atomic, but at least we now have a single place,
// where temporary directory creation is bundled and can be improved
unlink( $fileName );
if ( $user->idForName() == 0 ) {
$user->addToDatabase();
- $user->setPassword( 'UTSysopPassword' );
-
- $user->addGroup( 'sysop' );
- $user->addGroup( 'bureaucrat' );
- $user->saveSettings();
+ TestUser::setPasswordForUser( $user, 'UTSysopPassword' );
}
+ // Always set groups, because $this->resetDB() wipes them out
+ $user->addGroup( 'sysop' );
+ $user->addGroup( 'bureaucrat' );
+
// Make 1 page with 1 revision
$page = WikiPage::factory( Title::newFromText( 'UTPage' ) );
if ( $page->getId() == 0 ) {
$user = User::newFromName( 'UTBlockee' );
if ( $user->getID() == 0 ) {
$user->addToDatabase();
- $user->setPassword( 'UTBlockeePassword' );
+ TestUser::setPasswordForUser( $user, 'UTBlockeePassword' );
$user->saveSettings();
}
public function testBlockedUserCanNotCreateAccount() {
$username = 'BlockedUserToCreateAccountWith';
$u = User::newFromName( $username );
- $u->setPassword( 'NotRandomPass' );
$u->setId( 14146 );
$u->addToDatabase();
+ TestUser::setPasswordForUser( $u, 'NotRandomPass' );
unset( $u );
// Sanity check
# Set up the target
$u = User::newFromName( $username );
if ( $u->getID() == 0 ) {
- $u->setPassword( 'TotallyObvious' );
$u->addToDatabase();
+ TestUser::setPasswordForUser( $u, 'TotallyObvious' );
}
unset( $u );
array( '', 'gopher://*.test.com/', 'gopher://gopher.test.com/0/v2/vstat' ),
array( 'telnet://', '*.test.com', 'telnet://shell.test.com/~home/' ),
- //
// The following only work in PHP >= 5.3.7, due to a bug in parse_url which eats
// the path from the url (https://bugs.php.net/bug.php?id=54180)
- //
// array( '', 'http://test.com', 'http://test.com/index?arg=1' ),
// array( 'http://', '*.test.com', 'http://www.test.com/index?arg=1' ),
// array( '' ,
// 'http://xx23124:__ffdfdef__@www.test.com:12345/dir' ,
// 'http://name:pass@www.test.com:12345/dir/dir/file.xyz.php#__se__?arg1=_&arg2[]=4rtg'
// ),
- //
- //
// Tests for false positives
- //
array( 'http://', 'test.com', 'http://www.test.com', false ),
array( 'http://', 'www1.test.com', 'http://www.test.com', false ),
array( 'http://', '*.test.com', 'http://www.test.t.com', false ),
array( '', 'http://test.com:8080/dir/', 'http://test.com:808/dir/', false ),
array( '', 'http://test.com/dir/index.html', 'http://test.com/dir/index.php', false ),
- //
// These are false positives too and ideally shouldn't match, but that
// would require using regexes and RLIKE instead of LIKE
- //
// array( null, 'http://*.test.com', 'http://www.test.com:80', false ),
// array( '', 'https://*.wikimedia.org/r/#/q/status:open,n,z',
// 'https://gerrit.wikimedia.org/XXX/r/#/q/status:open,n,z', false ),
}
// Update the user to use the password and other details
- $change = $this->setPassword( $this->password ) ||
- $this->setEmail( $email ) ||
+ $this->setPassword( $this->password );
+ $change = $this->setEmail( $email ) ||
$this->setRealName( $realname );
// Adjust groups by adding any missing ones and removing any extras
/**
* @param string $password
- * @return bool
*/
private function setPassword( $password ) {
- $passwordFactory = $this->user->getPasswordFactory();
- $oldDefaultType = $passwordFactory->getDefaultType();
-
- // A is unsalted MD5 (thus fast) ... we don't care about security here, this is test only
- $passwordFactory->setDefaultType( 'A' );
- $newPassword = $passwordFactory->newFromPlaintext( $password, $this->user->getPassword() );
+ self::setPasswordForUser( $this->user, $password );
+ }
- $change = false;
- if ( !$this->user->getPassword()->equals( $newPassword ) ) {
- // Password changed
- $this->user->setPassword( $password );
- $change = true;
+ /**
+ * Set the password on a testing user
+ *
+ * This assumes we're still using the generic AuthManager config from
+ * PHPUnitMaintClass::finalSetup(), and just sets the password in the
+ * database directly.
+ * @param User $user
+ * @param string $password
+ */
+ public static function setPasswordForUser( User $user, $password ) {
+ if ( !$user->getId() ) {
+ throw new MWException( "Passed User has not been added to the database yet!" );
}
- $passwordFactory->setDefaultType( $oldDefaultType );
-
- return $change;
+ $passwordFactory = new PasswordFactory();
+ $passwordFactory->init( RequestContext::getMain()->getConfig() );
+ // A is unsalted MD5 (thus fast) ... we don't care about security here, this is test only
+ $passwordFactory->setDefaultType( 'A' );
+ $pwhash = $passwordFactory->newFromPlaintext( $password );
+ wfGetDB( DB_MASTER )->update(
+ 'user',
+ array( 'user_password' => $pwhash->toString() ),
+ array( 'user_id' => $user->getId() ),
+ __METHOD__
+ );
}
/**
$this->assertEquals( 'test', $this->user->getOption( 'userjs-someoption' ) );
}
- /**
- * Test password expiration.
- * @covers User::getPasswordExpired()
- */
- public function testPasswordExpire() {
- $this->setMwGlobals( 'wgPasswordExpireGrace', 3600 * 24 * 7 ); // 7 days
-
- $user = User::newFromName( 'UnitTestUser' );
- $user->loadDefaults( 'UnitTestUser' );
- $this->assertEquals( false, $user->getPasswordExpired() );
-
- $ts = time() - ( 3600 * 24 * 1 ); // 1 day ago
- $user->expirePassword( $ts );
- $this->assertEquals( 'soft', $user->getPasswordExpired() );
-
- $ts = time() - ( 3600 * 24 * 10 ); // 10 days ago
- $user->expirePassword( $ts );
- $this->assertEquals( 'hard', $user->getPasswordExpired() );
- }
-
/**
* Test password validity checks. There are 3 checks in core,
* - ensure the password meets the minimal length
if ( $user->getId() == 0 ) {
$user->addToDatabase();
- $user->setPassword( 'UTApiBlockeePassword' );
+ TestUser::setPasswordForUser( $user, 'UTApiBlockeePassword' );
$user->saveSettings();
}
$this->markTestIncomplete( 'This test needs $wgServer to be set in LocalSettings.php' );
}
- $password = User::randomPassword();
+ $password = PasswordFactory::generateRandomPasswordString();
$ret = $this->doApiRequest( array(
'action' => 'createaccount',
"email" => "test@example.com",
"real_name" => "Test User" ) );
}
- $this->user->setPassword( $this->password );
+ TestUser::setPasswordForUser( $this->user, $this->password );
if ( $group !== '' ) {
$this->user->addGroup( $group );
$user = User::newFromName( 'UTMale' );
if ( $user->getID() == 0 ) {
$user->addToDatabase();
- $user->setPassword( 'UTMalePassword' );
+ TestUser::setPasswordForUser( $user, 'UTMalePassword' );
}
// ensure the right gender
$user->setOption( 'gender', 'male' );
$user = User::newFromName( 'UTFemale' );
if ( $user->getID() == 0 ) {
$user->addToDatabase();
- $user->setPassword( 'UTFemalePassword' );
+ TestUser::setPasswordForUser( $user, 'UTFemalePassword' );
}
// ensure the right gender
$user->setOption( 'gender', 'female' );
$user = User::newFromName( 'UTDefaultGender' );
if ( $user->getID() == 0 ) {
$user->addToDatabase();
- $user->setPassword( 'UTDefaultGenderPassword' );
+ TestUser::setPasswordForUser( $user, 'UTDefaultGenderPassword' );
}
// ensure the default gender
$user->setOption( 'gender', null );
* @covers InvalidPassword::equals
*/
public function testInvalidUnequalInvalid() {
- $invalid1 = User::getPasswordFactory()->newFromCiphertext( null );
- $invalid2 = User::getPasswordFactory()->newFromCiphertext( null );
+ $passwordFactory = new PasswordFactory();
+ $invalid1 = $passwordFactory->newFromCiphertext( null );
+ $invalid2 = $passwordFactory->newFromCiphertext( null );
$this->assertFalse( $invalid1->equals( $invalid2 ) );
}
public function testInvalidPlaintext() {
- $invalid = User::getPasswordFactory()->newFromPlaintext( null );
+ $passwordFactory = new PasswordFactory();
+ $invalid = $passwordFactory->newFromPlaintext( null );
$this->assertInstanceOf( 'InvalidPassword', $invalid );
}
// expectOutput[...] functions. However, the PHPUnit shipped prediactes
// do not allow to check /each/ line of the output using /readable/ REs.
// So we ...
- //
+
// 1. ... add a dummy output checking to make PHPUnit not complain
// about unchecked test output
$this->expectOutputRegex( '//' );
// instead of the MaintenanceFixup hack below. However, we cannot do
// without changing the visibility and without working around hacks in
// Maintenance.php
-//
// For the same reason, we cannot just use FakeMaintenance.
/**
// The dump (hopefully) did take long enough to produce more than one
// checkpoint file.
- //
// We now check all the checkpoint files for validity.
$files = scandir( $nameOutputDir );
parserTest( 'Y Dates', 'date', YDates );
ISODates = [
- [ '2000', false, 946684800000, 'Plain 4-digit year' ],
- [ '2000-01', false, 946684800000, 'Year with month' ],
+ [ '2000', false, 0, 'Plain 4-digit year' ],
+ [ '2000-01', false, 0, 'Year with month' ],
[ '2000-01-01', true, 946684800000, 'Year with month and day' ],
[ '2000-13-01', true, 0, 'Non existant month' ],
[ '2000-01-32', true, 0, 'Non existant day' ],
[ '2000-01-01T12:30:30Z', true, 946729830000, 'Date with a UTC+0 time' ],
[ '2000-01-01T24:30:30Z', true, 0, 'Date with invalid hours' ],
[ '2000-01-01T12:60:30Z', true, 0, 'Date with invalid minutes' ],
- [ '2000-01-01T12:30:61Z', true, 0, 'Date with invalid amount of seconds' ],
+ [ '2000-01-01T12:30:61Z', true, 946729800000, 'Date with invalid amount of seconds, drops seconds' ],
[ '2000-01-01T23:59:59Z', true, 946771199000, 'Edges of time' ],
[ '2000-01-01T12:30:30.111Z', true, 946729830111, 'Date with milliseconds' ],
[ '2000-01-01T12:30:30.11111Z', true, 946729830111, 'Date with too high precision' ],
[ '2000-01-01T12:30:30+01:30', true, 946724430000, 'Date time in UTC+1:30' ],
[ '2000-01-01T12:30:30-01:00', true, 946733430000, 'Date time in UTC-1' ],
[ '2000-01-01T12:30:30-01:30', true, 946735230000, 'Date time in UTC-1:30' ],
- [ '2000-01-01T12:30:30.111+01:00', true, 946726230111, 'Date time and milliseconds in UTC+1 ' ]
+ [ '2000-01-01T12:30:30.111+01:00', true, 946726230111, 'Date time and milliseconds in UTC+1 ' ],
+ [ '2000-01-01Postfix', true, 946684800000, 'Date with appended postfix' ],
+ [ '2000-01-01 Postfix', true, 946684800000, 'Date with separate postfix' ]
/* Disable testcases, because behavior is browser dependant */
/*
[ '2000-11-31', true, 0, '31 days in 30 day month' ],
0,
'empty cell is sorted as number 0'
);
+ } );
+ QUnit.test( 'bug T114721 - use of expand-child class', 2, function ( assert ) {
+ var $table, parsers;
+ $table = $(
+ '<table class="sortable">' +
+ '<tr><th>A</th><th>B</th></tr>' +
+ '<tr><td>b</td><td>4</td></tr>' +
+ '<tr class="expand-child"><td colspan="2">some text follow b</td></tr>' +
+ '<tr><td>a</td><td>2</td></tr>' +
+ '<tr class="expand-child"><td colspan="2">some text follow a</td></tr>' +
+ '<tr class="expand-child"><td colspan="2">more text</td></tr>' +
+ '</table>'
+ );
+ $table.tablesorter();
+ $table.find( '.headerSort:eq(0)' ).click();
+
+ assert.deepEqual(
+ tableExtract( $table ),
+ [
+ [ 'a', '2' ],
+ [ 'some text follow a' ],
+ [ 'more text' ],
+ [ 'b', '4' ],
+ [ 'some text follow b' ]
+ ],
+ 'row with expand-child class follow above row'
+ );
+
+ parsers = $table.data( 'tablesorter' ).config.parsers;
+ assert.equal(
+ parsers[ 1 ].id,
+ 'number',
+ 'detectParserForColumn() detect parser.id "number" for second column'
+ );
} );
+
}( jQuery, mediaWiki ) );
dépôts / lhc / web / wiklou.git / commitdiff