* Simon Walker
* Solitarius
* Søren Løvborg
+* Southparkfan
* Srikanth Lakshmanan
* Stefano Codari
* Str4nd
* $wgResourceLoaderExperimentalAsyncLoading was deprecated and removed.
This experimental feature was never enabled by default and is obsolete as of
MediaWiki 1.26, in where ResourceLoader became fully asynchronous.
+* $wgMasterWaitTimeout was removed (deprecated in 1.24).
+* Fields in ParserOptions are now private. Use the accessors instead.
=== New features in 1.26 ===
* (T51506) Now action=info gives estimates of actual watchers for a page.
'IORMRow' => __DIR__ . '/includes/db/IORMRow.php',
'IORMTable' => __DIR__ . '/includes/db/IORMTable.php',
'IP' => __DIR__ . '/includes/utils/IP.php',
- 'IPSet' => __DIR__ . '/includes/libs/IPSet.php',
+ 'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
'IPTC' => __DIR__ . '/includes/media/IPTC.php',
'IRCColourfulRCFeedFormatter' => __DIR__ . '/includes/rcfeed/IRCColourfulRCFeedFormatter.php',
'IcuCollation' => __DIR__ . '/includes/Collation.php',
"leafo/lessphp": "0.5.0",
"liuggio/statsd-php-client": "1.0.16",
"mediawiki/at-ease": "1.0.0",
- "oojs/oojs-ui": "0.12.5",
+ "oojs/oojs-ui": "0.12.6",
"php": ">=5.3.3",
"psr/log": "1.0.0",
- "wikimedia/cdb": "1.0.1",
"wikimedia/assert": "0.2.2",
+ "wikimedia/cdb": "1.0.1",
"wikimedia/composer-merge-plugin": "1.2.1",
+ "wikimedia/ip-set": "1.0.1",
"wikimedia/utfnormal": "1.0.2",
"wikimedia/wrappedstring": "2.0.0",
"zordius/lightncandy": "0.21"
*/
$wgLBFactoryConf = array( 'class' => 'LBFactorySimple' );
-/**
- * How long to wait for a slave to catch up to the master
- * @deprecated since 1.24
- */
-$wgMasterWaitTimeout = 10;
-
/**
* File to log database errors to
*/
* Additional namespaces. If the namespaces defined in Language.php and
* Namespace.php are insufficient, you can create new ones here, for example,
* to import Help files in other languages. You can also override the namespace
- * names of existing namespaces. Extensions developers should use
- * $wgCanonicalNamespaceNames.
+ * names of existing namespaces. Extensions should use the CanonicalNamespaces
+ * hook or extension.json.
*
* @warning Once you delete a namespace, the pages in that namespace will
* no longer be accessible. If you rename it, then you can access them through
* $wgVirtualRestConfig['modules']['parsoid'] = array(
* 'url' => 'http://localhost:8000',
* 'prefix' => 'enwiki',
+ * 'domain' => 'en.wikipedia.org',
* );
*
* @var array
'global' => array(
# Timeout in seconds
'timeout' => 360,
+ # 'domain' is set to $wgCanonicalServer in Setup.php
'forwardCookies' => false,
'HTTPProxy' => null
)
if ( $permErrors ) {
wfDebug( __METHOD__ . ": User can't edit\n" );
// Auto-block user's IP if the account was "hard" blocked
- $wgUser->spreadAnyEditBlock();
+ $user = $wgUser;
+ DeferredUpdates::addCallableUpdate( function() use ( $user ) {
+ $user->spreadAnyEditBlock();
+ } );
$this->displayPermissionsError( $permErrors );
* @param bool $sessionId
*/
function wfSetupSession( $sessionId = false ) {
- global $wgSessionsInMemcached, $wgSessionsInObjectCache, $wgSessionHandler;
+ global $wgSessionsInObjectCache, $wgSessionHandler;
global $wgCookiePath, $wgCookieDomain, $wgCookieSecure, $wgCookieHttpOnly;
- if ( $wgSessionsInObjectCache || $wgSessionsInMemcached ) {
+ if ( $wgSessionsInObjectCache ) {
ObjectCacheSessionHandler::install();
} elseif ( $wgSessionHandler && $wgSessionHandler != ini_get( 'session.save_handler' ) ) {
# Only set this if $wgSessionHandler isn't null and session.save_handler
session_start();
MediaWiki\restoreWarnings();
- if ( $wgSessionsInObjectCache || $wgSessionsInMemcached ) {
+ if ( $wgSessionsInObjectCache ) {
ObjectCacheSessionHandler::renewCurrentSession();
}
}
}
/**
- * Get a cache object.
+ * Get a specific cache object.
*
- * @param int $inputType Cache type, one of the CACHE_* constants.
+ * @param int|string $cacheType A CACHE_* constants, or other key in $wgObjectCaches
* @return BagOStuff
*/
-function wfGetCache( $inputType ) {
- return ObjectCache::getInstance( $inputType );
+function wfGetCache( $cacheType ) {
+ return ObjectCache::getInstance( $cacheType );
}
/**
if ( $namespaces === null || $rebuild ) {
global $wgExtraNamespaces, $wgCanonicalNamespaceNames;
$namespaces = array( NS_MAIN => '' ) + $wgCanonicalNamespaceNames;
+ // Add extension namespaces
+ $namespaces += ExtensionRegistry::getInstance()->getAttribute( 'ExtensionNamespaces' );
if ( is_array( $wgExtraNamespaces ) ) {
$namespaces += $wgExtraNamespaces;
}
public function doPreOutputCommit() {
// Either all DBs should commit or none
ignore_user_abort( true );
- wfGetLBFactory()->commitMasterChanges();
+
+ // Commit all changes and record ChronologyProtector positions
+ $factory = wfGetLBFactory();
+ $factory->commitMasterChanges();
+ $factory->shutdown();
+
+ wfDebug( __METHOD__ . ' completed; all transactions committed' );
}
/**
* This function does work that can be done *after* the
* user gets the HTTP response so they don't block on it
*
+ * This manages deferred updates, job insertion,
+ * final commit, and the logging of profiling data
+ *
* @param string $mode Use 'fast' to always skip job running
* @since 1.26
*/
public function doPostOutputShutdown( $mode = 'normal' ) {
- // Show profiling data if enabled
+ // Show visible profiling data if enabled (which cannot be post-send)
Profiler::instance()->logDataPageOutputOnly();
$that = $this;
$callback = function () use ( $that, $mode ) {
try {
- // Assure deferred updates are not in the main transaction
- wfGetLBFactory()->commitMasterChanges();
- // Run jobs occasionally, if enabled
- if ( $mode === 'normal' ) {
- $that->triggerJobs();
- }
- // Do deferred updates and job insertion and final commit
- $that->restInPeace();
+ $that->restInPeace( $mode );
} catch ( Exception $e ) {
MWExceptionHandler::handleException( $e );
}
};
+ // Defer everything else...
if ( function_exists( 'register_postsend_function' ) ) {
// https://github.com/facebook/hhvm/issues/1230
register_postsend_function( $callback );
/**
* Ends this task peacefully
+ * @param string $mode Use 'fast' to always skip job running
*/
- public function restInPeace() {
+ public function restInPeace( $mode = 'fast' ) {
+ // Assure deferred updates are not in the main transaction
+ wfGetLBFactory()->commitMasterChanges();
+
// Ignore things like master queries/connections on GET requests
// as long as they are in deferred updates (which catch errors).
Profiler::instance()->getTransactionProfiler()->resetExpectations();
// Make sure any lazy jobs are pushed
JobQueueGroup::pushLazyJobs();
+ // Now that everything specific to this request is done,
+ // try to occasionally run jobs (if enabled) from the queues
+ if ( $mode === 'normal' ) {
+ $this->triggerJobs();
+ }
+
// Log profiling data, e.g. in the database or UDP
wfLogProfilingData();
$wgPasswordPolicy['policies']['default']['MaximalPasswordLength'] = $wgMaximalPasswordLength;
}
+// Backwards compatibility with deprecated alias
+// Must be before call to wfSetupSession()
+if ( $wgSessionsInMemcached ) {
+ $wgSessionsInObjectCache = true;
+}
+
Profiler::instance()->scopedProfileOut( $ps_default );
// Disable MWDebug for command line mode, this prevents MWDebug from eating up
. 'HTTP or HTTPS. Disabling secure login.' );
}
+$wgVirtualRestConfig['global']['domain'] = $wgCanonicalServer;
+
// Now that GlobalFunctions is loaded, set defaults that depend on it.
if ( $wgTmpDirectory === false ) {
$wgTmpDirectory = wfTempDir();
// See if the compiled PHP code is stored in cache.
// CACHE_ACCEL throws an exception if no suitable object cache is present, so fall
// back to CACHE_ANYTHING.
- $cache = ObjectCache::newAccelerator( array(), CACHE_ANYTHING );
+ $cache = ObjectCache::newAccelerator( CACHE_ANYTHING );
$key = wfMemcKey( 'template', $templateName, $fastHash );
$code = $this->forceRecompile ? null : $cache->get( $key );
$out = new OutputPage( $context );
$context->setOutput( $out );
- $out->addModules( 'mediawiki.apipretty' );
+ $out->addModuleStyles( 'mediawiki.apipretty' );
$out->setPageTitle( $context->msg( 'api-format-title' ) );
// When the format without suffix 'fm' is defined, there is a non-html version
$this->dieUsageMsg( array( 'missingparam', 'optionname' ) );
}
+ // Load the user from the master to reduce CAS errors on double post (T95839)
+ if ( wfGetLB()->getServerCount() > 1 ) {
+ $user = User::newFromId( $user->getId() );
+ if ( !$user->loadFromId( User::READ_LATEST ) ) {
+ $this->dieUsage( 'Anonymous users cannot change preferences', 'notloggedin' );
+ }
+ }
+
if ( $params['reset'] ) {
$user->resetOptions( $params['resetkinds'], $this->getContext() );
$changed = true;
$popts = $this->makeParserOptions( $pageObj, $params );
- // Potentially cached
- $p_result = $this->getParsedContent( $pageObj, $popts, $pageid,
- isset( $prop['wikitext'] ) );
+ // Don't pollute the parser cache when setting options that aren't
+ // in ParserOptions::optionsHash()
+ /// @todo: This should be handled closer to the actual cache instead of here, see T110269
+ $suppressCache =
+ $params['disablepp'] ||
+ $params['disablelimitreport'] ||
+ $params['preview'] ||
+ $params['sectionpreview'] ||
+ $params['disabletidy'];
+
+ if ( $suppressCache ) {
+ $this->content = $this->getContent( $pageObj, $pageid );
+ $p_result = $this->content->getParserOutput( $titleObj, null, $popts );
+ } else {
+ // Potentially cached
+ $p_result = $this->getParsedContent( $pageObj, $popts, $pageid,
+ isset( $prop['wikitext'] ) );
+ }
}
} else { // Not $oldid, $pageid, $page. Hence based on $text
$titleObj = Title::newFromText( $title );
protected function makeParserOptions( WikiPage $pageObj, array $params ) {
$popts = $pageObj->makeParserOptions( $this->getContext() );
- $popts->enableLimitReport( !$params['disablepp'] );
+ $popts->enableLimitReport( !$params['disablepp'] && !$params['disablelimitreport'] );
$popts->setIsPreview( $params['preview'] || $params['sectionpreview'] );
$popts->setIsSectionPreview( $params['sectionpreview'] );
$popts->setEditSection( !$params['disableeditsection'] );
+ if ( $params['disabletidy'] ) {
+ $popts->setTidy( false );
+ }
return $popts;
}
* @return ParserOutput
*/
private function getParsedContent( WikiPage $page, $popts, $pageId = null, $getWikitext = false ) {
- $this->content = $page->getContent( Revision::RAW ); //XXX: really raw?
+ $this->content = $this->getContent( $page, $pageId );
if ( $this->section !== false && $this->content !== null ) {
- $this->content = $this->getSectionContent(
- $this->content,
- !is_null( $pageId ) ? 'page id ' . $pageId : $page->getTitle()->getPrefixedText()
- );
-
// Not cached (save or load)
return $this->content->getParserOutput( $page->getTitle(), null, $popts );
}
}
/**
+ * Get the content for the given page and the requested section.
+ *
+ * @param WikiPage $page
+ * @param int $pageId
+ * @return Content
+ */
+ private function getContent( WikiPage $page, $pageId = null ) {
+ $content = $page->getContent( Revision::RAW ); //XXX: really raw?
+
+ if ( $this->section !== false && $content !== null ) {
+ $content = $this->getSectionContent(
+ $content,
+ !is_null( $pageId ) ? 'page id ' . $pageId : $page->getTitle()->getPrefixedText()
+ );
+ }
+ return $content;
+ }
+
+ /**
+ * Extract the requested section from the given Content
+ *
* @param Content $content
* @param string $what Identifies the content in error messages, e.g. page title.
* @return Content|bool
'sectiontitle' => array(
ApiBase::PARAM_TYPE => 'string',
),
- 'disablepp' => false,
+ 'disablepp' => array(
+ ApiBase::PARAM_DFLT => false,
+ ApiBase::PARAM_DEPRECATED => true,
+ ),
+ 'disablelimitreport' => false,
'disableeditsection' => false,
+ 'disabletidy' => false,
'generatexml' => array(
ApiBase::PARAM_DFLT => false,
ApiBase::PARAM_HELP_MSG => array(
// 1999 rules works fine, but that breaks other DBs. Sigh.
/// @todo Once we drop support for 1992-rule DBs, we can simplify this.
$dbType = $db->getType();
- if ( $dbType === 'mysql' || $dbType === 'sqlite' ||
- $dbType === 'postgres' && $db->getServerVersion() >= 9.1
- ) {
- // 1999 rules, or screw-the-rules
+ if ( $dbType === 'mysql' || $dbType === 'sqlite' ) {
+ // Ignore the rules, or 1999 rules if you count unique keys
+ // over non-NULL columns as satisfying the requirement for
+ // "functional dependency" and don't require including
+ // constant-in-WHERE columns in the GROUP BY.
+ $this->addOption( 'GROUP BY', array( 'page_title' ) );
+ } elseif ( $dbType === 'postgres' && $db->getServerVersion() >= 9.1 ) {
+ // 1999 rules only counting primary keys
$this->addOption( 'GROUP BY', array( 'page_title', 'page_id' ) );
} else {
// 1992 rules
"apihelp-parse-paramvalue-prop-iwlinks": "Gives interwiki links in the parsed wikitext.",
"apihelp-parse-paramvalue-prop-wikitext": "Gives the original wikitext that was parsed.",
"apihelp-parse-paramvalue-prop-properties": "Gives various properties defined in the parsed wikitext.",
- "apihelp-parse-paramvalue-prop-limitreportdata": "Gives the limit report in a structured way. Gives no data, when <var>$1disablepp</var> is set.",
- "apihelp-parse-paramvalue-prop-limitreporthtml": "Gives the HTML version of the limit report. Gives no data, when <var>$1disablepp</var> is set.",
+ "apihelp-parse-paramvalue-prop-limitreportdata": "Gives the limit report in a structured way. Gives no data, when <var>$1disablelimitreport</var> is set.",
+ "apihelp-parse-paramvalue-prop-limitreporthtml": "Gives the HTML version of the limit report. Gives no data, when <var>$1disablelimitreport</var> is set.",
"apihelp-parse-paramvalue-prop-parsetree": "The XML parse tree of revision content (requires content model <code>$1</code>)",
"apihelp-parse-param-pst": "Do a pre-save transform on the input before parsing it. Only valid when used with text.",
"apihelp-parse-param-onlypst": "Do a pre-save transform (PST) on the input, but don't parse it. Returns the same wikitext, after a PST has been applied. Only valid when used with <var>$1text</var>.",
"apihelp-parse-param-effectivelanglinks": "Includes language links supplied by extensions (for use with <kbd>$1prop=langlinks</kbd>).",
"apihelp-parse-param-section": "Only retrieve the content of this section number or when <kbd>new</kbd> generate a new section.\n\n<kbd>new</kbd> section is only honored when specifying <var>text</var>.",
"apihelp-parse-param-sectiontitle": "New section title when <var>section</var> is <kbd>new</kbd>.\n\nUnlike page editing, this does not fall back to <var>summary</var> when omitted or empty.",
- "apihelp-parse-param-disablepp": "Omit the preprocessor report (\"NewPP limit report\") from the parser output.",
+ "apihelp-parse-param-disablelimitreport": "Omit the limit report (\"NewPP limit report\") from the parser output.",
+ "apihelp-parse-param-disablepp": "Use <var>$1disablelimitreport</var> instead.",
"apihelp-parse-param-disableeditsection": "Omit edit section links from the parser output.",
+ "apihelp-parse-param-disabletidy": "Do not run HTML cleanup (e.g. tidy) on the parser output.",
"apihelp-parse-param-generatexml": "Generate XML parse tree (requires content model <code>$1</code>; replaced by <kbd>$2prop=parsetree</kbd>).",
"apihelp-parse-param-preview": "Parse in preview mode.",
"apihelp-parse-param-sectionpreview": "Parse in section preview mode (enables preview mode too).",
"apihelp-parse-paramvalue-prop-iwlinks": "Da los enlaces interwiki del texto analizado.",
"apihelp-parse-paramvalue-prop-wikitext": "Da el wikitexto original que se había analizado.",
"apihelp-parse-paramvalue-prop-properties": "Da varias propiedades definidas en el wikitexto analizado.",
- "apihelp-parse-paramvalue-prop-limitreportdata": "Da el informe del límite de forma estructurada. No da datos si <var>$1disablepp</var> está establecido.",
- "apihelp-parse-paramvalue-prop-limitreporthtml": "Da la versión HTML del informe del límite. No da datos si <var>$1disablepp</var> está establecido.",
+ "apihelp-parse-paramvalue-prop-limitreportdata": "Da el informe del límite de forma estructurada. No da datos si <var>$1disablelimitreport</var> está establecido.",
+ "apihelp-parse-paramvalue-prop-limitreporthtml": "Da la versión HTML del informe del límite. No da datos si <var>$1disablelimitreport</var> está establecido.",
"apihelp-parse-param-effectivelanglinks": "Incluye enlaces de idiomas proporcionados por las extensiones (para utilizar con <kbd>$1prop=langlinks</kbd>).",
+ "apihelp-parse-param-disablepp": "Usa <var>$1disablelimitreport</var> en su lugar.",
"apihelp-parse-param-preview": "Analizar en modo de vista previa.",
"apihelp-parse-param-sectionpreview": "Analizar sección en modo de vista previa (activa el modo de vista previa).",
"apihelp-parse-param-disabletoc": "Omitir la tabla de contenidos en la salida.",
"apihelp-query+allfileusages-param-to": "El título del archivo para detener la enumeración.",
"apihelp-query+allfileusages-param-prefix": "Buscar todos los títulos de los archivos que comiencen con este valor.",
"apihelp-query+allfileusages-param-prop": "Qué piezas de información incluir:",
+ "apihelp-query+allfileusages-paramvalue-prop-title": "Agrega el título del archivo.",
"apihelp-query+allfileusages-param-limit": "Cuántos elementos en total se devolverán.",
"apihelp-query+allfileusages-param-dir": "La dirección en la que se listará.",
"apihelp-query+allfileusages-example-B": "Listar títulos de archivos, incluyendo los desaparecidos, con las ID de páginas a las que pertenecen, empezando por la <kbd>B</kbd>.",
"apihelp-query+alllinks-param-from": "El título del enlace para comenzar la enumeración.",
"apihelp-query+alllinks-param-to": "El título del enlace para detener la enumeración.",
"apihelp-query+alllinks-param-prefix": "Buscar todos los títulos vinculados que comiencen con este valor.",
+ "apihelp-query+alllinks-param-prop": "Qué piezas de información incluir:",
"apihelp-query+alllinks-paramvalue-prop-title": "Añade el título del enlace.",
"apihelp-query+alllinks-param-namespace": "El espacio de nombres que enumerar.",
"apihelp-query+alllinks-param-limit": "Cuántos elementos en total se devolverán.",
"apihelp-query+allpages-example-generator": "Mostrar información acerca de 4 páginas que empiecen por la letra <kbd>T</kbd>.",
"apihelp-query+allpages-example-generator-revisions": "Mostrar el contenido de las 2 primeras páginas que no redirijan y empiecen por <kbd>Re</kbd>.",
"apihelp-query+allredirects-param-prefix": "Buscar todas las páginas de destino que empiecen con este valor.",
+ "apihelp-query+allredirects-param-prop": "Qué piezas de información incluir:",
+ "apihelp-query+allredirects-paramvalue-prop-title": "Añade el título de la redirección.",
"apihelp-query+allredirects-param-limit": "Cuántos elementos se devolverán.",
"apihelp-query+alltransclusions-param-prefix": "Buscar todos los títulos transcluídos que comiencen con este valor.",
+ "apihelp-query+alltransclusions-param-prop": "Qué piezas de información incluir:",
"apihelp-query+alltransclusions-example-unique": "Listar títulos transcluidos de forma única.",
"apihelp-query+alltransclusions-example-unique-generator": "Obtiene todos los títulos transcluídos, marcando los que faltan.",
"apihelp-query+allusers-description": "Enumerar todos los usuarios registrados.",
"apihelp-query+allusers-param-prefix": "Buscar todos los usuarios que empiecen con este valor.",
"apihelp-query+allusers-param-group": "Incluir solo usuarios en los grupos dados.",
+ "apihelp-query+allusers-param-prop": "Qué piezas de información incluir:",
"apihelp-query+allusers-paramvalue-prop-blockinfo": "Añade información sobre un bloque actual al usuario.",
"apihelp-query+allusers-paramvalue-prop-groups": "Lista los grupos a los que el usuario pertenece. Esto utiliza más recursos del servidor y puede devolver menos resultados que el límite.",
+ "apihelp-query+allusers-paramvalue-prop-rights": "Lista los permisos que tiene el usuario.",
"apihelp-query+allusers-param-limit": "Cuántos nombres de usuario se devolverán.",
"apihelp-query+allusers-param-activeusers": "Solo listar usuarios activos en {{PLURAL:$1|el último día|los $1 últimos días}}.",
"apihelp-query+allusers-example-Y": "Listar usuarios que empiecen por <kbd>Y</kbd>.",
"apihelp-query+backlinks-example-simple": "Mostrar enlaces a la <kbd>Portada<kbd>.",
"apihelp-query+blocks-description": "Listar todos los usuarios y direcciones IP bloqueadas.",
"apihelp-query+blocks-param-users": "Lista de usuarios a buscar (opcional).",
+ "apihelp-query+blocks-param-prop": "Qué propiedades se obtendrán:",
"apihelp-query+blocks-paramvalue-prop-userid": "Añade el identificador del usuario bloqueado.",
"apihelp-query+blocks-paramvalue-prop-timestamp": "Añade la fecha y hora de cuando se aplicó el bloque.",
"apihelp-query+blocks-example-simple": "Listar bloques.",
+ "apihelp-query+categories-param-prop": "Qué propiedades adicionales obtener para cada categoría:",
"apihelp-query+categories-param-show": "Qué tipo de categorías mostrar.",
"apihelp-query+categories-param-limit": "Cuántas categorías se devolverán.",
"apihelp-query+categories-example-generator": "Obtener información acerca de todas las categorías utilizadas en la página <kbd>Albert Einstein</kbd>.",
"apihelp-query+categoryinfo-description": "Devuelve información acerca de las categorías dadas.",
"apihelp-query+categoryinfo-example-simple": "Obtener información acerca de <kbd>Category:Foo</kbd> y <kbd>Category:Bar</kbd>",
+ "apihelp-query+categorymembers-param-prop": "Qué piezas de información incluir:",
+ "apihelp-query+categorymembers-paramvalue-prop-title": "Agrega el título y el identificador del espacio de nombres de la página.",
"apihelp-query+categorymembers-param-startsortkey": "Utilizar $1starthexsortkey en su lugar.",
"apihelp-query+categorymembers-param-endsortkey": "Utilizar $1endhexsortkey en su lugar.",
"apihelp-query+categorymembers-example-simple": "Obtener las primeras 10 páginas de la <kbd>Categoría:Física</kbd>",
"apihelp-query+extlinks-param-limit": "Cuántos enlaces se devolverán.",
"apihelp-query+exturlusage-param-prop": "Qué piezas de información incluir:",
"apihelp-query+exturlusage-paramvalue-prop-ids": "Añade el identificado de la página.",
+ "apihelp-query+exturlusage-paramvalue-prop-title": "Agrega el título y el identificador del espacio de nombres de la página.",
"apihelp-query+exturlusage-param-protocol": "Protocolo del URL. Si está vacío y se establece <var>$1query</var>, el protocolo es <kbd>http</kbd>. Deja vacío esto y <var>$1query</var> para listar todos los enlaces externos.",
"apihelp-query+exturlusage-param-limit": "Cuántas páginas se devolverán.",
"apihelp-query+exturlusage-example-simple": "Mostrar páginas que enlacen con <kbd>http://www.mediawiki.org</kbd>.",
"apihelp-query+filearchive-param-from": "El título de imagen para comenzar la enumeración",
"apihelp-query+filearchive-param-to": "El título de imagen para detener la enumeración.",
"apihelp-query+filearchive-param-prefix": "Buscar todos los títulos de las imágenes que comiencen con este valor.",
+ "apihelp-query+filearchive-param-prop": "Qué información de imagen se obtendrá:",
+ "apihelp-query+filearchive-paramvalue-prop-size": "Agrega el tamaño de la imagen en bytes y la altura, la anchura y el número de páginas (si es aplicable).",
+ "apihelp-query+filearchive-paramvalue-prop-dimensions": "Alias del tamaño.",
+ "apihelp-query+filearchive-paramvalue-prop-description": "Añade la descripción de la versión de la imagen.",
"apihelp-query+filearchive-paramvalue-prop-parseddescription": "Analizar la descripción de la versión.",
+ "apihelp-query+filearchive-paramvalue-prop-mime": "Añade el MIME de la imagen.",
+ "apihelp-query+filearchive-paramvalue-prop-mediatype": "Añade el tipo multimedia de la imagen.",
"apihelp-query+filearchive-paramvalue-prop-archivename": "Añade el nombre de archivo de la versión archivada para las versiones que no son las últimas.",
"apihelp-query+filearchive-example-simple": "Mostrar una lista de todos los archivos eliminados.",
"apihelp-query+filerepoinfo-example-simple": "Obtener información acerca de los repositorios de archivos.",
+ "apihelp-query+fileusage-param-prop": "Qué propiedades se obtendrán:",
+ "apihelp-query+fileusage-paramvalue-prop-pageid": "Identificador de cada página.",
+ "apihelp-query+fileusage-paramvalue-prop-title": "Título de cada página.",
"apihelp-query+fileusage-param-limit": "Cuántos se devolverán.",
"apihelp-query+fileusage-example-simple": "Obtener una lista de páginas que utilicen [[:File:Example.jpg]].",
"apihelp-query+fileusage-example-generator": "Obtener información acerca de las páginas que utilicen [[:File:Example.jpg]].",
"apihelp-query+info-example-simple": "Obtener información acerca de la página <kbd>Main Page</kbd>.",
"apihelp-query+info-example-protection": "Obtén información general y protección acerca de la página <kb>Página principal</kbd>.",
"apihelp-query+iwbacklinks-param-limit": "Cuántas páginas se devolverán.",
+ "apihelp-query+iwbacklinks-param-prop": "Qué propiedades se obtendrán:",
"apihelp-query+iwbacklinks-example-simple": "Obtener las páginas enlazadas a [[wikibooks:Test]]",
+ "apihelp-query+iwlinks-param-prop": "Qué propiedades adicionales obtener para cada enlace interlingüe:",
"apihelp-query+iwlinks-paramvalue-prop-url": "Añade el URL completo.",
"apihelp-query+langbacklinks-param-lang": "Idioma del enlace de idioma.",
"apihelp-query+langbacklinks-param-limit": "Cuántas páginas en total se devolverán.",
"apihelp-query+langbacklinks-param-prop": "Qué propiedades se obtendrán:",
+ "apihelp-query+langbacklinks-paramvalue-prop-lllang": "Agrega el código de idioma del enlace de idioma.",
+ "apihelp-query+langbacklinks-paramvalue-prop-lltitle": "Añade el título del enlace de idioma.",
"apihelp-query+langbacklinks-example-simple": "Obtener las páginas enlazadas a [[:fr:Test]]",
"apihelp-query+langbacklinks-example-generator": "Obtener información acerca de las páginas enlazadas a [[:fr:Test]].",
"apihelp-query+langlinks-param-prop": "Qué propiedades adicionales obtener para cada enlace interlingüe:",
+ "apihelp-query+langlinks-paramvalue-prop-url": "Añade el URL completo.",
+ "apihelp-query+langlinks-paramvalue-prop-autonym": "Añade el nombre del idioma nativo.",
"apihelp-query+langlinks-param-lang": "Devolver solo enlaces de idioma con este código de idioma.",
"apihelp-query+links-param-limit": "Cuántos enlaces se devolverán.",
+ "apihelp-query+linkshere-param-prop": "Qué propiedades se obtendrán:",
"apihelp-query+linkshere-paramvalue-prop-pageid": "Identificador de cada página.",
"apihelp-query+linkshere-paramvalue-prop-title": "Título de cada página.",
"apihelp-query+linkshere-paramvalue-prop-redirect": "Indicar si la página es una redirección.",
"apihelp-query+linkshere-param-limit": "Cuántos se devolverán.",
"apihelp-query+linkshere-example-simple": "Obtener una lista de páginas que enlacen a la [[Main Page]].",
"apihelp-query+linkshere-example-generator": "Obtener información acerca de las páginas enlazadas a la [[Main Page|Portada]].",
+ "apihelp-query+logevents-param-prop": "Qué propiedades se obtendrán:",
+ "apihelp-query+logevents-paramvalue-prop-ids": "Agrega el identificador del evento de registro.",
"apihelp-query+logevents-paramvalue-prop-type": "Añade el tipo del evento de registro.",
"apihelp-query+logevents-paramvalue-prop-parsedcomment": "Añade el comentario analizado del evento de registro.",
+ "apihelp-query+pageswithprop-param-prop": "Qué piezas de información incluir:",
"apihelp-query+pageswithprop-paramvalue-prop-ids": "Añade el identificador de página.",
+ "apihelp-query+pageswithprop-paramvalue-prop-title": "Agrega el título y el identificador del espacio de nombres de la página.",
"apihelp-query+pageswithprop-param-limit": "El máximo número de páginas que se devolverán.",
"apihelp-query+pageswithprop-example-simple": "Listar las 10 primeras páginas que utilicen <code>{{DISPLAYTITLE:}}</code>.",
"apihelp-query+pageswithprop-example-generator": "Obtener información adicional acerca de las 10 primeras páginas que utilicen <code>__NOTOC__</code>.",
"apihelp-query+protectedtitles-param-namespace": "Listar solo los títulos en estos espacios de nombres.",
"apihelp-query+protectedtitles-param-level": "Listar solo títulos con estos niveles de protección.",
"apihelp-query+protectedtitles-param-limit": "Cuántas páginas se devolverán.",
+ "apihelp-query+protectedtitles-param-prop": "Qué propiedades se obtendrán:",
+ "apihelp-query+protectedtitles-paramvalue-prop-user": "Agrega el usuario que agregó la protección.",
+ "apihelp-query+protectedtitles-paramvalue-prop-userid": "Agrega el identificador de usuario que agregó la protección.",
"apihelp-query+protectedtitles-paramvalue-prop-expiry": "Añade la fecha y hora de cuando se levantará la protección.",
+ "apihelp-query+protectedtitles-paramvalue-prop-level": "Agrega el nivel de protección.",
"apihelp-query+protectedtitles-example-simple": "Listar títulos protegidos.",
"apihelp-query+protectedtitles-example-generator": "Encuentra enlaces a títulos protegidos en el espacio de nombres principal.",
"apihelp-query+querypage-param-page": "El nombre de la página especial. Recuerda, es sensible a mayúsculas y minúsculas.",
"apihelp-query+recentchanges-param-user": "Listar solo los cambios de este usuario.",
"apihelp-query+recentchanges-param-excludeuser": "No listar cambios de este usuario.",
"apihelp-query+recentchanges-param-tag": "Listar solo los cambios con esta etiqueta.",
+ "apihelp-query+recentchanges-param-prop": "Incluir piezas adicionales de información:",
+ "apihelp-query+recentchanges-paramvalue-prop-parsedcomment": "Añade el comentario analizado para la edición.",
"apihelp-query+recentchanges-paramvalue-prop-flags": "Añade marcas para la edición.",
"apihelp-query+recentchanges-paramvalue-prop-patrolled": "Etiqueta ediciones patrullables como patrulladas o no patrulladas.",
"apihelp-query+recentchanges-param-token": "Usa <kbd>[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]</kbd> en su lugar.",
"apihelp-query+recentchanges-param-type": "Cuántos tipos de cambios se mostrarán.",
"apihelp-query+recentchanges-example-simple": "Lista de cambios recientes.",
"apihelp-query+redirects-param-prop": "Qué propiedades se obtendrán:",
+ "apihelp-query+redirects-paramvalue-prop-pageid": "Identificador de página de cada redirección.",
"apihelp-query+redirects-paramvalue-prop-title": "Título de cada redirección.",
"apihelp-query+redirects-paramvalue-prop-fragment": "Fragmento de cada redirección, si los hubiere.",
"apihelp-query+redirects-param-limit": "Cuántas redirecciones se devolverán.",
"apihelp-query+search-param-info": "Qué metadatos devolver.",
"apihelp-query+search-param-prop": "Qué propiedades se devolverán:",
"apihelp-query+search-paramvalue-prop-redirecttitle": "Añade el título de la redirección coincidente.",
+ "apihelp-query+search-paramvalue-prop-score": "<span class=\"apihelp-deprecated\">Desaconsejado e ignorado.</span>",
+ "apihelp-query+search-paramvalue-prop-hasrelated": "<span class=\"apihelp-deprecated\">Desaconsejado e ignorado.</span>",
"apihelp-query+search-param-limit": "Cuántas páginas en total se devolverán.",
"apihelp-query+search-param-interwiki": "Incluir resultados interwiki en la búsqueda, si es posible.",
"apihelp-query+search-example-simple": "Buscar <kbd>significado</kbd>.",
"apihelp-query+search-example-text": "Buscar <kbd>meaning</kbd> en los textos.",
"apihelp-query+search-example-generator": "Obtener información acerca de las páginas devueltas por una búsqueda de <kbd>meaning</kbd>.",
"apihelp-query+siteinfo-description": "Devolver información general acerca de la página web.",
+ "apihelp-query+siteinfo-param-prop": "Qué información se obtendrá:",
"apihelp-query+siteinfo-paramvalue-prop-namespacealiases": "Lista de alias registrados de espacios de nombres",
+ "apihelp-query+siteinfo-paramvalue-prop-statistics": "Devuelve las estadísticas del sitio.",
"apihelp-query+siteinfo-paramvalue-prop-interwikimap": "Devuelve el mapa interwiki (opcionalmente filtrado, opcionalmente localizado mediante el uso de <var>$1inlanguagecode</var>).",
+ "apihelp-query+siteinfo-paramvalue-prop-dbrepllag": "Devuelve el servidor de base de datos con el retraso de replicación más grande.",
"apihelp-query+siteinfo-paramvalue-prop-usergroups": "Devuelve los grupos de usuarios y los permisos asociados.",
+ "apihelp-query+siteinfo-paramvalue-prop-defaultoptions": "Devuelve los valores predeterminados de las preferencias del usuario.",
"apihelp-query+siteinfo-example-simple": "Obtener información del sitio.",
"apihelp-query+stashimageinfo-description": "Devuelve información del archivo para archivos escondidos.",
"apihelp-query+stashimageinfo-param-sessionkey": "Alias de $1filekey, para retrocompatibilidad.",
"apihelp-query+stashimageinfo-example-simple": "Devuelve información para un archivo escondido.",
"apihelp-query+stashimageinfo-example-params": "Devuelve las miniaturas de dos archivos escondidos.",
"apihelp-query+tags-param-limit": "El número máximo de etiquetas para enumerar.",
+ "apihelp-query+tags-param-prop": "Qué propiedades se obtendrán:",
+ "apihelp-query+tags-paramvalue-prop-displayname": "Agrega el mensaje de sistema para la etiqueta.",
"apihelp-query+tags-paramvalue-prop-source": "Obtiene las fuentes de la etiqueta, que pueden incluir <samp>extension</samp> para etiquetas definidas por extensiones y <samp>manual</samp> para etiquetas que pueden aplicarse manualmente por los usuarios.",
"apihelp-query+tags-paramvalue-prop-active": "Si la etiqueta aún se sigue aplicando.",
"apihelp-query+templates-description": "Devuelve todas las páginas transcluídas en las páginas dadas.",
"apihelp-query+templates-param-limit": "Cuántas plantillas se devolverán.",
"apihelp-query+transcludedin-description": "Encuentra todas las páginas que transcluyan las páginas dadas.",
+ "apihelp-query+transcludedin-param-prop": "Qué propiedades se obtendrán:",
+ "apihelp-query+transcludedin-paramvalue-prop-pageid": "Identificador de cada página.",
"apihelp-query+transcludedin-paramvalue-prop-title": "Título de cada página.",
"apihelp-query+transcludedin-param-limit": "Cuántos se devolverán.",
"apihelp-query+transcludedin-example-simple": "Obtener una lista de páginas transcluyendo <kbd>Main Page</kbd>.",
"apihelp-query+usercontribs-param-limit": "Número máximo de contribuciones que se devolverán.",
"apihelp-query+usercontribs-param-prop": "Incluir piezas adicionales de información:",
"apihelp-query+usercontribs-paramvalue-prop-ids": "Añade el identificador de página y el de revisión.",
+ "apihelp-query+usercontribs-paramvalue-prop-title": "Agrega el título y el identificador del espacio de nombres de la página.",
"apihelp-query+usercontribs-paramvalue-prop-comment": "Añade el comentario de la edición.",
"apihelp-query+usercontribs-paramvalue-prop-tags": "Lista las etiquetas para la edición.",
"apihelp-query+usercontribs-example-user": "Mostrar contribuciones del usuario <kbd>Ejemplo</kbd>.",
"apihelp-query+usercontribs-example-ipprefix": "Mostrar las contribuciones de todas las direcciones IP con el prefijo <kbd>192.0.2.</kbd>.",
"apihelp-query+userinfo-description": "Obtener información sobre el usuario actual.",
"apihelp-query+userinfo-param-prop": "Qué piezas de información incluir:",
+ "apihelp-query+userinfo-paramvalue-prop-groups": "Lista todos los grupos al que pertenece el usuario actual.",
+ "apihelp-query+userinfo-paramvalue-prop-rights": "Lista todos los permisos que tiene el usuario actual.",
"apihelp-query+userinfo-paramvalue-prop-options": "Lista todas las preferencias que haya establecido el usuario actual.",
"apihelp-query+userinfo-paramvalue-prop-editcount": "Añade el número de ediciones del usuario actual.",
"apihelp-query+userinfo-paramvalue-prop-ratelimits": "Lista todos los límites de velocidad aplicados al usuario actual.",
"apihelp-query+userinfo-example-simple": "Obtener información sobre el usuario actual.",
"apihelp-query+userinfo-example-data": "Obtener información adicional sobre el usuario actual.",
"apihelp-query+users-description": "Obtener información sobre una lista de usuarios.",
+ "apihelp-query+users-param-prop": "Qué piezas de información incluir:",
"apihelp-query+users-paramvalue-prop-blockinfo": "Etiqueta si el usuario está bloqueado, por quién y por qué razón.",
+ "apihelp-query+users-paramvalue-prop-groups": "Lista todos los grupos a los que pertenece cada usuario.",
+ "apihelp-query+users-paramvalue-prop-editcount": "Añade el número de ediciones del usuario.",
"apihelp-query+users-paramvalue-prop-gender": "Etiqueta el género del usuario. Devuelve \"masculino\", \"femenino\" o \"desconocido\".",
"apihelp-query+users-example-simple": "Devolver información del usuario <kbd>Ejemplo</kbd>.",
"apihelp-query+watchlist-param-start": "El sello de tiempo para comenzar la enumeración",
"apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Añade fecha y hora de cuando el usuario fue notificado por última vez acerca de la edición.",
"apihelp-query+watchlist-paramvalue-prop-loginfo": "Añade información del registro cuando corresponda.",
"apihelp-query+watchlist-param-type": "Qué tipos de cambios mostrar:\n;edit:ediciones comunes a páginas.\n;external:cambios externos.\n;new:creaciones de páginas.\n;log:entradas del registro.",
+ "apihelp-query+watchlistraw-param-prop": "Qué propiedades adicionales se obtendrán:",
"apihelp-query+watchlistraw-param-show": "Sólo listar los elementos que cumplen estos criterios.",
"apihelp-query+watchlistraw-param-fromtitle": "Título (con el prefijo de espacio de nombres) desde el que se empezará a enumerar.",
"apihelp-query+watchlistraw-param-totitle": "Título (con el prefijo de espacio de nombres) desde el que se dejará de enumerar.",
"apihelp-parse-paramvalue-prop-iwlinks": "Fournit les liens interwikis dans le wikitexte analysé.",
"apihelp-parse-paramvalue-prop-wikitext": "Fournit le wikitexte d’origine qui a été analysé.",
"apihelp-parse-paramvalue-prop-properties": "Fournit les diverses propriétés définies dans le wikitexte analysé.",
- "apihelp-parse-paramvalue-prop-limitreportdata": "Fournit le rapport de limite d’une manière structurée. Ne fournit aucune donnée, si <var>$1disablepp</var> est positionné.",
- "apihelp-parse-paramvalue-prop-limitreporthtml": "Fournit la version HTML du rapport de limite. Ne fournit aucune donnée, si <var>$1disablepp</var> est positionné.",
+ "apihelp-parse-paramvalue-prop-limitreportdata": "Fournit le rapport de limite d’une manière structurée. Ne fournit aucune donnée, si <var>$1disablelimitreport</var> est positionné.",
+ "apihelp-parse-paramvalue-prop-limitreporthtml": "Fournit la version HTML du rapport de limite. Ne fournit aucune donnée, si <var>$1disablelimitreport</var> est positionné.",
"apihelp-parse-paramvalue-prop-parsetree": "L’arbre d’analyse XML du contenu de la révision (nécessite le modèle de contenu <code>$1</code>)",
"apihelp-parse-param-pst": "Faire une transformation avant enregistrement de l’entrée avant de l’analyser. Valide uniquement quand utilisé avec du texte.",
"apihelp-parse-param-onlypst": "Faire une transformation avant enregistrement (PST) de l’entrée, mais ne pas l’analyser. Renvoie le même wikitexte, après que la PST a été appliquée. Valide uniquement quand utilisé avec <var>$1text</var>.",
"apihelp-parse-param-effectivelanglinks": "Inclut les liens de langue fournis par les extensions (à utiliser avec <kbd>$1prop=langlinks</kbd>).",
"apihelp-parse-param-section": "Récupérer uniquement le contenu de ce numéro de section ou quand <kbd>nouveau</kbd> génère une nouvelle section.\n\nLa <kbd>nouvelle</kbd> section est mise à l’honneur uniquement quand <var>text</var> est spécifié.",
"apihelp-parse-param-sectiontitle": "Nouveau titre de section quand <var>section</var> vaut <kbd>nouveau</kbd>.\n\nÀ la différence de la modification de page, cela ne revient pas à <var>summary</var> quand il est omis ou vide.",
- "apihelp-parse-param-disablepp": "Omettre le rapport du préprocesseur (« rapport de limite du nouveau PP ») de la sortie de l’analyseur.",
+ "apihelp-parse-param-disablelimitreport": "Omettre le rapport de limite (« rapport de limite du nouveau PP ») de la sortie de l’analyseur.",
+ "apihelp-parse-param-disablepp": "Utiliser <var>$1disablelimitreport</var> à la place.",
"apihelp-parse-param-disableeditsection": "Omettre les liens de modification de section de la sortie de l’analyseur.",
+ "apihelp-parse-param-disabletidy": "Ne pas exécuter de nettoyage du code HTML (par exemple, réagencer) sur la sortie de l'analyseur.",
"apihelp-parse-param-generatexml": "Générer un arbre d’analyse XML (nécessite le modèle de contenu <code>$1</code> ; remplacé par <kbd>$2prop=parsetree</kbd>).",
"apihelp-parse-param-preview": "Analyser en mode aperçu.",
"apihelp-parse-param-sectionpreview": "Analyser en mode aperçu de section (active aussi le mode aperçu).",
"apihelp-parse-paramvalue-prop-iwlinks": "Devolve as ligazóns interwiki do texto wiki analizado.",
"apihelp-parse-paramvalue-prop-wikitext": "Devolve o texto wiki orixinal que foi analizado.",
"apihelp-parse-paramvalue-prop-properties": "Obter varias propiedades definidas no texto wiki analizado.",
- "apihelp-parse-paramvalue-prop-limitreportdata": "Devolve o informe de límite de forma estruturada. Non devolve datos cando <var>$1disablepp</var> está fixado.",
- "apihelp-parse-paramvalue-prop-limitreporthtml": "Devolve a versión HTML do informe de límite. Non devolve datos cando <var>$1disablepp</var> está fixado.",
+ "apihelp-parse-paramvalue-prop-limitreportdata": "Devolve o informe de límite de forma estruturada. Non devolve datos cando <var>$1disablelimitreport</var> está fixado.",
+ "apihelp-parse-paramvalue-prop-limitreporthtml": "Devolve a versión HTML do informe de límite. Non devolve datos cando <var>$1disablelimitreport</var> está fixado.",
"apihelp-parse-paramvalue-prop-parsetree": "Árbores de análise XML do contido da revisión (precisa o modelo de contido <code>$1</code>)",
"apihelp-parse-param-pst": "Fai unha transformación antes de gardar a entrada antes de analizala. Válida unicamente para usar con texto.",
"apihelp-parse-param-onlypst": "Facer unha transformación antes de gardar (PST) a entrada, pero sen analizala. Devolve o mesmo wikitexto, despois de que a PST foi aplicada. Só válida cando se usa con <var>$1text</var>.",
"apihelp-parse-param-effectivelanglinks": "Inclúe ligazóns de idioma proporcionadas polas extensións (para usar con <kbd>$1prop=langlinks</kbd>).",
"apihelp-parse-param-section": "Recuperar unicamente o contido deste número de sección ou cando <kbd>new</kbd> xera unha nova sección.\n\nA sección <kbd>new</kbd> só é atendida cando se especifica <var>text</var>.",
"apihelp-parse-param-sectiontitle": "Novo título de sección cando <var>section</var> é <kbd>new</kbd>.\n\nA diferenza da edición de páxinas, non se oculta no <var>summary</var> cando se omite ou está baleiro.",
- "apihelp-parse-param-disablepp": "Omitir o informe de preprocesador (\"Informe de límite NewPP\") da saída do analizador.",
+ "apihelp-parse-param-disablelimitreport": "Omitir o informe de preprocesador (\"Informe de límite NewPP\") da saída do analizador.",
"apihelp-parse-param-disableeditsection": "Omitir as ligazóns de edición de sección da saída do analizador.",
"apihelp-parse-param-generatexml": "Xenerar unha árbore de análise XML (necesita o modelo de contido <code>$1</code>; substituído por <kbd>$2prop=parsetree</kbd>).",
"apihelp-parse-param-preview": "Analizar en modo vista previa.",
"apihelp-parse-paramvalue-prop-iwlinks": "מתן קישורי בינוויקי בקוד הוויקי המפוענח.",
"apihelp-parse-paramvalue-prop-wikitext": "מתן קוד הוויקי המקורי שפוענח.",
"apihelp-parse-paramvalue-prop-properties": "נותן מאפיינים שונים שמוגדרים בקוד הוויקי המפוענח.",
- "apihelp-parse-paramvalue-prop-limitreportdata": "נותן דו\"ח הגבלות בדרך מובנית. לא נותן שום נתונים כאשר מוגדר <var>$1disablepp</var>.",
- "apihelp-parse-paramvalue-prop-limitreporthtml": "נותן את גרסת ה־HTML של דו\"ח ההגבלות. לא נותן שום נתונים כאשר מוגדר <var>$1disablepp</var>.",
+ "apihelp-parse-paramvalue-prop-limitreportdata": "נותן דו\"ח הגבלות בדרך מובנית. לא נותן שום נתונים כאשר מוגדר <var>$1disablelimitreport</var>.",
+ "apihelp-parse-paramvalue-prop-limitreporthtml": "נותן את גרסת ה־HTML של דו\"ח ההגבלות. לא נותן שום נתונים כאשר מוגדר <var>$1disablelimitreport</var>.",
"apihelp-parse-paramvalue-prop-parsetree": "עץ פענוח XML של תוכן הגרסה (דורש מודל תוכן <code>$1</code>)",
"apihelp-parse-param-pst": "לעשות התמרה לפני שמירה על הקלט לפני פענוחו. תקין רק בשימוש עם טקסט.",
"apihelp-parse-param-onlypst": "לעשות התמרה לפני שמירה (pre-save transform, PST) על הקלט, אבל לא לפענח אותו. מחזיר את אותו קוד הוויקי אחרי החלת PST. תקף רק בשימוש עם <var>$1text</var>.",
"apihelp-parse-param-effectivelanglinks": "כולל קישור שפה שמספקות הרחבות (לשימוש עם <kbd>$1prop=langlinks</kbd>).",
"apihelp-parse-param-section": "לאחזר את התוכן של הפסקה עם המספר הזה, או, אם זה <kbd>new</kbd>, ליצור פסקה חדשה.\n\n<kbd>new</kbd> יכובד רק בעת ציון <var>text</var>.",
"apihelp-parse-param-sectiontitle": "כותרת פסקה חדשה כאשר <var>section</var> הוא <kbd>new</kbd>.\n\nבניגוד לעריכת דף, זה לא מתגבה ל־<var>summary</var> כשזה מושמט אם ריק.",
- "apihelp-parse-param-disablepp": "להשמיט את דו\"ח הקדם־מעבד (\"NewPP limit report\") מפלט המפענח.",
+ "apihelp-parse-param-disablelimitreport": "להשמיט את דו\"ח הקדם־מעבד (\"NewPP limit report\") מפלט המפענח.",
+ "apihelp-parse-param-disablepp": "יש להשתמש ב־<var>$1disablelimitreport</var> במקום.",
"apihelp-parse-param-disableeditsection": "להשמיט את קישורי עריכת הפסקאות מפלט המפענח.",
+ "apihelp-parse-param-disabletidy": "לא להריץ ניקוי HTML (למשל tidy) על פלט המפענח.",
"apihelp-parse-param-generatexml": "יצירת עץ פענוח של XML (נדרש מודל תוכן <code>$1</code>; מוחלף ב־<kbd>$2prop=parsetree</kbd>).",
"apihelp-parse-param-preview": "לפענח במצב תצוגה מקדימה.",
"apihelp-parse-param-sectionpreview": "לפענח במצב תצוגה מקדימה של פסקה (מדליק גם את מצב תצוגה מקדימה).",
"apihelp-query+allusers-description": "All registréiert Benotzer opzielen.",
"apihelp-query+allusers-param-activeusers": "Nëmme Benotzer opzielen déi an de leschten $1 {{PLURAL:$1|Dag|Deeg}} aktiv waren.",
"apihelp-query+blocks-description": "Lëscht vun de gespaarte Benotzer an IP-Adressen.",
+ "apihelp-query+blocks-paramvalue-prop-range": "Setzt de Beräich vun den IP-Adressen derbäi déi vun der Spär betraff sinn.",
"apihelp-query+blocks-example-simple": "Lëscht vun de Spären",
"apihelp-query+categories-description": "All Kategorien opzielen zu deenen dës Säit gehéiert.",
+ "apihelp-query+categories-paramvalue-prop-timestamp": "Setzt den Zäitstempel vun dem Ament derbäi wou d'Kategorie derbäigesat gouf.",
"apihelp-query+categories-example-generator": "Informatioun iwwer all Kategorien, déi an der Säit <kbd>Albert Einstein</kbd> benotzt ginn, kréien.",
"apihelp-query+categorymembers-description": "All Säiten aus enger bestëmmter Kategorie opzielen.",
"apihelp-query+categorymembers-example-simple": "Déi éischt 10 Säiten aus der <kbd>Category:Physics</kbd> kréien.",
"apihelp-query+images-example-simple": "Eng Lëscht vun de Fichiere kréien déi op der [[Main Page|Haaptsäit]] benotzt ginn",
"apihelp-query+imageusage-example-simple": "Säite weisen déi [[:File:Albert Einstein Head.jpg]] benotzen",
"apihelp-query+info-paramvalue-prop-readable": "Ob de Benotzer dës Säit liese kann.",
+ "apihelp-query+iwlinks-paramvalue-prop-url": "Setzt déi komplett URL derbäi.",
"apihelp-query+langlinks-param-lang": "Nëmme Sproochlinke mat dësem Sproochcode zréckginn.",
"apihelp-query+links-param-namespace": "Nëmme Linken an dësen Nummräim weisen.",
"apihelp-query+linkshere-paramvalue-prop-title": "Titel vun all Säit.",
"apihelp-query+transcludedin-paramvalue-prop-title": "Titel vun all Säit.",
"apihelp-query+usercontribs-description": "All Ännerunge vun engem Benotzer kréien.",
"apihelp-query+usercontribs-paramvalue-prop-timestamp": "Setzt den Zäitstempel vun derÄnnerung derbäi.",
+ "apihelp-query+usercontribs-paramvalue-prop-comment": "Setzt d'Bemierkung vun der Ännerung derbäi.",
"apihelp-query+userinfo-paramvalue-prop-options": "Lëscht vun allen Astellungen déi den aktuelle Benotzer gemaach huet.",
"apihelp-query+userinfo-paramvalue-prop-realname": "Setzt dem Benotzer säi richtegen Numm derbäi.",
"apihelp-query+users-paramvalue-prop-rights": "Weist all Rechter déi all Benotzer huet.",
"apihelp-query+info-paramvalue-prop-readable": "Czy użytkownik może przeczytać tę stronę.",
"apihelp-query+iwbacklinks-param-prefix": "Prefix interwiki.",
"apihelp-query+iwbacklinks-param-limit": "Łączna ilość stron do zwrócenia.",
+ "apihelp-query+iwlinks-paramvalue-prop-url": "Dodaje pełny adres URL.",
"apihelp-query+links-param-limit": "Ilość linków do zwrócenia.",
"apihelp-query+linkshere-paramvalue-prop-title": "Nazwa każdej strony.",
"apihelp-query+linkshere-param-limit": "Ilość do zwrócenia.",
"apihelp-parse-paramvalue-prop-iwlinks": "Fornece links interwiki no wikitexto analisado.",
"apihelp-parse-paramvalue-prop-wikitext": "Fornece o wikitexto original que foi analisado.",
"apihelp-parse-paramvalue-prop-properties": "Fornece várias propriedades definidas no wikitexto analisado.",
- "apihelp-parse-paramvalue-prop-limitreportdata": "Fornece o relatório limite de uma forma estruturada. Não informa dado, quando<var>$1disablepp</var> se definido.",
+ "apihelp-parse-paramvalue-prop-limitreportdata": "Fornece o relatório limite de uma forma estruturada. Não informa dado, quando<var>$1disablelimitreport</var> se definido.",
"apihelp-parse-example-page": "Analisa uma página.",
"apihelp-parse-example-text": "Analisa wikitexto.",
"apihelp-parse-example-texttitle": "Analisa wikitexto, especificando o título da página.",
"apihelp-parse-param-effectivelanglinks": "{{doc-apihelp-param|parse|effectivelanglinks}}",
"apihelp-parse-param-section": "{{doc-apihelp-param|parse|section}}",
"apihelp-parse-param-sectiontitle": "{{doc-apihelp-param|parse|sectiontitle}}",
+ "apihelp-parse-param-disablelimitreport": "{{doc-apihelp-param|parse|disablelimitreport}}",
"apihelp-parse-param-disablepp": "{{doc-apihelp-param|parse|disablepp}}",
"apihelp-parse-param-disableeditsection": "{{doc-apihelp-param|parse|disableeditsection}}",
+ "apihelp-parse-param-disabletidy": "{{doc-apihelp-param|parse|disabletidy}}",
"apihelp-parse-param-generatexml": "{{doc-apihelp-param|parse|generatexml|params=* $1 - Value of the constant CONTENT_MODEL_WIKITEXT|paramstart=2}}",
"apihelp-parse-param-preview": "{{doc-apihelp-param|parse|preview}}",
"apihelp-parse-param-sectionpreview": "{{doc-apihelp-param|parse|sectionpreview}}",
"apihelp-parse-paramvalue-prop-iwlinks": "Дає інтервікі-посилання в аналізованому вікітексті.",
"apihelp-parse-paramvalue-prop-wikitext": "Дає вихідний вікітекст, який було аналізовано.",
"apihelp-parse-paramvalue-prop-properties": "Дає різні властивості, визначені в аналізованому вікітексті.",
- "apihelp-parse-paramvalue-prop-limitreportdata": "Дає звіт по обмеженнях у структурованому вигляді. Не видає даних, якщо встановлено <var>$1disablepp</var>.",
- "apihelp-parse-paramvalue-prop-limitreporthtml": "Дає HTML-версію звіту по обмеженнях. Не видає даних, якщо встановлено <var>$1disablepp</var>.",
+ "apihelp-parse-paramvalue-prop-limitreportdata": "Дає звіт по обмеженнях у структурованому вигляді. Не видає даних, якщо встановлено <var>$1disablelimitreport</var>.",
+ "apihelp-parse-paramvalue-prop-limitreporthtml": "Дає HTML-версію звіту по обмеженнях. Не видає даних, якщо встановлено <var>$1disablelimitreport</var>.",
"apihelp-parse-paramvalue-prop-parsetree": "Синтаксичне дерево XML вмісту версії (передбачає модель вмісту <code>$1</code>)",
"apihelp-parse-param-pst": "Зробіть трансформацію вхідних даних перед збереженням і аналізом. Дійсне лише при використанні з текстом.",
"apihelp-parse-param-onlypst": "Зробіть трансформацію вхідних даних перед збереженням (PST), але не аналізуйте. Видає той самий вікітекст, після застосування PST. Дійсне лише у разі використання з <var>$1text</var>.",
"apihelp-parse-param-effectivelanglinks": "Включає мовні посилання, додані розширеннями (для використання з <kbd>$1prop=langlinks</kbd>).",
"apihelp-parse-param-section": "Видає вміст лише розділу з цим номером або при <kbd>new</kbd> створенні нового розділу.\n\n<kbd>new</kbd> розділ відзначається лише при вказанні тексту <var>text</var>.",
"apihelp-parse-param-sectiontitle": "Заголовок нового розділу, коли <var>section</var> має значення <kbd>new</kbd>.\n\nНа відміну від редагування сторінки, це не повертається до <var>summary</var>, якщо пропустити чи лишити порожнім.",
- "apihelp-parse-param-disablepp": "Пропустити звіт препроцесора («NewPP limit report») на виході аналізу.",
+ "apihelp-parse-param-disablelimitreport": "Пропустити звіт препроцесора («NewPP limit report») на виході аналізу.",
"apihelp-parse-param-disableeditsection": "Пропустити посилання на редагування розділів на виході аналізу.",
"apihelp-parse-param-generatexml": "Генерувати синтаксичне дерево XML (передбачає модель вмісту <code>$1</code>; замінено на <kbd>$2prop=parsetree</kbd>).",
"apihelp-parse-param-preview": "Аналізувати у режимі попереднього перегляду.",
"apihelp-paraminfo-param-helpformat": "Định dạng chuỗi trợ giúp.",
"apihelp-parse-param-summary": "Lời tóm lược để phân tích.",
"apihelp-parse-param-section": "Chỉ truy xuất nội dung của số phần này; nếu có <kbd>new</kbd> thì tạo phần mới.\n\nPhần <kbd>new</kbd> chỉ được chấp nhận khi định rõ <var>text</var>.",
- "apihelp-parse-param-disablepp": "Bỏ qua thông báo bộ tiền xử lý (“NewPP limit report”) khi cho ra kết quả bộ xử lý.",
+ "apihelp-parse-param-disablelimitreport": "Bỏ qua thông báo bộ tiền xử lý (“NewPP limit report”) khi cho ra kết quả bộ xử lý.",
"apihelp-parse-example-page": "Phân tích trang.",
"apihelp-parse-example-text": "Phân tích văn bản wiki.",
"apihelp-parse-example-texttitle": "Phân tích văn bản wiki theo tên trang.",
"apihelp-parse-paramvalue-prop-indicators": "提供页面上使用的页面状态指示器的HTML。",
"apihelp-parse-paramvalue-prop-iwlinks": "在被解析的wiki文本中提供跨wiki链接。",
"apihelp-parse-paramvalue-prop-wikitext": "提供被解析的原始wiki文本。",
- "apihelp-parse-paramvalue-prop-limitreportdata": "以结构化的方式提供限制报告。如果<var>$1disablepp</var>被设定则不提供数据。",
- "apihelp-parse-paramvalue-prop-limitreporthtml": "提供限制报告的HTML版本。当<var>$1disablepp</var>被设置时不会提供数据。",
+ "apihelp-parse-paramvalue-prop-limitreportdata": "以结构化的方式提供限制报告。如果<var>$1disablelimitreport</var>被设定则不提供数据。",
+ "apihelp-parse-paramvalue-prop-limitreporthtml": "提供限制报告的HTML版本。当<var>$1disablelimitreport</var>被设置时不会提供数据。",
"apihelp-parse-paramvalue-prop-parsetree": "修订内容的XML解析树（需要内容模型<code>$1</code>）",
"apihelp-parse-param-pst": "在解析输入前，对输入做一次保存前变换处理。仅当使用文本时有效。",
"apihelp-parse-param-effectivelanglinks": "包含由扩展提供的语言链接（用于与<kbd>$1prop=langlinks</kbd>一起使用）。",
"apihelp-parse-param-section": "只检索此段数的内容，或只当<kbd>new</kbd>生成新的段落时检索。\n\n<kbd>new</kbd>段落只当指定<var>text</var>时受尊重。",
"apihelp-parse-param-sectiontitle": "当<var>section</var>为<kbd>new</kbd>时新段落标题。\n\n不像页面编辑，当省略或为空时将不会备选为<var>summary</var>。",
- "apihelp-parse-param-disablepp": "从解析器输出中省略预处理器报告（“NewPP limit report”）。",
+ "apihelp-parse-param-disablelimitreport": "从解析器输出中省略限制报告（“NewPP limit report”）。",
+ "apihelp-parse-param-disablepp": "请改用<var>$1disablelimitreport</var>。",
"apihelp-parse-param-disableeditsection": "从解析器输出中省略编辑段落链接。",
+ "apihelp-parse-param-disabletidy": "不要在解析器输出中运行HTML清理（例如tidy）。",
"apihelp-parse-param-generatexml": "生成XML解析树（需要内容模型<code>$1</code>；被<kbd>$2prop=parsetree</kbd>所取代）。",
"apihelp-parse-param-preview": "在预览模式下解析。",
"apihelp-parse-param-sectionpreview": "在小节预览模式下解析 （同时要启用预览模式）。",
"apihelp-query+alltransclusions-param-namespace": "要列举的名字空间。",
"apihelp-query+alltransclusions-param-limit": "要返回的总计项目。",
"apihelp-query+alltransclusions-param-dir": "罗列所采用的方向。",
+ "apihelp-query+alltransclusions-example-B": "列出嵌入的标题，包括丢失的，带有来自的页面ID，从<kbd>B</kbd>开始。",
"apihelp-query+alltransclusions-example-unique": "列出孤立嵌入标题",
"apihelp-query+alltransclusions-example-unique-generator": "获取所有嵌入的标题，并标记缺失的。",
"apihelp-query+alltransclusions-example-generator": "获得包含嵌入内容的页面。",
"apihelp-query+categorymembers-param-end": "列举的结尾时间戳。只能与<kbd>$1sort=timestamp</kbd>一起使用。",
"apihelp-query+categorymembers-param-starthexsortkey": "开始列举的关键词，由<kbd>$1prop=sortkey</kbd>返回。不能与<kbd>$1sort=sortkey</kbd>一起使用。",
"apihelp-query+categorymembers-param-endhexsortkey": "结束列举的关键词，由<kbd>$1prop=sortkey</kbd>返回。不能与<kbd>$1sort=sortkey</kbd>一起使用。",
+ "apihelp-query+categorymembers-param-startsortkeyprefix": "要开始列举的排序关键词前缀。只能与<kbd>$1sort=sortkey</kbd>一起使用。覆盖<var>$1starthexsortkey</var>。",
"apihelp-query+categorymembers-param-startsortkey": "请改用$1starthexsortkey。",
"apihelp-query+categorymembers-param-endsortkey": "请改用$1endhexsortkey。",
"apihelp-query+categorymembers-example-simple": "获取<kbd>Category:Physics</kbd>中的前10个页面。",
"apihelp-query+filearchive-paramvalue-prop-sha1": "为文件加入SHA-1哈希值。",
"apihelp-query+filearchive-paramvalue-prop-timestamp": "为已上传版本添加时间戳。",
"apihelp-query+filearchive-paramvalue-prop-user": "添加上传了图片版本的用户。",
+ "apihelp-query+filearchive-paramvalue-prop-size": "添加图片大小（字节）及其高度、宽度和页面计数（如果可以）。",
"apihelp-query+filearchive-paramvalue-prop-dimensions": "用于大小的别名。",
"apihelp-query+filearchive-paramvalue-prop-description": "添加图片版本的说明。",
"apihelp-query+filearchive-paramvalue-prop-parseddescription": "解析版本的描述。",
"apihelp-query+fileusage-paramvalue-prop-redirect": "标记作为重定向的页面。",
"apihelp-query+fileusage-param-namespace": "只包括这些名字空间的页面。",
"apihelp-query+fileusage-param-limit": "返回多少。",
+ "apihelp-query+fileusage-param-show": "只显示符合以下标准的项：\n;redirect:只显示重定向。\n;!redirect:只显示非重定向。",
"apihelp-query+fileusage-example-simple": "获取使用[[:File:Example.jpg]]的页面列表。",
"apihelp-query+fileusage-example-generator": "获取有关使用[[:File:Example.jpg]]的页面的信息。",
"apihelp-query+imageinfo-description": "返回文件信息和上传历史。",
"apihelp-query+info-paramvalue-prop-subjectid": "每个讨论页的母页面的页面ID。",
"apihelp-query+info-paramvalue-prop-readable": "用户是否可以阅读此页面。",
"apihelp-query+info-paramvalue-prop-preload": "提供由EditFormPreloadText返回的文本。",
+ "apihelp-query+info-paramvalue-prop-displaytitle": "在页面标题实际显示的地方提供方式。",
"apihelp-query+info-param-testactions": "测试当前用户是否可以在页面上执行某种操作。",
"apihelp-query+info-param-token": "请改用[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]。",
"apihelp-query+info-example-simple": "获取有关页面<kbd>Main Page</kbd>的信息。",
"apihelp-query+logevents-paramvalue-prop-title": "为日志事件添加页面标题。",
"apihelp-query+logevents-paramvalue-prop-type": "添加日志活动的类型。",
"apihelp-query+logevents-paramvalue-prop-user": "为日志事件添加用户责任。",
+ "apihelp-query+logevents-paramvalue-prop-userid": "为日志事件添加对此负责的用户ID。",
"apihelp-query+logevents-paramvalue-prop-timestamp": "为日志活动添加时间戳。",
"apihelp-query+logevents-paramvalue-prop-comment": "添加日志活动的摘要。",
"apihelp-query+logevents-paramvalue-prop-parsedcomment": "添加被解析的日志活动的摘要。",
"apihelp-query+protectedtitles-paramvalue-prop-userid": "添加对页面添加保护的用户ID。",
"apihelp-query+protectedtitles-paramvalue-prop-comment": "为保护添加摘要。",
"apihelp-query+protectedtitles-paramvalue-prop-parsedcomment": "为保护添加解析的摘要。",
+ "apihelp-query+protectedtitles-paramvalue-prop-expiry": "添加保护将被提升时的时间戳。",
"apihelp-query+protectedtitles-paramvalue-prop-level": "添加保护级别。",
"apihelp-query+protectedtitles-example-simple": "受保护标题列表。",
"apihelp-query+protectedtitles-example-generator": "找到主命名空间中已保护的标题的链接。",
* @param string $table
* @param int|bool $startId
* @param int|bool $endId
- * @param int|INF $max
+ * @param int $max
* @return TitleArrayFromResult
*/
public function getLinks( $table, $startId = false, $endId = false, $max = INF ) {
* @param string $table
* @param int|bool $startId
* @param int|bool $endId
- * @param int|INF $max
+ * @param int $max
* @param string $select 'all' or 'ids'
* @return ResultWrapper
*/
/**
* Get the approximate number of backlinks
* @param string $table
- * @param int|INF $max Only count up to this many backlinks
+ * @param int $max Only count up to this many backlinks
* @return int
*/
public function getNumLinks( $table, $max = INF ) {
$this->mExpiry = $expiry;
if ( $wgUseLocalMessageCache ) {
- $this->localCache = ObjectCache::newAccelerator( array(), CACHE_NONE );
+ $this->localCache = ObjectCache::newAccelerator( CACHE_NONE );
} else {
$this->localCache = wfGetCache( CACHE_NONE );
}
*/
protected function getLocalCache( $code ) {
$cacheKey = wfMemcKey( __CLASS__, $code );
+
return $this->localCache->get( $cacheKey );
}
* @return bool
*/
function load( $code = false, $mode = null ) {
- global $wgUseLocalMessageCache;
-
if ( !is_string( $code ) ) {
# This isn't really nice, so at least make a note about it and try to
# fall back
# or local cache goes out of date (e.g. due to replace() on some other server)
list( $hash, $hashVolatile ) = $this->getValidationHash( $code );
- if ( $wgUseLocalMessageCache && $hash ) {
- # Try the local cache and check against the cluster hash key...
- $cache = $this->getLocalCache( $code );
- if ( !$cache ) {
- $where[] = 'local cache is empty';
- } elseif ( !isset( $cache['HASH'] ) || $cache['HASH'] !== $hash ) {
- $where[] = 'local cache has the wrong hash';
- $staleCache = $cache;
- } elseif ( $this->isCacheExpired( $cache ) ) {
- $where[] = 'local cache is expired';
- $staleCache = $cache;
- } elseif ( $hashVolatile ) {
- $where[] = 'local cache validation key is expired/volatile';
- $staleCache = $cache;
- } else {
- $where[] = 'got from local cache';
- $success = true;
- $this->mCache[$code] = $cache;
- }
+ # Try the local cache and check against the cluster hash key...
+ $cache = $this->getLocalCache( $code );
+ if ( !$cache ) {
+ $where[] = 'local cache is empty';
+ } elseif ( !isset( $cache['HASH'] ) || $cache['HASH'] !== $hash ) {
+ $where[] = 'local cache has the wrong hash';
+ $staleCache = $cache;
+ } elseif ( $this->isCacheExpired( $cache ) ) {
+ $where[] = 'local cache is expired';
+ $staleCache = $cache;
+ } elseif ( $hashVolatile ) {
+ $where[] = 'local cache validation key is expired/volatile';
+ $staleCache = $cache;
+ } else {
+ $where[] = 'got from local cache';
+ $success = true;
+ $this->mCache[$code] = $cache;
}
if ( !$success ) {
# Wait for the other thread to finish, then retry. Normally,
# the memcached get() will then yeild the other thread's result.
$where[] = 'waited for other thread to complete';
- $this->mMemc->getScopedLock( $cacheKey, self::WAIT_SEC, self::LOCK_TTL );
+ $this->getReentrantScopedLock( $cacheKey );
}
}
}
# If this lock fails, it doesn't really matter, it just means the
# write is potentially non-atomic, e.g. the results of a replace()
# may be discarded.
- $mainUnlocker = $memCache->getScopedLock( $cacheKey, self::WAIT_SEC, self::LOCK_TTL );
+ $mainUnlocker = $this->getReentrantScopedLock( $cacheKey );
if ( !$mainUnlocker ) {
$where[] = 'could not acquire main lock';
}
return;
}
+ # Note that if the cache is volatile, load() may trigger a DB fetch.
+ # In that case we reenter/reuse the existing cache key lock to avoid
+ # a self-deadlock. This is safe as no reads happen *directly* in this
+ # method between getReentrantScopedLock() and load() below. There is
+ # no risk of data "changing under our feet" for replace().
$cacheKey = wfMemcKey( 'messages', $code );
- $scopedLock = $this->mMemc->getScopedLock( $cacheKey, self::WAIT_SEC, self::LOCK_TTL );
+ $scopedLock = $this->getReentrantScopedLock( $cacheKey );
$this->load( $code, self::FOR_UPDATE );
$titleKey = wfMemcKey( 'messages', 'individual', $title );
* @return bool
*/
protected function saveToCaches( $cache, $dest, $code = false ) {
- global $wgUseLocalMessageCache;
-
if ( $dest === 'all' ) {
$cacheKey = wfMemcKey( 'messages', $code );
$success = $this->mMemc->set( $cacheKey, $cache );
$this->setValidationHash( $code, $cache['HASH'] );
# Save to local cache
- if ( $wgUseLocalMessageCache ) {
- $this->saveToLocalCache( $code, $cache );
- }
+ $this->saveToLocalCache( $code, $cache );
return $success;
}
);
}
+ /**
+ * @param string $key A language message cache key that stores blobs
+ * @return null|ScopedCallback
+ */
+ protected function getReentrantScopedLock( $key ) {
+ return $this->mMemc->getScopedLock( $key, self::WAIT_SEC, self::LOCK_TTL, __METHOD__ );
+ }
+
/**
* Get a message from either the content language or the user language.
*
--- /dev/null
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * Backward-compatibility alias for IPSet, which was moved out
+ * into an external library and namespaced.
+ *
+ * @deprecated since 1.26 use IPSet\IPSet directly
+ */
+class IPSet extends IPSet\IPSet {
+}
* Parameters are the same as wfMessage()
*
* @since 1.18
+ * @param mixed ...
* @return Message
*/
public function msg( /* $args */ ) {
/**
* Get a Message object with context set. See wfMessage for parameters.
*
+ * @param mixed ...
* @return Message
*/
public function msg();
private $skin;
/**
- * @var StatsdDataFactory
+ * @var \Liuggio\StatsdClient\Factory\StatsdDataFactory
*/
private $stats;
* Get a Message object with context set
* Parameters are the same as wfMessage()
*
+ * @param mixed ...
* @return Message
*/
public function msg() {
* This causes a multi-row INSERT on DBMSs that support it. The keys in
* each subarray must be identical to each other, and in the same order.
*
- * Usually throws a DBQueryError on failure. If errors are explicitly ignored,
- * returns success.
- *
* $options is an array of options, with boolean options encoded as values
* with numeric keys, in the same style as $options in
* DatabaseBase::select(). Supported options are:
* @param string $fname Calling function name (use __METHOD__) for logs/profiling
* @param array $options Array of options
*
+ * @throws DBQueryError Usually throws a DBQueryError on failure. If errors are explicitly ignored,
+ * returns success.
+ *
* @return bool
*/
public function insert( $table, $a, $fname = __METHOD__, $options = array() ) {
*/
public function hasMasterChanges() {
$ret = false;
- $this->forEachLB( function ( $lb ) use ( &$ret ) {
+ $this->forEachLB( function ( LoadBalancer $lb ) use ( &$ret ) {
$ret = $ret || $lb->hasMasterChanges();
} );
return $ret;
public function getMainLB( $wiki = false ) {
$section = $this->getSectionForWiki( $wiki );
if ( !isset( $this->mainLBs[$section] ) ) {
- $lb = $this->newMainLB( $wiki, $section );
+ $lb = $this->newMainLB( $wiki );
$lb->parentInfo( array( 'id' => "main-$section" ) );
$this->chronProt->initLB( $lb );
$this->mainLBs[$section] = $lb;
protected $mainCache;
public function __construct( $parent ) {
- global $wgMemc;
-
$this->parent = $parent;
- $this->srvCache = ObjectCache::newAccelerator( array(), 'hash' );
- $this->mainCache = $wgMemc ?: wfGetMainCache();
+ $this->srvCache = ObjectCache::newAccelerator( 'hash' );
+ $this->mainCache = wfGetMainCache();
}
public function scaleLoads( &$loads, $group = false, $wiki = false ) {
if ( PHP_SAPI === 'cli' ) {
$this->srvCache = wfGetMainCache(); // preferrably memcached
} else {
- try { // look for APC, XCache, WinCache, ect...
- $this->srvCache = ObjectCache::newAccelerator( array() );
- } catch ( Exception $e ) {
- }
+ // look for APC, XCache, WinCache, ect...
+ $this->srvCache = ObjectCache::newAccelerator( CACHE_NONE );
}
+ } else {
+ $this->srvCache = new EmptyBagOStuff();
}
- $this->srvCache = $this->srvCache ?: new EmptyBagOStuff();
}
public function getFeatures() {
return $objHdrs; // failed
}
+ // Find prior custom HTTP headers
+ $postHeaders = $this->getCustomHeaders( $objHdrs );
+ // Find prior metadata headers
+ $postHeaders += $this->getMetadataHeaders( $objHdrs );
+
$status = Status::newGood();
/** @noinspection PhpUnusedLocalVariableInspection */
$scopeLockS = $this->getScopedFileLocks( array( $path ), LockManager::LOCK_UW, $status );
$hash = $tmpFile->getSha1Base36();
if ( $hash !== false ) {
$objHdrs['x-object-meta-sha1base36'] = $hash;
+ // Merge new SHA1 header into the old ones
+ $postHeaders['x-object-meta-sha1base36'] = $hash;
list( $srcCont, $srcRel ) = $this->resolveStoragePathReal( $path );
- list( $rcode, $rdesc, $rhdrs, $rbody, $rerr ) = $this->http->run( array(
+ list( $rcode ) = $this->http->run( array(
'method' => 'POST',
'url' => $this->storageUrl( $auth, $srcCont, $srcRel ),
- 'headers' => $this->authTokenHeaders( $auth ) + $objHdrs
+ 'headers' => $this->authTokenHeaders( $auth ) + $postHeaders
) );
if ( $rcode >= 200 && $rcode <= 299 ) {
$this->deleteFileCache( $path );
// Tracks peers that couldn't be queried recently to avoid lengthy
// connection timeouts. This is useless if each bucket has one peer.
try {
- $this->statusCache = ObjectCache::newAccelerator( array() );
+ $this->statusCache = ObjectCache::newAccelerator();
} catch ( Exception $e ) {
trigger_error( __CLASS__ .
" using multiple DB peers without apc, xcache, or wincache." );
) {
$prefix = 'mw-ui-';
// add mw-ui-button separately, so the descriptor doesn't need to set it
- $flags .= $prefix.'button';
+ $flags .= ' ' . $prefix.'button';
}
foreach ( $this->mFlags as $flag ) {
$flags .= ' ' . $prefix . $flag;
'patch-fa_major_mime-chemical.sql' ),
// 1.25
- array( 'dropTable', 'hitcounter' ),
- array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ),
- array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ),
array( 'doUserNewTalkUseridUnsigned' ),
// note this patch covers other _comment and _description fields too
array( 'modifyField', 'recentchanges', 'rc_comment', 'patch-editsummary-length.sql' ),
+
+ // 1.26
+ array( 'dropTable', 'hitcounter' ),
+ array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ),
+ array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ),
);
}
"Alan ffm",
"Matik7",
"Pio387",
- "Darellur"
+ "Darellur",
+ "The Polish"
]
},
"config-desc": "Instalator MediaWiki",
"config-install-keys": "Generowanie tajnych kluczy",
"config-insecure-keys": "'''Ostrzeżenie:''' {{PLURAL:$2|Klucz bezpieczeństwa|Klucze bezpieczeństwa|Klucze bezpieczeństwa}} ($1) utworzone podczas instalacji {{PLURAL:$2|utworzony podczas instalacji nie jest|utworzone podczas instalacji nie są|utworzone podczas instalacji nie są}} w pełni bezpieczne. Być może warto wygenerować {{PLURAL:$2|własny klucz|własne klucze|własne klucze}}.",
"config-install-updates": "Zapobieganie uruchamianiu niepotrzebnych aktualizacji",
+ "config-install-updates-failed": "<strong>Błąd:</strong> Wstawianie kluczy aktualizacji d0 tabeli nie powiodło się z powodu następującego błędu: $1",
"config-install-sysop": "Tworzenie konta administratora",
"config-install-subscribe-fail": "Nie można zapisać na listę „mediawiki-announce” – $1",
"config-install-subscribe-notpossible": "cURL nie jest zainstalowany, więc <code>allow_url_fopen</code> nie jest dostępne.",
$timeMs = intval( ( microtime( true ) - $jobStartTime ) * 1000 );
$timeMsTotal += $timeMs;
+ // Record how long jobs wait before getting popped
$readyTs = $job->getReadyTimestamp();
if ( $readyTs ) {
- // Record time to run for the job type
$pickupDelay = $popTime - $readyTs;
$stats->timing( 'jobqueue.pickup_delay.all', 1000 * $pickupDelay );
$stats->timing( "jobqueue.pickup_delay.$jType", 1000 * $pickupDelay );
}
+ // Record root job age for jobs being run
+ $root = $job->getRootJobParams();
+ if ( $root['rootJobTimestamp'] ) {
+ $age = $popTime - wfTimestamp( TS_UNIX, $root['rootJobTimestamp'] );
+ $stats->timing( "jobqueue.pickup_root_age.$jType", 1000 * $age );
+ }
+ // Track the execution time for jobs
$stats->timing( "jobqueue.run.$jType", $timeMs );
// Mark the job as done on success or when the job cannot be retried
}
/**
- * Initialize the session data. Sets the intial result to queued.
+ * Initialize the session data. Sets the initial result to queued.
*/
public function initializeSessionData() {
$session =& self::getSessionData( $this->params['sessionKey'] );
- $$session['result'] = 'Queued';
+ $session['result'] = 'Queued';
}
/**
+++ /dev/null
-<?php
-/**
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Brandon Black <blblack@gmail.com>
- */
-
-/**
- * Matches IP addresses against a set of CIDR specifications
- *
- * Usage:
- * // At startup, calculate the optimized data structure for the set:
- * $ipset = new IPSet( $wgSquidServersNoPurge );
- * // runtime check against cached set (returns bool):
- * $allowme = $ipset->match( $ip );
- *
- * In rough benchmarking, this takes about 80% more time than
- * in_array() checks on a short (a couple hundred at most) array
- * of addresses. It's fast either way at those levels, though,
- * and IPSet would scale better than in_array if the array were
- * much larger.
- *
- * For mixed-family CIDR sets, however, this code gives well over
- * 100x speedup vs iterating IP::isInRange() over an array
- * of CIDR specs.
- *
- * The basic implementation is two separate binary trees
- * (IPv4 and IPv6) as nested php arrays with keys named 0 and 1.
- * The values false and true are terminal match-fail and match-success,
- * otherwise the value is a deeper node in the tree.
- *
- * A simple depth-compression scheme is also implemented: whole-byte
- * tree compression at whole-byte boundaries only, where no branching
- * occurs during that whole byte of depth. A compressed node has
- * keys 'comp' (the byte to compare) and 'next' (the next node to
- * recurse into if 'comp' matched successfully).
- *
- * For example, given these inputs:
- * 25.0.0.0/9
- * 25.192.0.0/10
- *
- * The v4 tree would look like:
- * root4 => array(
- * 'comp' => 25,
- * 'next' => array(
- * 0 => true,
- * 1 => array(
- * 0 => false,
- * 1 => true,
- * ),
- * ),
- * );
- *
- * (multi-byte compression nodes were attempted as well, but were
- * a net loss in my test scenarios due to additional match complexity)
- *
- * @since 1.24
- */
-class IPSet {
- /** @var array $root4: the root of the IPv4 matching tree */
- private $root4 = array( false, false );
-
- /** @var array $root6: the root of the IPv6 matching tree */
- private $root6 = array( false, false );
-
- /**
- * __construct() instantiate the object from an array of CIDR specs
- *
- * @param array $cfg array of IPv[46] CIDR specs as strings
- * @return IPSet new IPSet object
- *
- * Invalid input network/mask values in $cfg will result in issuing
- * E_WARNING and/or E_USER_WARNING and the bad values being ignored.
- */
- public function __construct( array $cfg ) {
- foreach ( $cfg as $cidr ) {
- $this->addCidr( $cidr );
- }
-
- self::recOptimize( $this->root4 );
- self::recCompress( $this->root4, 0, 24 );
- self::recOptimize( $this->root6 );
- self::recCompress( $this->root6, 0, 120 );
- }
-
- /**
- * Add a single CIDR spec to the internal matching trees
- *
- * @param string $cidr string CIDR spec, IPv[46], optional /mask (def all-1's)
- */
- private function addCidr( $cidr ) {
- // v4 or v6 check
- if ( strpos( $cidr, ':' ) === false ) {
- $node =& $this->root4;
- $defMask = '32';
- } else {
- $node =& $this->root6;
- $defMask = '128';
- }
-
- // Default to all-1's mask if no netmask in the input
- if ( strpos( $cidr, '/' ) === false ) {
- $net = $cidr;
- $mask = $defMask;
- } else {
- list( $net, $mask ) = explode( '/', $cidr, 2 );
- if ( !ctype_digit( $mask ) || intval( $mask ) > $defMask ) {
- trigger_error( "IPSet: Bad mask '$mask' from '$cidr', ignored", E_USER_WARNING );
- return;
- }
- }
- $mask = intval( $mask ); // explicit integer convert, checked above
-
- // convert $net to an array of integer bytes, length 4 or 16:
- $raw = inet_pton( $net );
- if ( $raw === false ) {
- return; // inet_pton() sends an E_WARNING for us
- }
- $rawOrd = array_map( 'ord', str_split( $raw ) );
-
- // special-case: zero mask overwrites the whole tree with a pair of terminal successes
- if ( $mask == 0 ) {
- $node = array( true, true );
- return;
- }
-
- // iterate the bits of the address while walking the tree structure for inserts
- $curBit = 0;
- while ( 1 ) {
- $maskShift = 7 - ( $curBit & 7 );
- $node =& $node[( $rawOrd[$curBit >> 3] & ( 1 << $maskShift ) ) >> $maskShift];
- ++$curBit;
- if ( $node === true ) {
- // already added a larger supernet, no need to go deeper
- return;
- } elseif ( $curBit == $mask ) {
- // this may wipe out deeper subnets from earlier
- $node = true;
- return;
- } elseif ( $node === false ) {
- // create new subarray to go deeper
- $node = array( false, false );
- }
- }
- }
-
- /**
- * Match an IP address against the set
- *
- * @param string $ip string IPv[46] address
- * @return bool true is match success, false is match failure
- *
- * If $ip is unparseable, inet_pton may issue an E_WARNING to that effect
- */
- public function match( $ip ) {
- $raw = inet_pton( $ip );
- if ( $raw === false ) {
- return false; // inet_pton() sends an E_WARNING for us
- }
-
- $rawOrd = array_map( 'ord', str_split( $raw ) );
- if ( count( $rawOrd ) == 4 ) {
- $node =& $this->root4;
- } else {
- $node =& $this->root6;
- }
-
- $curBit = 0;
- while ( 1 ) {
- if ( isset( $node['comp'] ) ) {
- // compressed node, matches 1 whole byte on a byte boundary
- if ( $rawOrd[$curBit >> 3] != $node['comp'] ) {
- return false;
- }
- $curBit += 8;
- $node =& $node['next'];
- } else {
- // uncompressed node, walk in the correct direction for the current bit-value
- $maskShift = 7 - ( $curBit & 7 );
- $node =& $node[( $rawOrd[$curBit >> 3] & ( 1 << $maskShift ) ) >> $maskShift];
- ++$curBit;
- }
-
- if ( $node === true || $node === false ) {
- return $node;
- }
- }
- }
-
- /**
- * Recursively merges adjacent nets into larger supernets
- *
- * @param array &$node Tree node to optimize, by-reference
- *
- * e.g.: 8.0.0.0/8 + 9.0.0.0/8 -> 8.0.0.0/7
- */
- private static function recOptimize( &$node ) {
- if ( $node[0] !== false && $node[0] !== true && self::recOptimize( $node[0] ) ) {
- $node[0] = true;
- }
- if ( $node[1] !== false && $node[1] !== true && self::recOptimize( $node[1] ) ) {
- $node[1] = true;
- }
- if ( $node[0] === true && $node[1] === true ) {
- return true;
- }
- return false;
- }
-
- /**
- * Recursively compresses a tree
- *
- * @param array &$node Tree node to compress, by-reference
- * @param integer $curBit current depth in the tree
- * @param integer $maxCompStart maximum depth at which compression can start, family-specific
- *
- * This is a very simplistic compression scheme: if we go through a whole
- * byte of address starting at a byte boundary with no real branching
- * other than immediate false-vs-(node|true), compress that subtree down to a single
- * byte-matching node.
- * The $maxCompStart check elides recursing the final 7 levels of depth (family-dependent)
- */
- private static function recCompress( &$node, $curBit, $maxCompStart ) {
- if ( !( $curBit & 7 ) ) { // byte boundary, check for depth-8 single path(s)
- $byte = 0;
- $cnode =& $node;
- $i = 8;
- while ( $i-- ) {
- if ( $cnode[0] === false ) {
- $byte |= 1 << $i;
- $cnode =& $cnode[1];
- } elseif ( $cnode[1] === false ) {
- $cnode =& $cnode[0];
- } else {
- // partial-byte branching, give up
- break;
- }
- }
- if ( $i == -1 ) { // means we did not exit the while() via break
- $node = array(
- 'comp' => $byte,
- 'next' => &$cnode,
- );
- $curBit += 8;
- if ( $cnode !== true ) {
- self::recCompress( $cnode, $curBit, $maxCompStart );
- }
- return;
- }
- }
-
- ++$curBit;
- if ( $curBit <= $maxCompStart ) {
- if ( $node[0] !== false && $node[0] !== true ) {
- self::recCompress( $node[0], $curBit, $maxCompStart );
- }
- if ( $node[1] !== false && $node[1] !== true ) {
- self::recCompress( $node[1], $curBit, $maxCompStart );
- }
- }
- }
-}
* @ingroup Cache
*/
abstract class BagOStuff implements LoggerAwareInterface {
- private $debugMode = false;
-
+ /** @var array[] Lock tracking */
+ protected $locks = array();
/** @var integer */
protected $lastError = self::ERR_NONE;
- /**
- * @var LoggerInterface
- */
+ /** @var LoggerInterface */
protected $logger;
+ /** @var bool */
+ private $debugMode = false;
+
/** Possible values for getLastError() */
const ERR_NONE = 0; // no error
const ERR_NO_RESPONSE = 1; // no response
}
/**
+ * Acquire an advisory lock on a key string
+ *
+ * Note that if reentry is enabled, duplicate calls ignore $expiry
+ *
* @param string $key
* @param int $timeout Lock wait timeout; 0 for non-blocking [optional]
* @param int $expiry Lock expiry [optional]; 1 day maximum
+ * @param string $rclass Allow reentry if set and the current lock used this value
* @return bool Success
*/
- public function lock( $key, $timeout = 6, $expiry = 6 ) {
+ public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
+ // Avoid deadlocks and allow lock reentry if specified
+ if ( isset( $this->locks[$key] ) ) {
+ if ( $rclass != '' && $this->locks[$key]['class'] === $rclass ) {
+ ++$this->locks[$key]['depth'];
+ return true;
+ } else {
+ return false;
+ }
+ }
+
$expiry = min( $expiry ?: INF, 86400 );
$this->clearLastError();
$timestamp = microtime( true ); // starting UNIX timestamp
if ( $this->add( "{$key}:lock", 1, $expiry ) ) {
- return true;
+ $locked = true;
} elseif ( $this->getLastError() || $timeout <= 0 ) {
- return false; // network partition or non-blocking
+ $locked = false; // network partition or non-blocking
+ } else {
+ $uRTT = ceil( 1e6 * ( microtime( true ) - $timestamp ) ); // estimate RTT (us)
+ $sleep = 2 * $uRTT; // rough time to do get()+set()
+
+ $attempts = 0; // failed attempts
+ do {
+ if ( ++$attempts >= 3 && $sleep <= 5e5 ) {
+ // Exponentially back off after failed attempts to avoid network spam.
+ // About 2*$uRTT*(2^n-1) us of "sleep" happen for the next n attempts.
+ $sleep *= 2;
+ }
+ usleep( $sleep ); // back off
+ $this->clearLastError();
+ $locked = $this->add( "{$key}:lock", 1, $expiry );
+ if ( $this->getLastError() ) {
+ $locked = false; // network partition
+ break;
+ }
+ } while ( !$locked && ( microtime( true ) - $timestamp ) < $timeout );
}
- $uRTT = ceil( 1e6 * ( microtime( true ) - $timestamp ) ); // estimate RTT (us)
- $sleep = 2 * $uRTT; // rough time to do get()+set()
-
- $attempts = 0; // failed attempts
- do {
- if ( ++$attempts >= 3 && $sleep <= 5e5 ) {
- // Exponentially back off after failed attempts to avoid network spam.
- // About 2*$uRTT*(2^n-1) us of "sleep" happen for the next n attempts.
- $sleep *= 2;
- }
- usleep( $sleep ); // back off
- $this->clearLastError();
- $locked = $this->add( "{$key}:lock", 1, $expiry );
- if ( $this->getLastError() ) {
- return false; // network partition
- }
- } while ( !$locked && ( microtime( true ) - $timestamp ) < $timeout );
+ if ( $locked ) {
+ $this->locks[$key] = array( 'class' => $rclass, 'depth' => 1 );
+ }
return $locked;
}
/**
+ * Release an advisory lock on a key string
+ *
* @param string $key
* @return bool Success
*/
public function unlock( $key ) {
- return $this->delete( "{$key}:lock" );
+ if ( isset( $this->locks[$key] ) && --$this->locks[$key]['depth'] <= 0 ) {
+ unset( $this->locks[$key] );
+
+ return $this->delete( "{$key}:lock" );
+ }
+
+ return true;
}
/**
* @param string $key
* @param int $timeout Lock wait timeout; 0 for non-blocking [optional]
* @param int $expiry Lock expiry [optional]; 1 day maximum
+ * @param string $rclass Allow reentry if set and the current lock used this value
* @return ScopedCallback|null Returns null on failure
* @since 1.26
*/
- final public function getScopedLock( $key, $timeout = 6, $expiry = 30 ) {
+ final public function getScopedLock( $key, $timeout = 6, $expiry = 30, $rclass = '' ) {
$expiry = min( $expiry ?: INF, 86400 );
- if ( !$this->lock( $key, $timeout, $expiry ) ) {
+ if ( !$this->lock( $key, $timeout, $expiry, $rclass ) ) {
return null;
}
}
function delete( $key ) {
- if ( !isset( $this->bag[$key] ) ) {
- return false;
- }
-
unset( $this->bag[$key] );
return true;
return $this->writeStore->decr( $key, $value );
}
- public function lock( $key, $timeout = 6, $expiry = 6 ) {
- return $this->writeStore->lock( $key, $timeout, $expiry );
+ public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
+ return $this->writeStore->lock( $key, $timeout, $expiry, $rclass );
}
public function unlock( $key ) {
*/
final public function delete( $key, $ttl = self::HOLDOFF_TTL ) {
$key = self::VALUE_KEY_PREFIX . $key;
+ // Avoid indefinite key salting for sanity
+ $ttl = max( $ttl, 1 );
// Update the local cluster immediately
$ok = $this->cache->set( $key, self::PURGE_VAL_PREFIX . microtime( true ), $ttl );
// Publish the purge to all clusters
*/
class ParsoidVirtualRESTService extends VirtualRESTService {
/**
- * Example requests:
- * GET /local/v1/page/$title/html/$oldid
- * * $oldid is optional
- * POST /local/v1/transform/html/to/wikitext/$title/$oldid
+ * Example Parsoid v3 requests:
+ * GET /local/v3/page/html/$title/{$revision}
+ * * $revision is optional
+ * POST /local/v3/transform/html/to/wikitext/{$title}{/$revision}
* * body: array( 'html' => ... )
- * * $title and $oldid are optional
- * POST /local/v1/transform/wikitext/to/html/$title
- * * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body' => true/false )
+ * * $title and $revision are optional
+ * POST /local/v3/transform/wikitext/to/html/{$title}{/$revision}
+ * * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'bodyOnly' => true/false )
* * $title is optional
+ * * $revision is optional
+ *
+ * There are also deprecated "v1" requests; see onParsoid1Request
+ * for details.
* @param array $params Key/value map
* - url : Parsoid server URL
- * - prefix : Parsoid prefix for this wiki
+ * - domain : Wiki domain to use
* - timeout : Parsoid timeout (optional)
* - forwardCookies : Cookies to forward to Parsoid, or false. (optional)
* - HTTPProxy : Parsoid HTTP proxy (optional)
+ * - restbaseCompat : whether to parse URL as if they were meant for RESTBase
+ * boolean (optional)
*/
public function __construct( array $params ) {
// for backwards compatibility:
$params['url'] = $params['URL'];
unset( $params['URL'] );
}
- parent::__construct( $params );
+ // set up defaults and merge them with the given params
+ $mparams = array_merge( array(
+ 'url' => 'http://localhost:8000/',
+ 'prefix' => 'localhost',
+ 'domain' => 'localhost',
+ 'forwardCookies' => false,
+ 'HTTPProxy' => null,
+ ), $params );
+ // Ensure that the url parameter has a trailing slash.
+ $mparams['url'] = preg_replace(
+ '#/?$#',
+ '/',
+ $mparams['url']
+ );
+ // Ensure the correct domain format: strip protocol, port,
+ // and trailing slash if present. This lets us use
+ // $wgCanonicalServer as a default value, which is very convenient.
+ $mparams['domain'] = preg_replace(
+ '/^(https?:\/\/)?([^\/:]+?)(:\d+)?\/?$/',
+ '$2',
+ $mparams['domain']
+ );
+ parent::__construct( $mparams );
}
public function onRequests( array $reqs, Closure $idGeneratorFunc ) {
list(
$targetWiki, // 'local'
- $version, // 'v1'
- $reqType // 'page' or 'transform'
+ $version, // 'v3' ('v1' for restbase compatibility)
+ $reqType, // 'page' or 'transform'
+ $format, // 'html' or 'wikitext'
+ // $title (optional)
+ // $revision (optional)
) = $parts;
+ if ( $this->params['restbaseCompat'] ) {
+ if ( $version !== 'v1' ) {
+ throw new Exception( "Only RESTBase v1 API is supported." );
+ }
+ # Map RESTBase v1 API to Parsoid v3 API (pretty easy)
+ $req['url'] = preg_replace( '#^local/v1/#', 'local/v3/', $req['url'] );
+ } elseif ( $version !== 'v3' ) {
+ $result[$key] = $this->onParsoid1Request( $req, $idGeneratorFunc );
+ continue;
+ }
if ( $targetWiki !== 'local' ) {
+
throw new Exception( "Only 'local' target wiki is currently supported" );
- } elseif ( $version !== 'v1' ) {
- throw new Exception( "Only version 1 exists" );
- } elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
- throw new Exception( "Request type must be either 'page' or 'transform'" );
}
-
- $req['url'] = $this->params['url'] . '/' . urlencode( $this->params['prefix'] ) . '/';
-
- if ( $reqType === 'page' ) {
- $title = $parts[3];
- if ( $parts[4] !== 'html' ) {
- throw new Exception( "Only 'html' output format is currently supported" );
- }
- if ( isset( $parts[5] ) ) {
- $req['url'] .= $title . '?oldid=' . $parts[5];
- } else {
- $req['url'] .= $title;
- }
- } elseif ( $reqType === 'transform' ) {
- if ( $parts[4] !== 'to' ) {
- throw new Exception( "Part index 4 is not 'to'" );
- }
-
- if ( isset( $parts[6] ) ) {
- $req['url'] .= $parts[6];
- }
-
- if ( $parts[3] === 'html' & $parts[5] === 'wikitext' ) {
- if ( !isset( $req['body']['html'] ) ) {
- throw new Exception( "You must set an 'html' body key for this request" );
- }
- if ( isset( $parts[7] ) ) {
- $req['body']['oldid'] = $parts[7];
- }
- } elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
- if ( !isset( $req['body']['wikitext'] ) ) {
- throw new Exception( "You must set a 'wikitext' body key for this request" );
- }
- $req['body']['wt'] = $req['body']['wikitext'];
- unset( $req['body']['wikitext'] );
- } else {
- throw new Exception( "Transformation unsupported" );
- }
+ if ( $reqType !== 'page' && $reqType !== 'transform' ) {
+ throw new Exception( "Request action must be either 'page' or 'transform'" );
}
-
- if ( isset( $this->params['HTTPProxy'] ) && $this->params['HTTPProxy'] ) {
+ if ( $format !== 'html' && $format !== 'wikitext' ) {
+ throw new Exception( "Request format must be either 'html' or 'wt'" );
+ }
+ // replace /local/ with the current domain
+ $req['url'] = preg_replace( '#^local/#', $this->params['domain'] . '/', $req['url'] );
+ // and prefix it with the service URL
+ $req['url'] = $this->params['url'] . $req['url'];
+ // set the appropriate proxy, timeout and headers
+ if ( $this->params['HTTPProxy'] ) {
$req['proxy'] = $this->params['HTTPProxy'];
}
- if ( isset( $this->params['timeout'] ) ) {
+ if ( $this->params['timeout'] != null ) {
$req['reqTimeout'] = $this->params['timeout'];
}
-
- // Forward cookies
- if ( isset( $this->params['forwardCookies'] ) ) {
+ if ( $this->params['forwardCookies'] ) {
$req['headers']['Cookie'] = $this->params['forwardCookies'];
}
-
$result[$key] = $req;
}
return $result;
}
+
+ /**
+ * Remap a Parsoid v1 request to a Parsoid v3 request.
+ *
+ * Example Parsoid v1 requests:
+ * GET /local/v1/page/$title/html/$oldid
+ * * $oldid is optional
+ * POST /local/v1/transform/html/to/wikitext/$title/$oldid
+ * * body: array( 'html' => ... )
+ * * $title and $oldid are optional
+ * POST /local/v1/transform/wikitext/to/html/$title
+ * * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body' => true/false )
+ * * $title is optional
+ *
+ * NOTE: the POST APIs aren't "real" Parsoid v1 APIs, they are just what
+ * Visual Editor "pretends" the V1 API is like. A previous version of
+ * ParsoidVirtualRESTService translated these to the "real" Parsoid v1
+ * API. We now translate these to the "real" Parsoid v3 API.
+ */
+ public function onParsoid1Request( array $req, Closure $idGeneratorFunc ) {
+
+ $parts = explode( '/', $req['url'] );
+ list(
+ $targetWiki, // 'local'
+ $version, // 'v1'
+ $reqType // 'page' or 'transform'
+ ) = $parts;
+ if ( $targetWiki !== 'local' ) {
+ throw new Exception( "Only 'local' target wiki is currently supported" );
+ } elseif ( $version !== 'v1' ) {
+ throw new Exception( "Only v1 and v3 are supported." );
+ } elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
+ throw new Exception( "Request type must be either 'page' or 'transform'" );
+ }
+ $req['url'] = $this->params['url'] . $this->params['domain'] . '/v3/';
+ if ( $reqType === 'page' ) {
+ $title = $parts[3];
+ if ( $parts[4] !== 'html' ) {
+ throw new Exception( "Only 'html' output format is currently supported" );
+ }
+ $req['url'] .= 'page/html/' . $title;
+ if ( isset( $parts[5] ) ) {
+ $req['url'] .= '/' . $parts[5];
+ } elseif ( isset( $req['query']['oldid'] ) && $req['query']['oldid'] ) {
+ $req['url'] .= '/' . $req['query']['oldid'];
+ unset( $req['query']['oldid'] );
+ }
+ } elseif ( $reqType === 'transform' ) {
+ $req['url'] .= 'transform/'. $parts[3] . '/to/' . $parts[5];
+ // the title
+ if ( isset( $parts[6] ) ) {
+ $req['url'] .= '/' . $parts[6];
+ }
+ // revision id
+ if ( isset( $parts[7] ) ) {
+ $req['url'] .= '/' . $parts[7];
+ } elseif ( isset( $req['body']['oldid'] ) && $req['body']['oldid'] ) {
+ $req['url'] .= '/' . $req['body']['oldid'];
+ unset( $req['body']['oldid'] );
+ }
+ if ( $parts[4] !== 'to' ) {
+ throw new Exception( "Part index 4 is not 'to'" );
+ }
+ if ( $parts[3] === 'html' && $parts[5] === 'wikitext' ) {
+ if ( !isset( $req['body']['html'] ) ) {
+ throw new Exception( "You must set an 'html' body key for this request" );
+ }
+ } elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
+ if ( !isset( $req['body']['wikitext'] ) ) {
+ throw new Exception( "You must set a 'wikitext' body key for this request" );
+ }
+ if ( isset( $req['body']['body'] ) ) {
+ $req['body']['bodyOnly'] = $req['body']['body'];
+ unset( $req['body']['body'] );
+ }
+ } else {
+ throw new Exception( "Transformation unsupported" );
+ }
+ }
+ // set the appropriate proxy, timeout and headers
+ if ( $this->params['HTTPProxy'] ) {
+ $req['proxy'] = $this->params['HTTPProxy'];
+ }
+ if ( $this->params['timeout'] != null ) {
+ $req['reqTimeout'] = $this->params['timeout'];
+ }
+ if ( $this->params['forwardCookies'] ) {
+ $req['headers']['Cookie'] = $this->params['forwardCookies'];
+ }
+
+ return $req;
+
+ }
+
}
<?php
/**
- * Virtual HTTP service client for Restbase
+ * Virtual HTTP service client for RESTBase
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*/
/**
- * Virtual REST service for Restbase
+ * Virtual REST service for RESTBase
* @since 1.25
*/
class RestbaseVirtualRESTService extends VirtualRESTService {
/**
- * Example requests:
- * GET /local/v1/page/{title}/html{/revision}
+ * Example RESTBase v1 requests:
+ * GET /local/v1/page/html/{title}{/revision}
* POST /local/v1/transform/html/to/wikitext{/title}{/revision}
* * body: array( 'html' => ... )
* POST /local/v1/transform/wikitext/to/html{/title}{/revision}
* * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'bodyOnly' => true/false )
*
* @param array $params Key/value map
- * - url : Restbase server URL
+ * - url : RESTBase server URL
* - domain : Wiki domain to use
* - timeout : request timeout in seconds (optional)
- * - forwardCookies : cookies to forward to Restbase/Parsoid (as a Cookie
+ * - forwardCookies : cookies to forward to RESTBase/Parsoid (as a Cookie
* header string) or false (optional)
* Note: forwardCookies will in the future be a boolean
* only, signifing request cookies should be forwarded
public function __construct( array $params ) {
// set up defaults and merge them with the given params
$mparams = array_merge( array(
- 'url' => 'http://localhost:7231',
+ 'url' => 'http://localhost:7231/',
'domain' => 'localhost',
'timeout' => 100,
'forwardCookies' => false,
'HTTPProxy' => null,
'parsoidCompat' => false
), $params );
- // ensure the correct domain format
+ // Ensure that the url parameter has a trailing slash.
+ $mparams['url'] = preg_replace(
+ '#/?$#',
+ '/',
+ $mparams['url']
+ );
+ // Ensure the correct domain format: strip protocol, port,
+ // and trailing slash if present. This lets us use
+ // $wgCanonicalServer as a default value, which is very convenient.
$mparams['domain'] = preg_replace(
- '/^(https?:\/\/)?([^\/:]+?)(\/|:\d+\/?)?$/',
- '$2',
- $mparams['domain']
+ '/^(https?:\/\/)?([^\/:]+?)(:\d+)?\/?$/',
+ '$2',
+ $mparams['domain']
);
parent::__construct( $mparams );
}
$result = array();
foreach ( $reqs as $key => $req ) {
// replace /local/ with the current domain
- $req['url'] = preg_replace( '/^\/local\//', '/' . $this->params['domain'] . '/', $req['url'] );
+ $req['url'] = preg_replace( '#^local/#', $this->params['domain'] . '/', $req['url'] );
// and prefix it with the service URL
$req['url'] = $this->params['url'] . $req['url'];
// set the appropriate proxy, timeout and headers
}
/**
- * Remaps Parsoid requests to Restbase paths
+ * Remaps Parsoid v1/v3 requests to RESTBase v1 requests.
*/
public function onParsoidRequests( array $reqs, Closure $idGeneratorFunc ) {
$result = array();
foreach ( $reqs as $key => $req ) {
$parts = explode( '/', $req['url'] );
- list(
- $targetWiki, // 'local'
- $version, // 'v1'
- $reqType // 'page' or 'transform'
- ) = $parts;
- if ( $targetWiki !== 'local' ) {
- throw new Exception( "Only 'local' target wiki is currently supported" );
- } elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
- throw new Exception( "Request type must be either 'page' or 'transform'" );
+ if ( $parts[1] === 'v3' ) {
+ $result[$key] = $this->onParsoid3Request( $req, $idGeneratorFunc );
+ } elseif ( $parts[1] === 'v1' ) {
+ $result[$key] = $this->onParsoid1Request( $req, $idGeneratorFunc );
+ } else {
+ throw new Exception( "Only v1 and v3 are supported." );
}
- $req['url'] = $this->params['url'] . '/' . $this->params['domain'] . '/v1/' . $reqType . '/';
- if ( $reqType === 'page' ) {
- $title = $parts[3];
- if ( $parts[4] !== 'html' ) {
- throw new Exception( "Only 'html' output format is currently supported" );
- }
- $req['url'] .= 'html/' . $title;
- if ( isset( $parts[5] ) ) {
- $req['url'] .= '/' . $parts[5];
- } elseif ( isset( $req['query']['oldid'] ) && $req['query']['oldid'] ) {
- $req['url'] .= '/' . $req['query']['oldid'];
- unset( $req['query']['oldid'] );
- }
- } elseif ( $reqType === 'transform' ) {
- // from / to transform
- $req['url'] .= $parts[3] . '/to/' . $parts[5];
- // the title
- if ( isset( $parts[6] ) ) {
- $req['url'] .= '/' . $parts[6];
- }
- // revision id
- if ( isset( $parts[7] ) ) {
- $req['url'] .= '/' . $parts[7];
- } elseif ( isset( $req['body']['oldid'] ) && $req['body']['oldid'] ) {
- $req['url'] .= '/' . $req['body']['oldid'];
- unset( $req['body']['oldid'] );
- }
- if ( $parts[4] !== 'to' ) {
- throw new Exception( "Part index 4 is not 'to'" );
- }
- if ( $parts[3] === 'html' & $parts[5] === 'wikitext' ) {
- if ( !isset( $req['body']['html'] ) ) {
- throw new Exception( "You must set an 'html' body key for this request" );
- }
- } elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
- if ( !isset( $req['body']['wikitext'] ) ) {
- throw new Exception( "You must set a 'wikitext' body key for this request" );
- }
- if ( isset( $req['body']['body'] ) ) {
- $req['body']['bodyOnly'] = $req['body']['body'];
- unset( $req['body']['body'] );
- }
- } else {
- throw new Exception( "Transformation unsupported" );
- }
+ }
+
+ return $result;
+
+ }
+
+ /**
+ * Remap a Parsoid v1 request to a RESTBase v1 request.
+ *
+ * Example Parsoid v1 requests:
+ * GET /local/v1/page/$title/html/$oldid
+ * * $oldid is optional
+ * POST /local/v1/transform/html/to/wikitext/$title/$oldid
+ * * body: array( 'html' => ... )
+ * * $title and $oldid are optional
+ * POST /local/v1/transform/wikitext/to/html/$title
+ * * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'body' => true/false )
+ * * $title is optional
+ *
+ * NOTE: the POST APIs aren't "real" Parsoid v1 APIs, they are just what
+ * Visual Editor "pretends" the V1 API is like. (See
+ * ParsoidVirtualRESTService.)
+ */
+ public function onParsoid1Request( array $req, Closure $idGeneratorFunc ) {
+ $parts = explode( '/', $req['url'] );
+ list(
+ $targetWiki, // 'local'
+ $version, // 'v1'
+ $reqType // 'page' or 'transform'
+ ) = $parts;
+ if ( $targetWiki !== 'local' ) {
+ throw new Exception( "Only 'local' target wiki is currently supported" );
+ } elseif ( $version !== 'v1' ) {
+ throw new Exception( "Version mismatch: should not happen." );
+ } elseif ( $reqType !== 'page' && $reqType !== 'transform' ) {
+ throw new Exception( "Request type must be either 'page' or 'transform'" );
+ }
+ $req['url'] = $this->params['url'] . $this->params['domain'] . '/v1/' . $reqType . '/';
+ if ( $reqType === 'page' ) {
+ $title = $parts[3];
+ if ( $parts[4] !== 'html' ) {
+ throw new Exception( "Only 'html' output format is currently supported" );
}
- // set the appropriate proxy, timeout and headers
- if ( $this->params['HTTPProxy'] ) {
- $req['proxy'] = $this->params['HTTPProxy'];
+ $req['url'] .= 'html/' . $title;
+ if ( isset( $parts[5] ) ) {
+ $req['url'] .= '/' . $parts[5];
+ } elseif ( isset( $req['query']['oldid'] ) && $req['query']['oldid'] ) {
+ $req['url'] .= '/' . $req['query']['oldid'];
+ unset( $req['query']['oldid'] );
}
- if ( $this->params['timeout'] != null ) {
- $req['reqTimeout'] = $this->params['timeout'];
+ } elseif ( $reqType === 'transform' ) {
+ // from / to transform
+ $req['url'] .= $parts[3] . '/to/' . $parts[5];
+ // the title
+ if ( isset( $parts[6] ) ) {
+ $req['url'] .= '/' . $parts[6];
}
- if ( $this->params['forwardCookies'] ) {
- $req['headers']['Cookie'] = $this->params['forwardCookies'];
+ // revision id
+ if ( isset( $parts[7] ) ) {
+ $req['url'] .= '/' . $parts[7];
+ } elseif ( isset( $req['body']['oldid'] ) && $req['body']['oldid'] ) {
+ $req['url'] .= '/' . $req['body']['oldid'];
+ unset( $req['body']['oldid'] );
+ }
+ if ( $parts[4] !== 'to' ) {
+ throw new Exception( "Part index 4 is not 'to'" );
+ }
+ if ( $parts[3] === 'html' && $parts[5] === 'wikitext' ) {
+ if ( !isset( $req['body']['html'] ) ) {
+ throw new Exception( "You must set an 'html' body key for this request" );
+ }
+ } elseif ( $parts[3] == 'wikitext' && $parts[5] == 'html' ) {
+ if ( !isset( $req['body']['wikitext'] ) ) {
+ throw new Exception( "You must set a 'wikitext' body key for this request" );
+ }
+ if ( isset( $req['body']['body'] ) ) {
+ $req['body']['bodyOnly'] = $req['body']['body'];
+ unset( $req['body']['body'] );
+ }
+ } else {
+ throw new Exception( "Transformation unsupported" );
}
- $result[$key] = $req;
+ }
+ // set the appropriate proxy, timeout and headers
+ if ( $this->params['HTTPProxy'] ) {
+ $req['proxy'] = $this->params['HTTPProxy'];
+ }
+ if ( $this->params['timeout'] != null ) {
+ $req['reqTimeout'] = $this->params['timeout'];
+ }
+ if ( $this->params['forwardCookies'] ) {
+ $req['headers']['Cookie'] = $this->params['forwardCookies'];
}
- return $result;
+ return $req;
+
+ }
+
+ /**
+ * Remap a Parsoid v3 request to a RESTBase v1 request.
+ *
+ * Example Parsoid v3 requests:
+ * GET /local/v3/page/html/$title/{$revision}
+ * * $revision is optional
+ * POST /local/v3/transform/html/to/wikitext/{$title}{/$revision}
+ * * body: array( 'html' => ... )
+ * * $title and $revision are optional
+ * POST /local/v3/transform/wikitext/to/html/{$title}{/$revision}
+ * * body: array( 'wikitext' => ... ) or array( 'wikitext' => ..., 'bodyOnly' => true/false )
+ * * $title is optional
+ * * $revision is optional
+ */
+ public function onParsoid3Request( array $req, Closure $idGeneratorFunc ) {
+
+ $parts = explode( '/', $req['url'] );
+ list(
+ $targetWiki, // 'local'
+ $version, // 'v3'
+ $action, // 'transform' or 'page'
+ $format, // 'html' or 'wikitext'
+ // $title, // optional
+ // $revision, // optional
+ ) = $parts;
+ if ( $targetWiki !== 'local' ) {
+ throw new Exception( "Only 'local' target wiki is currently supported" );
+ } elseif ( $version !== 'v3' ) {
+ throw new Exception( "Version mismatch: should not happen." );
+ }
+ // replace /local/ with the current domain, change v3 to v1,
+ $req['url'] = preg_replace( '#^local/v3/#', $this->params['domain'] . '/v1/', $req['url'] );
+ // and prefix it with the service URL
+ $req['url'] = $this->params['url'] . $req['url'];
+ // set the appropriate proxy, timeout and headers
+ if ( $this->params['HTTPProxy'] ) {
+ $req['proxy'] = $this->params['HTTPProxy'];
+ }
+ if ( $this->params['timeout'] != null ) {
+ $req['reqTimeout'] = $this->params['timeout'];
+ }
+ if ( $this->params['forwardCookies'] ) {
+ $req['headers']['Cookie'] = $this->params['forwardCookies'];
+ }
+
+ return $req;
}
// could declare entities unsafe to parse with xml_parse (T85848/T71210).
if ( $this->parsable !== self::PARSABLE_OK ) {
if ( $this->parsable === self::PARSABLE_NO ) {
- throw new Exception( 'Unsafe doctype declaration in XML.' );
+ throw new RuntimeException( 'Unsafe doctype declaration in XML.' );
}
$content = $this->xmlParsableBuffer . $content;
$msg = ( $this->parsable === self::PARSABLE_NO ) ?
'Unsafe doctype declaration in XML.' :
'No root element found in XML.';
- throw new Exception( $msg );
+ throw new RuntimeException( $msg );
}
}
$ok = xml_parse( $this->xmlParser, $content, $allOfIt );
if ( !$ok ) {
- $error = xml_error_string( xml_get_error_code( $this->xmlParser ) );
- $where = 'line: ' . xml_get_current_line_number( $this->xmlParser )
- . ' column: ' . xml_get_current_column_number( $this->xmlParser )
- . ' byte offset: ' . xml_get_current_byte_index( $this->xmlParser );
-
- $this->logger->info( "XMPReader::parse : Error reading XMP content: $error ($where)" );
+ $code = xml_get_error_code( $this->xmlParser );
+ $error = xml_error_string( $code );
+ $line = xml_get_current_line_number( $this->xmlParser );
+ $col = xml_get_current_column_number( $this->xmlParser );
+ $offset = xml_get_current_byte_index( $this->xmlParser );
+
+ $this->logger->warning(
+ '{method} : Error reading XMP content: {error} ' .
+ '(line: {line} column: {column} byte offset: {offset})',
+ array(
+ 'method' => __METHOD__,
+ 'error_code' => $code,
+ 'error' => $error,
+ 'line' => $line,
+ 'column' => $col,
+ 'offset' => $offset,
+ 'content' => $content,
+ ) );
$this->results = array(); // blank if error.
$this->destroyXMLParser();
return false;
}
} catch ( Exception $e ) {
- $this->logger->info( 'XMP parse error: ' . $e );
+ $this->logger->warning(
+ '{method} Exception caught while parsing: ' . $e->getMessage(),
+ array(
+ 'method' => __METHOD__,
+ 'exception' => $e,
+ 'content' => $content,
+ )
+ );
$this->results = array();
if ( $allOfIt ) {
* @param string $key
* @param int $timeout
* @param int $expiry
+ * @param string $rclass
* @return bool
*/
- public function lock( $key, $timeout = 6, $expiry = 6 ) {
+ public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
// Lock only the first cache, to avoid deadlocks
if ( isset( $this->caches[0] ) ) {
- return $this->caches[0]->lock( $key, $timeout, $expiry );
+ return $this->caches[0]->lock( $key, $timeout, $expiry, $rclass );
} else {
return true;
}
*
* The word "cache" has two main dictionary meanings, and both
* are used in this factory class. They are:
- * - a) A place to store copies or computations on existing data
- * for higher access speeds (the computer science definition)
- * - b) A place to store lightweight data that is not canonically
- * stored anywhere else (e.g. a "hoard" of objects)
+ *
+ * - a) Cache (the computer science definition).
+ * A place to store copies or computations on existing data for
+ * higher access speeds.
+ * - b) Storage.
+ * A place to store lightweight data that is not canonically
+ * stored anywhere else (e.g. a "hoard" of objects).
*
* The former should always use strongly consistent stores, so callers don't
* have to deal with stale reads. The later may be eventually consistent, but
* callers can use BagOStuff:READ_LATEST to see the latest available data.
*
+ * Primary entry points:
+ *
+ * - ObjectCache::newAccelerator( $fallbackType )
+ * Purpose: Cache.
+ * Stored only on the individual web server.
+ * Not associated with other servers.
+ *
+ * - wfGetMainCache()
+ * Purpose: Cache.
+ * Stored centrally within the local data-center.
+ * Not replicated to other DCs.
+ * Also known as $wgMemc. Configured by $wgMainCacheType.
+ *
+ * - ObjectCache::getMainWANInstance()
+ * Purpose: Cache.
+ * Stored in the local data-center's main cache (uses different cache keys).
+ * Delete events are broadcasted to other DCs. See WANObjectCache for details.
+ *
+ * - ObjectCache::getMainStashInstance()
+ * Purpose: Storage.
+ * Stored centrally within the local data-center.
+ * Changes are replicated to other DCs (eventually consistent).
+ * To retrieve the latest value (e.g. not from a slave), use BagOStuff:READ_LATEST.
+ *
+ * - wfGetCache( $cacheType )
+ * Get a specific cache type by key in $wgObjectCaches.
+ *
* @ingroup Cache
*/
class ObjectCache {
/**
* Get a cached instance of the specified type of cache object.
*
- * @param string $id
+ * @param string $id A key in $wgObjectCaches.
* @return BagOStuff
*/
- static function getInstance( $id ) {
+ public static function getInstance( $id ) {
if ( !isset( self::$instances[$id] ) ) {
self::$instances[$id] = self::newFromId( $id );
}
}
/**
- * Get a cached instance of the specified type of cache object.
+ * Get a cached instance of the specified type of WAN cache object.
*
* @since 1.26
- * @param string $id
+ * @param string $id A key in $wgWANObjectCaches.
* @return WANObjectCache
*/
- static function getWANInstance( $id ) {
+ public static function getWANInstance( $id ) {
if ( !isset( self::$wanInstances[$id] ) ) {
self::$wanInstances[$id] = self::newWANCacheFromId( $id );
}
return self::$wanInstances[$id];
}
- /**
- * Clear all the cached instances.
- */
- static function clear() {
- self::$instances = array();
- self::$wanInstances = array();
- }
-
/**
* Create a new cache object of the specified type.
*
- * @param string $id
+ * @param string $id A key in $wgObjectCaches.
* @return BagOStuff
* @throws MWException
*/
- static function newFromId( $id ) {
+ public static function newFromId( $id ) {
global $wgObjectCaches;
if ( !isset( $wgObjectCaches[$id] ) ) {
}
/**
- * Create a new cache object from parameters
+ * Create a new cache object from parameters.
*
- * @param array $params
+ * @param array $params Must have 'factory' or 'class' property.
+ * - factory: Callback passed $params that returns BagOStuff.
+ * - class: BagOStuff subclass constructed with $params.
+ * - loggroup: Alias to set 'logger' key with LoggerFactory group.
+ * - .. Other parameters passed to factory or class.
* @return BagOStuff
* @throws MWException
*/
- static function newFromParams( $params ) {
+ public static function newFromParams( $params ) {
if ( isset( $params['loggroup'] ) ) {
$params['logger'] = LoggerFactory::getInstance( $params['loggroup'] );
} else {
}
/**
- * Factory function referenced from DefaultSettings.php for CACHE_ANYTHING
+ * Factory function for CACHE_ANYTHING (referenced from DefaultSettings.php)
*
* CACHE_ANYTHING means that stuff has to be cached, not caching is not an option.
* If a caching method is configured for any of the main caches ($wgMainCacheType,
* @param array $params
* @return BagOStuff
*/
- static function newAnything( $params ) {
+ public static function newAnything( $params ) {
global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
$candidates = array( $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType );
foreach ( $candidates as $candidate ) {
}
/**
- * Factory function referenced from DefaultSettings.php for CACHE_ACCEL.
+ * Factory function for CACHE_ACCEL (referenced from DefaultSettings.php)
*
* This will look for any APC style server-local cache.
* A fallback cache can be specified if none is found.
*
- * @param array $params
+ * @param array $params [optional]
* @param int|string $fallback Fallback cache, e.g. (CACHE_NONE, "hash") (since 1.24)
* @return BagOStuff
* @throws MWException
*/
- static function newAccelerator( $params, $fallback = null ) {
+ public static function newAccelerator( $params = array(), $fallback = null ) {
+ if ( !is_array( $params ) && $fallback === null ) {
+ $fallback = $params;
+ }
if ( function_exists( 'apc_fetch' ) ) {
$id = 'apc';
} elseif ( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) {
* @param array $params
* @return MemcachedPhpBagOStuff
*/
- static function newMemcached( $params ) {
+ public static function newMemcached( $params ) {
return new MemcachedPhpBagOStuff( $params );
}
/**
- * Create a new cache object of the specified type
+ * Create a new cache object of the specified type.
*
* @since 1.26
- * @param string $id
+ * @param string $id A key in $wgWANObjectCaches.
* @return WANObjectCache
* @throws MWException
*/
- static function newWANCacheFromId( $id ) {
+ public static function newWANCacheFromId( $id ) {
global $wgWANObjectCaches;
if ( !isset( $wgWANObjectCaches[$id] ) ) {
}
/**
- * Get the main WAN cache object
+ * Get the main WAN cache object.
*
* @since 1.26
* @return WANObjectCache
*/
- static function getMainWANInstance() {
+ public static function getMainWANInstance() {
global $wgMainWANCache;
return self::getWANInstance( $wgMainWANCache );
}
/**
+ * Get the cache object for the main stash.
+ *
* Stash objects are BagOStuff instances suitable for storing light
* weight data that is not canonically stored elsewhere (such as RDBMS).
* Stashes should be configured to propagate changes to all data-centers.
* @return BagOStuff
* @since 1.26
*/
- static function getMainStashInstance() {
+ public static function getMainStashInstance() {
global $wgMainStash;
return self::getInstance( $wgMainStash );
}
+
+ /**
+ * Clear all the cached instances.
+ */
+ public static function clear() {
+ self::$instances = array();
+ self::$wanInstances = array();
+ }
}
* Best if all done inside a transaction.
*
* @param DatabaseBase $dbw
- * @return int The newly created page_id key, or false if the title already existed
+ * @return int|bool The newly created page_id key; false if the title already existed
*/
public function insertOn( $dbw ) {
-
$page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
$dbw->insert( 'page', array(
'page_id' => $page_id,
$newid = $dbw->insertId();
$this->mId = $newid;
$this->mTitle->resetArticleID( $newid );
- }
- return $affected ? $newid : false;
+ return $newid;
+ } else {
+ return false;
+ }
}
/**
// Purge squid for this page only
$title->purgeSquid();
-
- $revid = $revision ? $revision->getId() : null;
// Clear file cache for this page only
HTMLFileCache::clearFileCache( $title );
+
+ $revid = $revision ? $revision->getId() : null;
DeferredUpdates::addCallableUpdate( function() use ( $title, $revid ) {
InfoAction::invalidateCache( $title, $revid );
} );
if ( $wgShowHostnames ) {
$limitReport .= 'Parsed by ' . wfHostname() . "\n";
}
+ $limitReport .= 'Cached time: ' . $this->mOutput->getCacheTime() . "\n";
+ $limitReport .= 'Cache expiry: ' . $this->mOutput->getCacheExpiry() . "\n";
+ $limitReport .= 'Dyanmic content: ' . ( $this->mOutput->hasDynamicContent() ? 'true' : 'false' ) . "\n";
foreach ( $this->mOutput->getLimitReportData() as $key => $value ) {
if ( Hooks::run( 'ParserLimitReportFormat',
array( $key, &$value, &$limitReport, false, false )
$ig->setParser( $this );
$ig->setHideBadImages();
$ig->setAttributes( Sanitizer::validateTagAttributes( $params, 'table' ) );
+ $this->getOutput()->addModuleStyles( 'mediawiki.page.gallery.styles' );
if ( isset( $params['showfilename'] ) ) {
$ig->setShowFilename( true );
/**
* Interlanguage links are removed and returned in an array
*/
- public $mInterwikiMagic;
+ private $mInterwikiMagic;
/**
* Allow external images inline?
*/
- public $mAllowExternalImages;
+ private $mAllowExternalImages;
/**
* If not, any exception?
*/
- public $mAllowExternalImagesFrom;
+ private $mAllowExternalImagesFrom;
/**
* If not or it doesn't match, should we check an on-wiki whitelist?
*/
- public $mEnableImageWhitelist;
+ private $mEnableImageWhitelist;
/**
* Date format index
*/
- public $mDateFormat = null;
+ private $mDateFormat = null;
/**
* Create "edit section" links?
*/
- public $mEditSection = true;
+ private $mEditSection = true;
/**
* Allow inclusion of special pages?
*/
- public $mAllowSpecialInclusion;
+ private $mAllowSpecialInclusion;
/**
* Use tidy to cleanup output HTML?
*/
- public $mTidy = false;
+ private $mTidy = false;
/**
* Which lang to call for PLURAL and GRAMMAR
*/
- public $mInterfaceMessage = false;
+ private $mInterfaceMessage = false;
/**
* Overrides $mInterfaceMessage with arbitrary language
*/
- public $mTargetLanguage = null;
+ private $mTargetLanguage = null;
/**
* Maximum size of template expansions, in bytes
*/
- public $mMaxIncludeSize;
+ private $mMaxIncludeSize;
/**
* Maximum number of nodes touched by PPFrame::expand()
*/
- public $mMaxPPNodeCount;
+ private $mMaxPPNodeCount;
/**
* Maximum number of nodes generated by Preprocessor::preprocessToObj()
*/
- public $mMaxGeneratedPPNodeCount;
+ private $mMaxGeneratedPPNodeCount;
/**
* Maximum recursion depth in PPFrame::expand()
*/
- public $mMaxPPExpandDepth;
+ private $mMaxPPExpandDepth;
/**
* Maximum recursion depth for templates within templates
*/
- public $mMaxTemplateDepth;
+ private $mMaxTemplateDepth;
/**
* Maximum number of calls per parse to expensive parser functions
*/
- public $mExpensiveParserFunctionLimit;
+ private $mExpensiveParserFunctionLimit;
/**
* Remove HTML comments. ONLY APPLIES TO PREPROCESS OPERATIONS
*/
- public $mRemoveComments = true;
+ private $mRemoveComments = true;
/**
* Callback for current revision fetching. Used as first argument to call_user_func().
*/
- public $mCurrentRevisionCallback =
+ private $mCurrentRevisionCallback =
array( 'Parser', 'statelessFetchRevision' );
/**
* Callback for template fetching. Used as first argument to call_user_func().
*/
- public $mTemplateCallback =
+ private $mTemplateCallback =
array( 'Parser', 'statelessFetchTemplate' );
/**
* Enable limit report in an HTML comment on output
*/
- public $mEnableLimitReport = false;
+ private $mEnableLimitReport = false;
/**
* Timestamp used for {{CURRENTDAY}} etc.
*/
- public $mTimestamp;
+ private $mTimestamp;
/**
* Target attribute for external links
*/
- public $mExternalLinkTarget;
+ private $mExternalLinkTarget;
/**
* Clean up signature texts?
* @see Parser::cleanSig
*/
- public $mCleanSignatures;
+ private $mCleanSignatures;
/**
* Transform wiki markup when saving the page?
*/
- public $mPreSaveTransform = true;
+ private $mPreSaveTransform = true;
/**
* Whether content conversion should be disabled
*/
- public $mDisableContentConversion;
+ private $mDisableContentConversion;
/**
* Whether title conversion should be disabled
*/
- public $mDisableTitleConversion;
+ private $mDisableTitleConversion;
/**
* Automatically number headings?
*/
- public $mNumberHeadings;
+ private $mNumberHeadings;
/**
* Thumb size preferred by the user.
*/
- public $mThumbSize;
+ private $mThumbSize;
/**
* Maximum article size of an article to be marked as "stub"
/**
* Language object of the User language.
*/
- public $mUserLang;
+ private $mUserLang;
/**
* @var User
* Stored user object
*/
- public $mUser;
+ private $mUser;
/**
* Parsing the page for a "preview" operation?
*/
- public $mIsPreview = false;
+ private $mIsPreview = false;
/**
* Parsing the page for a "preview" operation on a single section?
*/
- public $mIsSectionPreview = false;
+ private $mIsSectionPreview = false;
/**
* Parsing the printable version of the page?
*/
- public $mIsPrintable = false;
+ private $mIsPrintable = false;
/**
* Extra key that should be present in the caching key.
*/
- public $mExtraKey = '';
+ private $mExtraKey = '';
/**
* Function to be called when an option is accessed.
*/
- protected $onAccessCallback = null;
+ private $onAccessCallback = null;
/**
* If the page being parsed is a redirect, this should hold the redirect
}
/**
- * Get the user language used by the parser for this page.
+ * Get the user language used by the parser for this page and record the
+ * userlang parser option, which splits parser cache.
*
* You shouldn't use this. Really. $parser->getFunctionLang() is all you need.
*
* To avoid side-effects where the page will be rendered based on the language
- * of the user who last saved, this function will triger a cache fragmentation.
- * Usage of this method is discouraged for that reason.
+ * of the user who last saved, this function will trigger a cache fragmentation.
+ * For that reason, usage of this method is discouraged unless it is desired to
+ * split caches based on user language, such as for multilingual content.
*
* When saving, this will return the default language instead of the user's.
*
// Timing hack
if ( $time > 3 ) {
- wfDebugLog( 'slow-parse', sprintf( "%-5.2f %s", $time,
- $this->page->getTitle()->getPrefixedDBkey() ) );
+ // TODO: Use Parser's logger (once it has one)
+ $logger = MediaWiki\Logger\LoggerFactory::getInstance( 'slow-parse' );
+ $logger->info( '{time} {title}', array(
+ 'time' => number_format( $time, 2 ),
+ 'title' => $this->page->getTitle()->getPrefixedDBkey(),
+ ) );
}
if ( $this->cacheable && $this->parserOutput->isCacheable() && $isCurrent ) {
'wgHooks' => 'array_merge_recursive',
// credits are handled in the ExtensionRegistry
//'wgExtensionCredits' => 'array_merge_recursive',
- 'wgExtraNamespaces' => 'array_plus',
'wgExtraGenderNamespaces' => 'array_plus',
'wgNamespacesWithSubpages' => 'array_plus',
'wgNamespaceContentModels' => 'array_plus',
foreach ( $info['namespaces'] as $ns ) {
$id = $ns['id'];
$this->defines[$ns['constant']] = $id;
- $this->globals['wgExtraNamespaces'][$id] = $ns['name'];
+ $this->attributes['ExtensionNamespaces'][$id] = $ns['name'];
if ( isset( $ns['gender'] ) ) {
$this->globals['wgExtraGenderNamespaces'][$id] = $ns['gender'];
}
// we don't want to fail here if $wgObjectCaches is not configured
// properly for APC setup
try {
- $this->cache = ObjectCache::newAccelerator( array() );
+ $this->cache = ObjectCache::newAccelerator();
} catch ( MWException $e ) {
$this->cache = new EmptyBagOStuff();
}
$this->setHeaders();
$this->outputHeader();
+ # Form (.mw-searchInput enables suggestions)
$form = new HTMLForm( array(
'Page1' => array(
'type' => 'text',
'name' => 'page1',
+ 'cssclass' => 'mw-searchInput',
'label-message' => 'compare-page1',
'size' => '40',
'section' => 'page1',
'Page2' => array(
'type' => 'text',
'name' => 'page2',
+ 'cssclass' => 'mw-searchInput',
'label-message' => 'compare-page2',
'size' => '40',
'section' => 'page2',
* @throws UserNotLoggedIn
*/
function execute( $code ) {
+ // Ignore things like master queries/connections on GET requests.
+ // It's very convenient to just allow formless link usage.
+ Profiler::instance()->getTransactionProfiler()->resetExpectations();
+
$this->setHeaders();
$this->checkReadOnly();
}
function execute( $code ) {
+ // Ignore things like master queries/connections on GET requests.
+ // It's very convenient to just allow formless link usage.
+ Profiler::instance()->getTransactionProfiler()->resetExpectations();
+
$this->setHeaders();
$this->checkReadOnly();
$this->checkPermissions();
*/
private function getWatchlist() {
$list = array();
- $dbr = wfGetDB( DB_MASTER );
+
+ $index = $this->getRequest()->wasPosted() ? DB_MASTER : DB_SLAVE;
+ $dbr = wfGetDB( $index );
$res = $dbr->select(
'watchlist',
);
if ( $res->numRows() > 0 ) {
+ /** @var Title[] $titles */
$titles = array();
foreach ( $res as $row ) {
$title = Title::makeTitleSafe( $row->wl_namespace, $row->wl_title );
$permErrors = $this->oldTitle->getUserPermissionsErrors( 'move', $user );
if ( count( $permErrors ) ) {
// Auto-block user's IP if the account was "hard" blocked
- $user->spreadAnyEditBlock();
+ DeferredUpdates::addCallableUpdate( function() use ( $user ) {
+ $user->spreadAnyEditBlock();
+ } );
throw new PermissionsError( 'move', $permErrors );
}
if ( $file ) {
$wikiText = file_get_contents( $file );
if ( substr( $file, -4 ) === '.txt' ) {
- $wikiText = Html::element( 'pre', array(), $wikiText );
+ $wikiText = Html::element(
+ 'pre',
+ array(
+ 'lang' => 'en',
+ 'dir' => 'ltr',
+ ),
+ $wikiText
+ );
}
}
}
$file = $this->getExtLicenseFileName( dirname( $extNode['path'] ) );
if ( $file ) {
$wikiText = file_get_contents( $file );
- $wikiText = "<pre>$wikiText</pre>";
+ $wikiText = Html::element(
+ 'pre',
+ array(
+ 'lang' => 'en',
+ 'dir' => 'ltr',
+ ),
+ $wikiText
+ );
}
}
* @author Antoine Musso "<hashar at free dot fr>", Aaron Schulz
*/
+use IPSet\IPSet;
+
// Some regex definition to "play" with IP address and IP address blocks
// An IPv4 address is made of 4 bytes from x00 to xFF which is d0 to d255
* @throws MWException
*/
protected static function singleton() {
- global $wgHKDFAlgorithm, $wgHKDFSecret, $wgSecretKey;
+ global $wgHKDFAlgorithm, $wgHKDFSecret, $wgSecretKey, $wgMainCacheType;
$secret = $wgHKDFSecret ?: $wgSecretKey;
if ( !$secret ) {
$context[] = gethostname();
// Setup salt cache. Use APC, or fallback to the main cache if it isn't setup
- try {
- $cache = ObjectCache::newAccelerator( array() );
- } catch ( Exception $e ) {
- $cache = wfGetMainCache();
- }
+ $cache = ObjectCache::newAccelerator( $wgMainCacheType );
if ( is_null( self::$singleton ) ) {
self::$singleton = new self( $secret, $wgHKDFAlgorithm, $cache, $context );
$cache = null;
if ( ( $flags & self::QUICK_VOLATILE ) && PHP_SAPI !== 'cli' ) {
try {
- $cache = ObjectCache::newAccelerator( array() );
+ $cache = ObjectCache::newAccelerator();
} catch ( Exception $e ) {
// not supported
}
* @return bool
*/
function isMultibyte( $str ) {
- return (bool)preg_match( '/[\x80-\xff]/', $str );
+ return strlen( $str ) !== mb_strlen( $str );
}
/**
"databaseerror-error": "Хэукъоныгъэ: $1",
"laggedslavemode": "<strong>Сакъ:</strong> НэкIубгъом имылъын лъэкIыщт хэIэзэныкIэмэ ащыщ.",
"readonly": "Датэбазэр гъэпытагъэ",
- "missingarticle-diff": "(Зэгъпш: $1, $2)",
+ "missingarticle-rev": "(версиеу № $1)",
+ "missingarticle-diff": "(Зэгъапш: $1, $2)",
"internalerror": "ЫкIоцI хэукъоныгъэ",
- "internalerror_info": "ЫкIоÑ\86I Ñ\85Ñ\8dÑ\83кÑ\8aонÑ\8bгъэ: $1",
+ "internalerror_info": "ЫкIоÑ\86I Ñ\84Ñ\8bкÑ\8aÑ\83агъэ: $1",
"filecopyerror": "\"$1\"-файлыр \"$2\"-м копи шIын лъэкIыгъэп.",
"filerenameerror": "Файлэу \"$1\" ыц1э \"$2\" фэдэу хъожьын лъэкIырэп.",
"filedeleteerror": "Файлэу \"$1\" тегъэкIын лъэкIырэп.",
"userlogin-yourname": "НэбгырацӀэр",
"userlogin-yourname-ph": "Итх уи нэбгырацIэ",
"createacct-another-username-ph": "Итх уи нэбгырацӀэр",
- "yourpassword": "Шъэфыгъэ:",
+ "yourpassword": "ШъэфгущыI:",
"userlogin-yourpassword": "ШъэфгущыI",
"userlogin-yourpassword-ph": "Уи шъэфгущыIэ итх",
"createacct-yourpassword-ph": "Къэтх шъэфгущыIэ горэ",
"gotaccount": "Аккаунт уиӏаха? $1.",
"gotaccountlink": "Системэм хахь",
"userlogin-resetlink": "Уи хэхьан датэхэр пщыгъупшагъа?",
- "userlogin-resetpassword-link": "Уипаролыр пщыгъупшагъа?",
+ "userlogin-resetpassword-link": "УишъэфгущыIэр пщыгъупшагъа?",
"userlogin-helplink2": "Системэм сыхэхьанэу къыздеӏ",
"userlogin-createanother": "НэмыкI аккаунт къэубл",
"createacct-emailrequired": "Емэйл адрес",
"createacct-benefit-body1": "{{PLURAL:$1|еӀэзэныгъэ|еӀэзэныгъ}}",
"createacct-benefit-body2": "{{PLURAL:$1|нэкӀубгъо|нэкӀубгъу}}",
"createacct-benefit-body3": "бэмышӀэу {{PLURAL:$1|хэлэжьакӀу|хэлэжьакӀо}}",
+ "badretype": "ШъэфгущыIэу ибгъэхьагъэхэр зэтефэрэп.",
"userexists": "Ибгъэхьэгъэ нэбгырацIэр агъэфедэ.\nНэмыкI цIэ горэ къыхэхба.",
"loginerror": "Системэ хэхьаныгъэр къуанчэ",
"createacct-error": "Аккаунт къэублэныгъэ къончагъ",
"nouserspecified": "НэбгырацIэр птхын фае.",
"wrongpassword": "ШъэфгущыIэр тэрэзэп.\nДжыри зэ еплъ.",
"wrongpasswordempty": "ШъэфгущыIэр нэкIы.\nДжыри зэ еплъ.",
+ "passwordtooshort": "ШъэфгущыIэр мыхъуми {{PLURAL:$1|1 символ |символ $1}} хъун фае.",
"password-name-match": "Уи шъэфгущыIэр уи нэбгырацIэм фэдапэ хъущтэп.",
"mailmypassword": "Зэтедз шъэфгущыIэр",
"noemailcreate": "Емэйл тэрэз птхын фае.",
"mailerror": "Емэйл егъэхьыныр къуанчэ: $1",
+ "emailauthenticated": "Уи емэйл адресыр уплъэкIужьыгъы, мафэр $2, уахъэр $3",
"emailconfirmlink": "Тегъэпытыхь уи емэйл адресыр",
"emaildisabled": "Мы сайтым емэйлхэр ыгъэхьын лъэкIырэп.",
"accountcreated": "Аккаунтыр ублагъэ",
"pt-userlogout": "ХэкӀыжь системэм",
"php-mail-error-unknown": "PHP-функциеу mail()-м къончагъэ горэ иI.",
"user-mail-no-addy": "Емэйл адрес имыIэу емэйл аригъэхьынэу фэягъ.",
+ "user-mail-no-body": "Емэйл ебгъэхьынэу уфаягъ, нэкIэу е мэхьанэнчъэ кIакоу.",
"changepassword": "ШъэфгущыIэр зэблэхъу",
+ "resetpass_announce": "Системэ хэхьаныр зэшIобгъэкIынэу, шъэфгущыIакIэ бгъэпсын фае.",
"resetpass_header": "Аккаунтым и шъэфгущыIэр зэблэхъу",
"oldpassword": "ШъэфгущыIэжъыр:",
"newpassword": "ШъэфгущыIакIэр:",
"resetpass-no-info": "Мы нэкIубгъом занкIэу укIонэу уфаемэ, системэм ухэхьэгъэн фае.",
"resetpass-submit-loggedin": "ШъэфгущыIэр зэблэхъу",
"resetpass-submit-cancel": "Ыуж икӀ",
+ "resetpass-recycled": "УишъэфгущыIэр зэтедзба джырэм фэмыдэу.",
"resetpass-expired": "ШъэфгущыIэм и зэман икIыгъ. ШъэфгущыIакIэ горэ гъэпсба.",
- "passwordreset": "Зэтедз паролыр",
+ "passwordreset": "Зэтедз шъэфгущыIэр",
"passwordreset-disabled": "Мы виким шъэфгущыIэр щызэтебдзэшъущтэп.",
"passwordreset-emaildisabled": "Мы виким емэйл-Iофыгъохэр щылажьэхэрэп.",
"passwordreset-username": "НэбгырацIэ:",
"passwordreset-emailtitle": "Аккаунт и гъэпсыкIэхэр, мий щыI {{SITENAME}}",
"passwordreset-emailelement": "НэбгырацIэ: $1\nTemporary password: $2",
"passwordreset-emailsent": "ШъэфгущыIэм и зэтедзым пае емэйл агъэхьыгъ.",
+ "passwordreset-emailsent-capture": "ШъэфгущыIэм изэтедз фэгъэхьыгъэ емэйлыр гъахьыгъэ, ычIэгъкIэ ар олъэгъу.",
"changeemail": "Зэблэхъу емэйл адресыр",
"changeemail-oldemail": "Джырэ емэйл адрес:",
"changeemail-newemail": "Емэйл адресыкIэр:",
"revdelete-hide-user": "ЕIэзакIом и нэбгырацI/IP-адрес",
"revdelete-radio-same": "(зэблэмыхъу)",
"revdelete-radio-set": "(гъэбылъыгъэ)",
+ "revdelete-radio-unset": "Плъэгъушъунэу",
"revdelete-log": "ЗыпкъырыкIырэр:",
"revdel-restore": "плъэгъушъущтыр зэблэхъу",
"pagehist": "НэкIубгъом и тарихъ",
"deletedhist": "ТегъэкIыгъэмэ я тарихъ",
"revdelete-reasonotherlist": "ПэмыкI къызпкъырыкIрэр",
"revdelete-offender": "Версием и аутор:",
+ "mergehistory": "НэкIубгъомэ ятарихъхэр зэпыдз",
+ "mergehistory-box": "НэкIубгъуитIум ятарихъхэр зэпыдзэх:",
"mergehistory-from": "Лъапсэ нэкIубгъор:",
"mergehistory-into": "ЗыдакIорэ нэкIубгъор:",
"mergehistory-go": "Зэпыбдзэшъурэ еIэзэнхэр къэгъэлъагъу",
"prefs-tokenwatchlist": "Токен",
"email-address-validity-valid": "Емэйл адресыр тэрэзым фэд",
"email-address-validity-invalid": "Емэйл адрес тэрэз итх",
+ "userrights-lookup-user": "Нэбгырэмэ якупхэр гъэпс",
"userrights-user-editname": "Итх уи нэбгырацӀэр:",
"editusergroup": "Нэбгырэмэ я купмэ яIаз",
"userrights-editusergroup": "Нэбгырэмэ я купмэ яIаз",
+ "userrights-groupsmember": "Мы купмэ ахахьэ:",
"userrights-reason": "ЗыпкъырыкIырэр:",
+ "userrights-nodatabase": "Датэбазэу $1 щыIэп е хьанэгъунэу щытэп.",
"userrights-changeable-col": "Купхэу узхэIэзыхьашъущтхэр",
"userrights-unchangeable-col": "Купхэу узхэМыIэзыхьашъущтхэр",
"group": "Куп:",
"right-createtalk": "ТегущыIэнэ нэкIубгъохэр шIы",
"right-createaccount": "Нэбгырэмэ я аккаунт кIэхэр шIы",
"right-minoredit": "ЕIэзэнхэр цIыкIухэу гъэнафэх",
- "right-move": "Ð¥Ñ\8cÑ\8bÑ\85 нÑ\8dкIÑ\83бгÑ\8aоÑ\85Ñ\8dÑ\80",
+ "right-move": "Ð\9dÑ\8dкIÑ\83бгÑ\8aомÑ\8d аÑ\86IÑ\8dÑ\85Ñ\8dÑ\80 Ñ\85Ñ\8aожÑ\8c",
"right-move-subpages": "Хьых нэкIубгъохэмрэ кIэтнэкIубгъохэмрэ",
"right-move-categorypages": "Хьы категорием и нэкIубгъохэр",
- "right-movefile": "Ð¥Ñ\8cÑ\8b Ñ\84айлÑ\85Ñ\8dÑ\80",
+ "right-movefile": "ФайлÑ\8dмÑ\8d аÑ\86IÑ\8dÑ\85Ñ\8dÑ\80 Ñ\85Ñ\8aожÑ\8c",
"right-upload": "Файлыр илъхь",
"right-reupload": "ЩыIэ файлхэм ашъхьэтетхэн",
+ "right-upload_by_url": "URL-м файлэхэр къищых",
"right-writeapi": "Итхэным пае API игъэфедэн",
"right-delete": "ТегъэкI нэкIбгъохэр",
"right-bigdelete": "ТегъэкI нэкIубгъохэр тарихъ кIахь зиIэ",
+ "right-browsearchive": "ТегъэкIыжьыгъэ нэкIубгъомэ алъыхъу",
"right-undelete": "ТемыгъэкI нэкIубгъор",
+ "right-viewsuppressed": "ЗэкIэмэ ашIогъэбылъыгъэ версиемэ яплъ",
"right-editcontentmodel": "НэкIубгъом и кIоцIырытым и модел зэблэхъун",
"right-editinterface": "Нэбгырэ-интерфейсым еIэзэн",
"right-editusercssjs": "НэмыкI нэбгырэмэ я CSS, JavaScript файлэмэ яIэзэн",
"right-editmyusercss": "Уи CSS файлэмэ яIэзэн",
"right-editmyuserjs": "Уи JavaScript файлэмэ яIэзэн",
"right-viewmywatchlist": "Уи лъыплъэ купым еплъ",
+ "right-editmyoptions": "УигъэпсыкIэмэ яIаз",
+ "right-unwatchedpages": "Зылъымыплъэрэ нэкIубгъо купым еплъ",
+ "right-mergehistory": "НэкIубгъомэ ятарихъхэр зэпыдзэх",
+ "right-sendemail": "НэмыкIмэ емэйл афегъэхь",
+ "right-passwordreset": "ШъэфгущыIэм фэгъэхьыгъэ емэйлхэм яплъ",
"newuserlogpage": "ХэлэжьакӀомэ яублэн лог",
"action-read": "едж мы нэкIубгъом",
"action-edit": "мы нэкIубгъом еIаз",
"action-createaccount": "мы нэбгырэм и аккаунт ублэн",
"action-history": "мы нэкIубгъом и тарихъым еплъын",
"action-minoredit": "мы еIэзэныгъэр цIыкIоу гъэнаф",
- "action-move": "хьы мы нэкӀубгъор",
+ "action-move": "мы нэкIубгъом ыцIэ хъожь",
"action-move-subpages": "хьы мы нэкIубгъори, кIэтнэкIубгъохэри",
"action-move-categorypages": "хьы категорием и нэкIубгъохэр",
"action-movefile": "хьы мы файлыр",
"minlength1": "ФайлэцIэр зы буквэу щытын фае мыхъуми.",
"filename-toolong": "ФайлыцIэр байт 240 нахьыбэ хъун лъэкIыщтэп.",
"badfilename": "ФайлыцIэр хъожьыгъэ мыщкIэ \"$1\".",
+ "filetype-missing": "Мы файлым зэхэщьыгъэ пари еIэп (\".jpg\" фэдэу).",
"empty-file": "Ебгъэхьыгъэ файлыр нэкIы.",
"file-too-large": "Ебгъэхьыгъэ файлыр иныщэ.",
"filename-tooshort": "ФайлыцIэр кIэкуащэ.",
"sourcefilename": "Лъэпсэ файлым ыцI:",
"sourceurl": "Лъэпсэ URL:",
"destfilename": "ЗдакIорэ файлым цыI:",
+ "upload-maxfilesize": "Файлым иинагъэ максимум: $1",
"upload-description": "Файлым и къэбар",
"upload-options": "Илъхьан гъэпсыкIэхэр",
"watchthisupload": "Мы файлым лъыплъ",
"license-nopreview": "(Ыпэтеплъэр гъэпсыгъэп)",
"upload_source_file": "(къыхэпхыгъэ файлыр уи компьютер щыщ)",
"listfiles-delete": "ТегъэкI",
+ "listfiles_search_for": "ФайлыцIэмкIэ лыхъу:",
"imgfile": "файл",
"file-anchor-link": "Файл",
"filehist": "Файл тарихъ",
"nolinkstoimage": "Мыщ къэзыщэу нэкӀубгъо пари щыӀэп.",
"sharedupload-desc-here": "Мы файлыр мыщ къикIыгъ $1 ыкIи нэмыкI проектхэм ащыгъэфедэн лъэкIыщт.\nИнформациеу [$2 файлым и гурыIон-тхыгъэм] щыщыр ычIэгъкIэ щыт.",
"upload-disallowed-here": "Мы файлым ухэӀэзахьыжьын уфитэп.",
+ "mimesearch": "MIME лъыхъун",
+ "mimetype": "MIME-тип",
"randompage": "ОшӀэдэмышӀэ нэкӀубгъу",
+ "randomincategory-category": "Категорие:",
+ "randomincategory-legend": "Категорием щыщэу ошIэдэмышIэ нэкIубгъу",
+ "randomincategory-submit": "КӀо",
+ "statistics": "Статистикэ",
+ "statistics-header-pages": "Нэк1убгъо статистикэ",
+ "statistics-header-edits": "ЕIэзэнхэм ястатистикэ",
+ "statistics-header-users": "Нэбгырэмэ ястатистикэ",
+ "statistics-header-hooks": "НэмыкI статистикэ",
+ "statistics-pages": "НэкӀубгъохэр",
"statistics-files": "Илъхьэгъэ файлэхэр",
+ "pageswithprop-submit": "КӀо",
+ "brokenredirects-edit": "еӀаз",
+ "brokenredirects-delete": "тегъэкI",
+ "withoutinterwiki-submit": "Къэгъэлъагъу",
"nbytes": "$1{{PLURAL:$1|байт|байтхэр}}",
"nmembers": "$1 {{PLURAL:$1|объект|объектхэр}}",
+ "uncategorizedcategories": "Категорие мыхьыгъэ категориехэр",
+ "uncategorizedimages": "Категорие мыхьыгъэ файлхэр",
+ "uncategorizedtemplates": "Категорие мыхьыгъэ шапхъэхэр",
+ "unusedcategories": "Мыгъэсэбэпыгъэ категориехэр",
+ "unusedimages": "Мыгъэсэбэпыгъэ файлхэр",
+ "wantedcategories": "ИщыкIэгъэ категориехэр",
+ "wantedpages": "ИщыкIэгъэ нэкIубгъохэр",
+ "wantedfiles": "ИщыкIэгъэ файлхэр",
+ "wantedtemplates": "ИщыкIэгъэ шапхъэхэр",
+ "mostlinked": "Нахьыбэу зыдащэрэ нэкIубгъохэр",
+ "mostlinkedcategories": "Нахьыбэу зыдащэрэ категориехэр",
+ "mostcategories": "Категорие нахьыбэ зиIэ нэкIубгъохэр",
+ "mostimages": "Нахьыбэу зыдащэрэ файлхэр",
+ "shortpages": "НэкIубгъо кIакIохэр",
+ "longpages": "НэкIубгъо кIахьхэр",
+ "protectedpages-page": "НэкӀубгъо",
+ "protectedpages-reason": "ЗыпкъырыкIырэр",
+ "protectedpages-unknown-timestamp": "ЗэхэмышIыкIыгъэ",
"newpages": "НэкӀубгъуакӀэхэр",
+ "newpages-username": "НэбгырацIэ:",
+ "ancientpages": "Жъыдэдэ нэкIубгъохэр",
"move": "Хьы",
+ "movethispage": "ЫцIэ зэблэхъу мы нэкIубгъом",
"pager-older-n": "{{PLURAL:$1|нахьыжъэу 1|нахьыжъхэу $1}}",
"booksources": "Тхылъхэр къыздикӀыгъэхэр",
"booksources-search-legend": "Тхылъ лъапсэхэм алъыхъу",
"booksources-search": "Лъыхъу",
"log": "Логхэр",
+ "log-title-wildcard": "Мы символхэмкIэ къежьэрэ нэкIубгъуацIэмэ алъыхъу",
"allpages": "НэкIубгъо пстэур",
"prevpage": "Ыпэит нэкубгъор ($1)",
"allarticles": "НэкӀубгъо пстэур",
"allpagessubmit": "KӀо",
"categories": "Категориехэр",
+ "linksearch-ok": "Лъыхъу",
+ "noemailtitle": "Емэйл адресыр щыIэп",
+ "emailusername": "НэбгырацIэ:",
+ "emailusernamesubmit": "Егъэхь",
+ "emailsend": "Егъэхь",
+ "emailsent": "Емэйлыр гъахьыгъэ",
+ "emailsenttext": "Уиемэйлыр моу джы гъахьыгъэ.",
+ "watchlist": "Лъыплъэ куп",
"mywatchlist": "Лъыплъэ куп",
+ "watchlistfor2": "$1 $2 пае",
+ "watchnologin": "Системэм хэхьагъэп",
+ "addwatch": "Лъыплъэ купым хэгъахъу",
+ "removewatch": "Лъыплъэ купым хэгъэкI",
+ "removedwatchtext-short": "НэкIубгъоу \"$1\" лъыплъэ купым хэгъэкIыгъэ.",
"watch": "Лъыплъ",
+ "watchthispage": "Мы нэкӀубгъом лъыплъ",
"unwatch": "Лъымыплъэжь",
+ "unwatchthispage": "Лъыплъэныр щыгъэт",
"watching": "Лъыплъ...",
"unwatching": "Лъымплъэжь...",
- "enotif_impersonal_salutation": "{{SITENAME}} хэлэжьакIо",
+ "enotif_impersonal_salutation": "{{SITENAME}} инэбгырэ",
"enotif_anon_editor": "ТымышӀэрэ нэбгыр $1",
"created": "къагъэхъуыгъ",
"changed": "зэблэхъугъэ",
- "deletepage": "ТегъэкI нэкIбгъор",
+ "deletepage": "ТегъэкI нэкIубгъор",
"confirm": "Теубыт",
"excontent": "дэтхэгъагъэр: \"$1\"",
"excontentauthor": "дэтхэгъагъэр: \"$1\" (хэлэжьэкIо закъоэр \"[[Special:Contributions/$2|$2]]\")",
"sp-contributions-newbies": "Аккаунт кШэ закъомэ я лэжьыгъэр къэгъэлъагъу",
"sp-contributions-newbies-sub": "Аккаунт кIэмэ апай",
"sp-contributions-logs": "Логхэр",
- "sp-contributions-talk": "гущыIэ",
+ "sp-contributions-talk": "тегущыI",
"sp-contributions-username": "IP-адрес е нэбгырацIэ:",
"sp-contributions-submit": "Лъыхъу",
"whatlinkshere": "Мы нэкӀубгъом къэзыщэрэ зэпыщэхэр",
"whatlinkshere-hideredirs": "$1 гъэкӀожьын",
"whatlinkshere-hidelinks": "$1 зэпыщ",
"whatlinkshere-filters": "Филтрэхэр",
+ "ipaddressorusername": "IP-адрес е нэбгырацIэ:",
+ "ipbreason": "ЗыпкъырыкIырэр:",
+ "ipbemailban": "Нэбгырэм емэйл ымыгъэхьышъунэу шIы",
"ipboptions": "сыхьатитIу:2 hours, зымаф:1 day,мэфищ:3 days, зытхьамаф:1 week, тхьамафитӀу:2 weeks, зымаз:1 month, мэзищ:3 months, мэзих:6 months, зыилъэс:1 year, ренэу:infinite",
+ "badipaddress": "IP адрес фыкъуагъэ",
+ "blocklist-reason": "ЗыпкъырыкIырэр",
+ "ipblocklist-submit": "Лъыхъу",
+ "ipblocklist-empty": "Блок купыр нэкIы.",
"blocklink": "егъэт",
"unblocklink": "Ӏухъотещ",
"change-blocklink": "Ӏухъор зэблэхъу",
"show-big-image-preview": "Мыщ и ыпэтеплъэм иинагъэр: $1.",
"show-big-image-other": "НэпэмыкI {{PLURAL:$2|зэхэщыкIэ|зэхэщыкIэхэр}}: $1.",
"show-big-image-size": "Пиксел $1 × $2",
+ "ilsubmit": "Лъыхъу",
"bad_image_list": "Форматыр зэрщытыр:\n\nГулытэ зиӀэныр тхылъым и тамыгъэхэм (сатыр тамыгъэ * къежьэхэр).\nСатырым и техьэпӀэ япэрем сурэт иплъхьэ мыхъуным и техьэпӀэ иӀэн фай.\nЯужы ит техьэпӀэхэр хэгъэкӀа фэдэу къилъытэну, сурэтыр здиплъэ хъуну тхыгъэхэр.",
"metadata": "Метадатэр",
"exif-orientation": "Кадрым и ориентацие",
"exif-orientation-1": "Тэрэз",
"namespacesall": "зэкӀэ",
"monthsall": "зэкӀэ",
+ "fileduplicatesearch-submit": "Лъыхъу",
"specialpages": "ЯӀамышӀыкӀ нэкӀубгъохэр",
+ "specialpages-group-login": "Къыхахь / аккаунт къэубл",
"tag-filter": "[[Special:Tags|Tag]] филтрэр:",
"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Гъэнэфалъ|Гъэнэфалъэхэр}}]]: $2)",
"logentry-delete-delete": "$3 нэкӀубгъор $1 {{GENDER:$2|Ӏыгъ}}",
"logentry-newusers-create": "ХэлэжьэкIо аккаунтэу $1 {{GENDER:$2|ублагъэ}}",
"logentry-upload-upload": "$1 {{GENDER:$2|къырищыгъ}} $3",
"searchsuggest-search": "Лъыхъу",
- "api-error-badtoken": "ЫкIоцI фыкъуагъэ: Токен дэй."
+ "api-error-badtoken": "ЫкIоцI фыкъуагъэ: Токен дэй.",
+ "api-error-empty-file": "Ебгъэхьыгъэ файлыр нэкIы.",
+ "expand_templates_input": "Ихьэрэ текст:",
+ "expand_templates_output": "Резултат",
+ "expand_templates_xml_output": "XML къикIырэр",
+ "expand_templates_ok": "Хъун",
+ "expand_templates_remove_comments": "ТегъэкI комментхэр",
+ "expand_templates_preview": "Ыпэтеплъ",
+ "pagelanguage": "НэкIубгъом ыбзэ къыхэх",
+ "pagelang-name": "НэкӀубгъо",
+ "pagelang-language": "Бзэ",
+ "pagelang-select-lang": "Бзэр къыхэх",
+ "right-pagelang": "НэкIубгъом ыбзэр зэблэхъу",
+ "action-pagelang": "мы нэкIубгъом ыбзэ зэблэхъу",
+ "log-name-pagelang": "Бзэ зэблэхъунхэм я журнал",
+ "mediastatistics-table-mimetype": "MIME-тип",
+ "mediastatistics-table-count": "Файл пчъагъэр",
+ "mediastatistics-table-totalbytes": "Пстэум ионтэгъугъэ",
+ "mediastatistics-header-unknown": "ЗэхэмышIыкIыгъэ",
+ "mediastatistics-header-drawing": "Сурэтхэр (вектор сурэтхэр)",
+ "mediastatistics-header-audio": "Мэкъамэ",
+ "mediastatistics-header-video": "Видео",
+ "mediastatistics-header-multimedia": "Мултимедиэ",
+ "mediastatistics-header-office": "Офис",
+ "mediastatistics-header-text": "Текстхэр",
+ "mediastatistics-header-archive": "Фызыгъэ форматхэр",
+ "json-error-state-mismatch": "Мыхъун е фыкъуэгъэ JSON",
+ "json-error-syntax": "Синтакс къончагъэ",
+ "headline-anchor-title": "Мы секцием къэзыщэрэ зэпыщ",
+ "special-characters-group-latin": "Латин",
+ "special-characters-group-latinextended": "Латин зэхэщыгъэ",
+ "special-characters-group-ipa": "ДФА",
+ "special-characters-group-symbols": "Символхэр",
+ "special-characters-group-greek": "Урым",
+ "special-characters-group-cyrillic": "Кирилл",
+ "special-characters-group-arabic": "Арап",
+ "special-characters-group-arabicextended": "Арап зэхэщыгъэ",
+ "special-characters-group-persian": "Перс",
+ "special-characters-group-hebrew": "Джурт",
+ "special-characters-group-bangla": "Бенгал",
+ "special-characters-group-tamil": "Тамил",
+ "special-characters-group-telugu": "Телугу",
+ "special-characters-group-sinhala": "Сингал",
+ "special-characters-group-gujarati": "Гуджарати",
+ "special-characters-group-devanagari": "Деванагари",
+ "special-characters-group-thai": "Тай",
+ "special-characters-group-lao": "Лао",
+ "special-characters-group-khmer": "Кхмер",
+ "special-characters-title-endash": "ыку-тире",
+ "special-characters-title-emdash": "тире кIахь",
+ "special-characters-title-minus": "минус символ",
+ "mw-widgets-dateinput-no-date": "Мафэр гъэнэфагъэп",
+ "mw-widgets-titleinput-description-new-page": "нэкIубгъор джыри щыIэп",
+ "mw-widgets-titleinput-description-redirect": "гъакIо мыкIэ $1"
}
"navigation-heading": "Navigasie-keuseskerm",
"errorpagetitle": "Fout",
"returnto": "Keer terug na $1.",
- "tagline": "in {{SITENAME}}",
+ "tagline": "Vanaf {{SITENAME}}",
"help": "Hulp",
"search": "Soek",
"searchbutton": "Soek",
"go": "Wys",
"searcharticle": "Wys",
- "history": "Ouer weergawes",
+ "history": "Bladsygeskiedenis",
"history_short": "Geskiedenis",
"updatedmarker": "opgedateer sedert my laaste besoek",
"printableversion": "Drukbare weergawe",
"aboutsite": "Inligting oor {{SITENAME}}",
"aboutpage": "Project:Omtrent",
"copyright": "Inhoud is onderhewig aan $1, tensy anders vermeld",
- "copyrightpage": "{{ns:project}}:kopiereg",
+ "copyrightpage": "{{ns:project}}:Kopieregte",
"currentevents": "Huidige gebeure",
"currentevents-url": "Project:Huidige gebeure",
"disclaimers": "Voorbehoud",
"feed-invalid": "Voertipe word nie ondersteun nie.",
"feed-unavailable": "Sindikasievoer is nie beskikbaar",
"site-rss-feed": "$1 RSS-voer",
- "site-atom-feed": "$1 Atom-voer",
+ "site-atom-feed": "$1 Atoomvoer",
"page-rss-feed": "\"$1\" RSS-voer",
- "page-atom-feed": "\"$1\" Atom-voer",
+ "page-atom-feed": "\"$1\" Atoomvoer",
"red-link-title": "$1 (bladsy bestaan nie)",
"sort-descending": "Sorteer aflopend",
"sort-ascending": "Sorteer oplopend",
"changeemail-password": "U wagwoord vir {{SITENAME}}:",
"changeemail-submit": "Wysig E-posadres",
"resettokens-token-label": "$1 (huidige waarde: $2)",
- "bold_sample": "Vetgedrukte teks",
+ "bold_sample": "Vetdruk",
"bold_tip": "Vetdruk",
"italic_sample": "Skuinsgedrukte teks",
"italic_tip": "Skuinsdruk",
"nowiki_sample": "Plaas ongeformatteerde teks hier",
"nowiki_tip": "Ignoreer wiki-formattering",
"image_sample": "Voorbeeld.jpg",
- "image_tip": "Beeld/prentjie/diagram",
+ "image_tip": "Medialêer",
"media_sample": "Voorbeeld.ogg",
- "media_tip": "Skakel na ander tipe medialêer",
+ "media_tip": "Lêerskakel",
"sig_tip": "Handtekening met datum",
"hr_tip": "Horisontale streep (selde nodig)",
"summary": "Opsomming:",
"viewpagelogs": "Bekyk logboeke vir hierdie bladsy",
"nohistory": "Daar is geen wysigingsgeskiedenis vir hierdie bladsy nie.",
"currentrev": "Huidige wysiging",
- "currentrev-asof": "Huidige wysiging per $1",
+ "currentrev-asof": "Huidige wysiging sedert $1",
"revisionasof": "Wysiging soos op $1",
- "revision-info": "Weergawe deur {{GENDER:$6|$2}} op $4 om $5$7",
+ "revision-info": "Weergawe deur {{GENDER:$6|$2}} op $1$7",
"previousrevision": "← Ouer weergawe",
"nextrevision": "Nuwer weergawe →",
"currentrevisionlink": "Huidige weergawe",
"mergelog": "Versmeltingslogboek",
"revertmerge": "Samesmelting ongedaan maak",
"mergelogpagetext": "Hieronder is 'n lys van die mees onlangse versmeltings van een bladsy se geskiedenis na 'n ander.",
- "history-title": "$1: weergawegeskiedenis",
- "difference-title": "$1: verskil tussen weergawes",
+ "history-title": "Weergawegeskiedenis van \"$1\"",
+ "difference-title": "Verskil tussen weergawes van \"$1\"",
"difference-title-multipage": "$1 en $2: verskil tussen bladsye",
"difference-multipage": "(Verskil tussen bladsye)",
"lineno": "Lyn $1:",
"showhideselectedversions": "Wys/versteek gekose weergawes",
"editundo": "maak ongedaan",
"diff-empty": "(Geen verskil)",
+ "diff-multi-sameuser": "({{PLURAL:$1|Een tussenin wysiging|$1 tussenin wysigings}} deur dieselfde gebruiker nie gewys nie)",
"diff-multi-manyusers": "({{PLURAL:$1|Een tussenin wysiging|$1 tussenin wysigings}} deur meer as $2 {{PLURAL:$2|gebruiker|gebruikers}} nie gewys nie)",
"difference-missing-revision": "{{PLURAL:$2|'n Weergawe|$2 weergawes}} van die verskil ($1) {{PLURAL:$2|is|is}} nie gevind nie.\n\nDit word meestal veroorsaak deur die volg van 'n verouderde verwysing na 'n bladsy wat verwyder is.\nDetails kan in die [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} skraplogboek] gevind word.",
"searchresults": "Soekresultate",
"right-override-export-depth": "Eksporteer bladsye insluitend geskakelde bladsye tot 'n diepte van 5",
"right-sendemail": "Stuur e-pos aan ander gebruikers",
"right-passwordreset": "Wys e-posse vir herstel van wagwoord",
- "newuserlogpage": "Logboek van nuwe gebruikers",
+ "newuserlogpage": "Boekstaaf van nuwe gebruikers",
"newuserlogpagetext": "Dit is 'n logboek van gebruikers wat onlangs ingeteken het.",
"rightslog": "Gebruikersregtelogboek",
"rightslogtext": "Hier onder is die logboek van gebruikersregte wat verander is.",
"imagelinks": "Lêergebruik",
"linkstoimage": "Die volgende {{PLURAL:$1|bladsy|$1 bladsye}} gebruik hierdie prent:",
"linkstoimage-more": "Daar is meer as $1 {{PLURAL:$1|skakel|skakels}} na hierdie lêer.\nDie volgende lys vertoon slegs die eerste {{PLURAL:$1|skakel|$1 skakels}} wat na die lêer verwys.\n'n [[Special:WhatLinksHere/$2|Volledige lys]] is ook beskikbaar.",
- "nolinkstoimage": "Daar is geen bladsye wat hierdie prent gebruik nie.",
+ "nolinkstoimage": "Daar is geen bladsye wat skakel na hierdie lêer nie.",
"morelinkstoimage": "Wys [[Special:WhatLinksHere/$1|meer skakels]] na die lêer.",
"linkstoimage-redirect": "$1 (lêeraanstuur) $2",
"duplicatesoffile": "Die volgende {{PLURAL:$1|lêer is 'n duplikaat|$1 lêers is duplikate}} van die lêer ([[Special:FileDuplicateSearch/$2|meer details]]):",
"booksources-invalid-isbn": "Die ingevoerde ISBN-kode blyk asof dit ongeldig is; maak asseblief seker dat u dit sonder fout oorgekopiëer het vanaf die oorspronklike bron.",
"specialloguserlabel": "Uitvoerende gebruiker:",
"speciallogtitlelabel": "Teiken (bladsy of gebruiker):",
- "log": "Logboeke",
+ "log": "Boekstawe",
"all-logs-page": "Alle openbare logboeke",
"alllogstext": "Vertoon 'n samestelling van alle boekstawings van {{SITENAME}}.\nU kan die resultate vernou deur 'n boekstaaftipe, gebruikersnaam (kas-sensitief) of spesifieke blad (ook kas-sensitief) te kies.",
"logempty": "Geen inskrywings in die logboek voldoen aan die kriteria nie.",
"emailuser": "Stuur e-pos na hierdie gebruiker",
"emailuser-title-target": "E-pos die {{GENDER:$1|gebruiker}}",
"emailuser-title-notarget": "E-pos gebruiker",
- "emailpage": "Stuur e-pos na gebruiker",
"emailpagetext": "As {{GENDER:$1|dié gebruiker}} 'n geldige e-posadres in sy/haar gebruikersvoorkeure het, sal hierdie vorm 'n enkele boodskap stuur. Die e-posadres in u [[Special:Preferences|gebruikersvoorkeure]] sal verskyn as die \"Van\"-adres van die pos. Dus sal die ontvanger kan terug antwoord.",
"defemailsubject": "E-pos van {{SITENAME}}-gebruiker \"$1\"",
"usermaildisabled": "E-pos deur gebruikers is gedeaktiveer.",
"actioncomplete": "Aksie uitgevoer",
"actionfailed": "Aksie het gefaal",
"deletedtext": "\"$1\" is geskrap.\nSien die $2 vir 'n rekord van onlangse skrappings.",
- "dellogpage": "Skraplogboek",
+ "dellogpage": "Skrapboeksaaf",
"dellogpagetext": "Hier onder is 'n lys van die mees onlangse skrappings. Alle tye is bedienertyd (UGT).",
"deletionlog": "skraplogboek",
"reverted": "Het terug gegaan na vroeëre weergawe",
"delete-toobig": "Die bladsy het 'n lang wysigingsgeskiedenis, meer as $1 {{PLURAL:$1|weergawe|weergawes}}.\nVerwydering van die soort blaaie is beperk om ontwrigting van {{SITENAME}} te voorkom.",
"delete-warning-toobig": "Hierdie bladsy het 'n lang wysigingsgeskiedenis; meer as $1 {{PLURAL:$1|wysiging|wysigings}}.\nDeur weg te doen met hierdie bladsy mag dalk die werking van {{SITENAME}} versteur;\nTree asseblief versigtig op.",
"rollback": "Rol veranderinge terug",
- "rollbacklink": "Rol terug",
+ "rollbacklink": "rol terug",
"rollbacklinkcount": "rol {{PLURAL:$1|een wysiging|$1 wysigings}} terug",
"rollbacklinkcount-morethan": "rol meer as {{PLURAL:$1|een wysiging|$1 wysigings}} terug",
"rollbackfailed": "Terugrol onsuksesvol",
"rollback-success": "Wysigings deur $1 is teruggerol.\nDie laaste weergawe van $2 is teruggeplaas.",
"sessionfailure-title": "Sessie het gefaal",
"sessionfailure": "Dit lyk of daar 'n probleem met u sessie is.\nHierdie aksie is gekanselleer omdat dit 'n veiligheidsrisiko is (moontlike kaping van u sessie).\nGaan een bladsy terug, herlaai die bladsy en probeer dan weer.",
- "protectlogpage": "Beskermlogboek",
+ "protectlogpage": "Beskermingboekstaaf",
"protectlogtext": "Hieronder is 'n lys van veranderinge wat aan die beveilig van bladsye aangebring is.\nSien die [[Special:ProtectedPages|lys van beveiligde bladsye]] vir alle bladsye wat tans operasioneel beveilig is.",
"protectedarticle": "het [[$1]] beskerm",
"modifiedarticleprotection": "Die beskermingsvlak vir \"[[$1]]\" is gewysig",
"movepage-page-moved": "Die bladsy $1 is na $2 geskuif.",
"movepage-page-unmoved": "Die bladsy $1 kon nie na $2 geskuif word nie.",
"movepage-max-pages": "Die maksimum van $1 {{PLURAL:$1|bladsy|bladsye}} is geskuif. Die oorblywende bladsye na nie outomaties geskuif word nie.",
- "movelogpage": "Skuiflogboek",
+ "movelogpage": "Skuif boekstaaf",
"movelogpagetext": "Hier onder is 'n lys van geskuifde bladsye.",
"movesubpage": "{{PLURAL:$1|Subbladsy|Subbladsye}}",
"movesubpagetext": "Die {{PLURAL:$1|subbladsy|$1 subbladsye}} van hierdie blad word hieronder gewys.",
"tooltip-pt-logout": "Teken uit",
"tooltip-pt-createaccount": "U word aangemoedig om 'n gebruiker te skep en aan te meld, hoewel dit nie verpligtend is nie.",
"tooltip-ca-talk": "Bespreking oor die inhoudbladsy",
- "tooltip-ca-edit": "U kan hierdie bladsy wysig. Gebruik asseblief die voorskoufunksie vóór u dit stoor.",
+ "tooltip-ca-edit": "Wysig hierdie bladsy",
"tooltip-ca-addsection": "Begin 'n nuwe bespreking",
"tooltip-ca-viewsource": "Hierdie bladsy is beskerm. U kan die bronteks besigtig.",
"tooltip-ca-history": "Ouer weergawes van hierdie bladsy",
"tooltip-n-mainpage": "Besoek die Tuisblad",
"tooltip-n-mainpage-description": "Gaan na die tuisblad",
"tooltip-n-portal": "Meer oor die projek, wat jy kan doen, nuttige skakels",
- "tooltip-n-currentevents": "'n Plek waar almal gesellig kan verkeer",
+ "tooltip-n-currentevents": "Agtergrondinligting oor aktuele sake",
"tooltip-n-recentchanges": "'n Lys van onlangse wysigings",
"tooltip-n-randompage": "Laai 'n lukrake bladsye",
"tooltip-n-help": "Vind meer uit oor iets",
"tooltip-t-whatlinkshere": "'n Lys bladsye wat hierheen skakel",
"tooltip-t-recentchangeslinked": "Onlangse wysigings aan bladsye wat vanaf hierdie bladsy geskakel is",
"tooltip-feed-rss": "RSS-voed vir hierdie bladsy",
- "tooltip-feed-atom": "Atom-voed vir hierdie bladsy",
+ "tooltip-feed-atom": "Atoomvoer vir hierdie bladsy",
"tooltip-t-contributions": "Bekyk 'n lys van bydraes deur hierdie gebruiker",
"tooltip-t-emailuser": "Stuur 'n e-pos aan hierdie gebruiker",
- "tooltip-t-upload": "Laai beelde of ander medialêers op",
+ "tooltip-t-upload": "Laai lêers op",
"tooltip-t-specialpages": "'n Lys van al die spesiale bladsye",
"tooltip-t-print": "Drukbare weergawe van hierdie bladsy",
"tooltip-t-permalink": "'n Permanente skakel na hierdie weergawe van die bladsy",
"tooltip-watchlistedit-raw-submit": "Opdateer dophoulys",
"tooltip-recreate": "Herskep hierdie bladsy al is dit voorheen geskrap",
"tooltip-upload": "Begin oplaai",
- "tooltip-rollback": "Rol met een kliek die laaste gebruiker se wysiging(s) van aan hierdie bladsy terug.",
+ "tooltip-rollback": "Rol met een kliek die laaste gebruiker se wysiging(s) aan hierdie bladsy terug.",
"tooltip-undo": "Met \"ongedaan maak\" maak u hierdie wysiging ongedaan en land u in die wysigingsvenster.\nU kan daar 'n wysigingsopsomming byvoeg.",
"tooltip-preferences-save": "Stoor voorkeure",
"tooltip-summary": "Verskaf 'n kort opsomming",
"spam_reverting": "Besig met terugrol na die laaste weergawe wat nie skakels na $1 bevat nie",
"spam_blanking": "Alle weergawes met 'n skakel na $1 word verwyder",
"spam_deleting": "Alle weergawes bevat verwysings na $1. Bladsy verwyder",
- "simpleantispam-label": "Antispam-kontrole.\n<strong>Moenie</strong> die veld invul nie!",
+ "simpleantispam-label": "<strong>Moenie</strong> die veld invul nie!",
"pageinfo-title": "Inligting oor \"$1\"",
"pageinfo-not-current": "Hierdie gegewens is slegs vir die huidige weergawe beskikbaar.",
"pageinfo-header-basic": "Basiese inligting",
"history": "Trametes stǣr",
"history_short": "Stǣr",
"updatedmarker": "nīwod æfter mīnre lætestan sōcne",
- "printableversion": "Ūtmǣlendlīc fadung",
+ "printableversion": "Ūtmǣlendlicu fadung",
"permalink": "Fæst hlenca",
"print": "Ūtmǣlan",
"view": "Sihþ",
"view-foreign": "Sihþ on $1",
- "edit": "Adihtan",
+ "edit": "Ādihtan",
"create": "Scieppan",
"create-local": "Besettan stōwlice gemearcunge",
"editthispage": "Adihtan þisne tramet",
"view-pool-error": "Wālā, þā þegntōlas nū oferlīce wyrcaþ.\nTō mænige brūcendas gesēcaþ tō sēonne þisne tramet.\nWē biddaþ þæt þū abīde scortne tīman ǣr þū gesēce to sēonne þisne tramet eft.\n\n$1",
"pool-errorunknown": "Uncūþ wōh",
"aboutsite": "Gecȳþness ymbe {{GRAMMAR:wrēgendlīc|{{SITENAME}}}}",
- "aboutpage": "Project:Gecȳþness",
+ "aboutpage": "Project:Gefrǣge",
"copyright": "Man mæg innunge under $1 findan, būton þǣr hit is elles amearcod.",
"copyrightpage": "{{ns:project}}:Gelīcnessriht",
"currentevents": "Gelimpunga þisses tīman",
"portal": "Gemǣnscipes ingang",
"portal-url": "Project:Gemǣnscipes ingang",
"privacy": "Ānlēpnesse rǣd",
- "privacypage": "Project:Ānlēpnesse rǣd",
+ "privacypage": "Project:Ä\80nlÄ«Ä\93pnesse rÇ£d",
"badaccess": "Þafunge wōh",
"badaccess-group0": "Þū ne mōst dōn þā dǣde þǣre þe þū hafast abede.",
"badaccess-groups": "Þēos dǣd þǣre þū hafast abeden is synderlīce alȳfedlic brūcendum on {{PLURAL:$2|þissum þrēate|ānum þāra þrēata}}: $1.",
"resetpass-submit-loggedin": "Andwendan þafungword",
"resetpass-submit-cancel": "Undōn",
"passwordreset": "Settan þafungword eft",
- "passwordreset-legend": "Settan þafungword eft",
"passwordreset-username": "Brūcendnama:",
"bold_sample": "Þicce traht",
"bold_tip": "Þicce traht",
"recentchanges-legend": "Nīwra andwendunga cyras",
"recentchanges-summary": "Sēon þā nīwostan andwendunga þisses wiki on þissum tramete",
"recentchanges-feed-description": "Īwan þā nīwostan andwendunga þæs wiki mid þissum strēame",
- "recentchanges-label-newpage": "Þēos adihtung scōp nīwne tramet",
- "recentchanges-label-minor": "Þēos is lytel adihtung",
+ "recentchanges-label-newpage": "Þēos ādihtung scōp nīwne tramet",
+ "recentchanges-label-minor": "Þēos is lytel ādihtung",
"recentchanges-label-bot": "Searuþrǣl fremede þās adihtunge",
"recentchanges-label-plusminus": "Þæs trametes micelness wæs andwended þȳs rīme grēatbitena",
"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (seoh ēac [[Special:NewPages|getæl nīwra trameta]])",
"filerevert-legend": "Settan ymelan on bæc",
"filedelete-submit": "Forlēosan",
"unusedtemplateswlh": "ōðre hlencan",
- "randompage": "Gelimplīc tramet",
+ "randompage": "Gelimplic tramet",
"statistics": "Cȳþþu",
"statistics-articles": "Innunge trametas",
"statistics-pages": "Trametas",
"allmessages-filter-modified": "Andwended",
"allmessages-language": "Sprǣc:",
"allmessages-filter-submit": "Gān",
- "thumbnail-more": "Mǣrsian",
+ "thumbnail-more": "Gerȳman",
"filemissing": "Ymele is æfweard",
"import": "Inbringan trametas",
"import-interwiki-submit": "Inbringan",
"tooltip-pt-logout": "Ūtmeldian",
"tooltip-pt-createaccount": "Þū āhst wyrcan grīman tō brūcenne, ac þū ne þearft þæt dōn.",
"tooltip-ca-talk": "Mōtung ymbe þone innunge tramet",
- "tooltip-ca-edit": "Þū meaht þisne tramet adihtan. Brūc lā þone forebysene cnæpp ǣr þū hordie.",
+ "tooltip-ca-edit": "Þisne tramet ādihtan.",
"tooltip-ca-addsection": "Beginnan nīwne dǣl",
"tooltip-ca-viewsource": "Þes tramet is borgen.\nÞū canst his fruman sēon.",
"tooltip-ca-history": "Ǣrran fadunga þisses trametes",
"specialpages-group-other": "Ōðre syndrige trametas",
"specialpages-group-users": "Brūcendas and riht",
"blankpage": "Tramet is æmettig",
+ "tag-filter": "[[Special:Tags|Mearcincles]] siftere:",
"tags-edit": "adihtan",
"htmlform-submit": "Forþsendan",
"htmlform-reset": "Undōn andwendunga",
"emailmessage": "Mesaj:",
"emailsend": "Göndər",
"emailccme": "Məktubun surətini elektron ünvanıma göndər.",
- "emailccsubject": " $1: $2-yə olan ismarıclarınızın surəti",
+ "emailccsubject": "$1 adlı istifadəçiyə olan ismarıcınızın surəti: $2",
"emailsent": "E-məktub göndərildi",
"emailsenttext": "E-məktub mesajınız göndərildi.",
"usermessage-summary": "Sistem mesajı qoyun.",
"upload-dialog-button-cancel": "Адмяніць",
"upload-dialog-button-done": "Зроблена",
"upload-dialog-button-save": "Захаваць",
+ "upload-dialog-button-upload": "Загрузіць",
+ "upload-dialog-label-select-file": "Абраць файл",
"backend-fail-stream": "Немагчыма накіраваць файл $1.",
"backend-fail-backup": "Немагчыма зрабіць рэзэрвовую копію файла $1.",
"backend-fail-notexists": "Файл $1 не існуе.",
"mypreferences": "পছন্দসমূহ",
"prefs-edits": "সম্পাদনা সংখ্যা:",
"prefsnologintext2": "আপনার পছন্দসমূহ পরিবর্তন করতে প্রবেশ করুন।",
- "prefs-skin": "আবরণ (Skin)",
+ "prefs-skin": "আবরণ",
"skin-preview": "প্রাকদর্শন",
"datedefault": "কোন পছন্দ নেই",
"prefs-labs": "পরীক্ষাগার বৈশিষ্টসমূহ",
"sectioneditnotsupported-text": "Uređivanje sekcije nije podržano na ovoj stranici.",
"permissionserrors": "Greške pri odobrenju",
"permissionserrorstext": "Nemate dopuštenje da to uradite, iz {{PLURAL:$1|slijedećeg razloga|slijedećih razloga}}:",
- "permissionserrorstext-withaction": "Nemate dopuštenje da $2, iz {{PLURAL:$1|slijedećeg|slijedećih}} razloga:",
+ "permissionserrorstext-withaction": "Nemate dopuštenje da $2, iz {{PLURAL:$1|sljedećeg|sljedećih}} razloga:",
"recreate-moveddeleted-warn": "'''Upozorenje: Postavljate stranicu koja je prethodno brisana.'''\n\nRazmotrite da li je nastavljanje uređivanja ove stranice u skladu s pravilima.\nOvdje je naveden zapisnik brisanja i premještanja s obrazloženjem:",
"moveddeleted-notice": "Ova stranica je obrisana.\nZapisnik brisanja i premještanja stranice je prikazan ispod kao referenca.",
"log-fulllog": "Vidi potpuni zapisnik",
"watchlistedit-clear-explain": "तमरा ध्यान सूचीबठे सम्पूर्ण पाना हटाइया",
"watchlistedit-clear-done": "तमरो ध्यान सूची खाली गरीयाको छ।",
"watchlisttools-view": "आधारित फेरबदलीहरू हेर",
- "signature": "[[{{एनस:प्रयोगकर्ता}}:$1|$2]]([[{{एनस:प्रयोगकर्ता_कुरडी}}:$1|कुरडी]])",
+ "signature": "[[{{ns:प्रयोगकर्ता}}:$1|$2]]([[{{ns:प्रयोगकर्ता_कुरडी}}:$1|कुरडी]])",
"specialpages": "खास पानो",
"specialpages-note": "* साधारण खास पानाहरू।\n* <span class=\"mw-specialpagerestricted\">निषेधित खास पानाहरू।</span>",
"specialpages-group-changes": "अल्लैका परिवर्तन लगहरू",
"content-model-css": "CSS",
"content-json-empty-object": "Objeto vacío",
"content-json-empty-array": "Matriz vacía",
- "duplicate-args-warning": "<strong>Aviso:</strong> [[:$1]] convoca a [[:$2]] con más de un valor para el parámetro «$3». Se usará solo el último valor proporcionado.",
+ "duplicate-args-warning": "<strong>Aviso:</strong> [[:$1]] llama a [[:$2]] con más de un valor para el parámetro «$3». Se usará solo el último valor proporcionado.",
"duplicate-args-category": "Páginas que usan argumentos duplicados en invocaciones de plantillas",
"duplicate-args-category-desc": "La página contiene invocaciones de plantillas que utilizan argumentos duplicados, como <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> o <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
"expensive-parserfunction-warning": "<strong>Advertencia:</strong> esta página contiene demasiadas llamadas a funciones sintácticas costosas.\n\nTiene {{PLURAL:$1|una llamada|$1 llamadas}}, pero debería tener menos de {{PLURAL:$2|una|$2}}.",
"filetype-missing": "El archivo no tiene extensión (como «.jpg»).",
"empty-file": "El archivo que enviaste estaba vacío.",
"file-too-large": "El archivo que enviste era demasiado grande.",
- "filename-tooshort": "El nombre de archivo es demasiado corto.",
+ "filename-tooshort": "El nombre del archivo es demasiado corto.",
"filetype-banned": "El tipo de archivo está prohibido.",
"verification-error": "Este archivo no superó la verificación de archivos.",
"hookaborted": "Una extensión ha impedido la modificación que intentaste realizar.",
- "illegal-filename": "El nombre de archivo no está permitido.",
- "overwrite": "Sobrescribir un archivo existente no está permitido.",
+ "illegal-filename": "El nombre del archivo no está permitido.",
+ "overwrite": "No está permitido sobrescribir un archivo existente.",
"unknown-error": "Ocurrió un error desconocido.",
"tmp-create-error": "No se pudo crear archivo temporal.",
- "tmp-write-error": "Error al escribir archivo temporal.",
+ "tmp-write-error": "Error al escribir el archivo temporal.",
"large-file": "Se recomienda que los archivos no sean mayores de $1; este archivo ocupa $2.",
"largefileserver": "El tamaño de este archivo es mayor del que este servidor admite por configuración.",
"emptyfile": "El archivo que has intentado subir parece estar vacío; por favor, verifica que realmente se trate del archivo que intentabas subir.",
"upload-misc-error-text": "Ha ocurrido un error durante la subida.\nVerifica que la URL es válida y accesible e inténtalo de nuevo.\nSi el problema persiste, contacta con un [[Special:ListUsers/sysop|administrador]].",
"upload-too-many-redirects": "La URL contenía demasiadas redirecciones",
"upload-http-error": "Ha ocurrido un error HTTP: $1",
- "upload-copy-upload-invalid-domain": "No se pueden realizar cargas remotas desde este dominio.",
+ "upload-copy-upload-invalid-domain": "No se pueden realizar subidas remotas desde este dominio.",
"upload-dialog-title": "Subir archivo",
"upload-dialog-error": "Ha ocurrido un error",
"upload-dialog-warning": "Ha ocurrido una advertencia",
"filedelete-nofile": "<strong>$1</strong> no existe.",
"filedelete-nofile-old": "No existe una versión guardada de <strong>$1</strong> con los atributos especificados.",
"filedelete-otherreason": "Otra razón:",
- "filedelete-reason-otherlist": "Otra razón",
+ "filedelete-reason-otherlist": "Otro motivo",
"filedelete-reason-dropdown": "*Razones habituales de borrado\n** Violación de derechos de autor\n** Archivo duplicado",
"filedelete-edit-reasonlist": "Edita los motivos del borrado",
"filedelete-maintenance": "Borrado y restauración de archivos temporalmente deshabilitados durante el mantenimiento.",
"ancientpages": "Artículos más antiguos",
"move": "Trasladar",
"movethispage": "Trasladar esta página",
- "unusedimagestext": "Los siguientes archivos existen pero no están insertados en ninguna página.\nPor favor note que otros sitios web pueden vincular a un archivo con un URL directo, y por tanto pueden ser listados aquí a pesar de estar en uso activo.",
+ "unusedimagestext": "Los siguientes archivos existen pero no están insertados en ninguna página.\nTen en cuenta que otros sitios web pueden enlazar un archivo directamente por la URL, y por tanto pueden estar listados aquí a pesar de estar siendo usados de forma activa.",
"unusedcategoriestext": "Las siguientes categorías han sido creadas, pero ningún artículo o categoría las utiliza.",
"notargettitle": "No hay página objetivo",
"notargettext": "No has especificado sobre qué página deseas llevar a cabo esta acción.",
"protect-existing-expiry": "Fecha de caducidad actual: $2 a las $3",
"protect-existing-expiry-infinity": "Tiempo de caducidad existente: infinito",
"protect-otherreason": "Otra razón:",
- "protect-otherreason-op": "Otra razón",
+ "protect-otherreason-op": "Otro motivo",
"protect-dropdown": "*Razones de protección habituales\n**Vandalismo excesivo\n**Spam excesivo\n**Guerra de ediciones\n**Página muy visitada",
"protect-edit-reasonlist": "Editar las razones de protección",
"protect-expiry-options": "1 hora:1 hour,1 día:1 day,1 semana:1 week,2 semanas:2 weeks,1 mes:1 month,3 meses:3 months,6 meses:6 months,1 año:1 year,para siempre:infinite",
"export-submit": "Exportar",
"export-addcattext": "Añadir páginas desde la categoría:",
"export-addcat": "Añadir",
- "export-addnstext": "Agregar páginas del nombre del sitio:",
+ "export-addnstext": "Agregar páginas desde el espacio de nombres:",
"export-addns": "Agregar",
"export-download": "Guardar como archivo",
"export-templates": "Incluir plantillas",
"importstart": "Importando páginas...",
"import-revision-count": "$1 {{PLURAL:$1|revisión|revisiones}}",
"importnopages": "No hay páginas que importar.",
- "imported-log-entries": "Importados $1 {{PLURAL:$1|entradas de registro|entradas de registro}}.",
+ "imported-log-entries": "{{PLURAL:$1|Se importó|Se importaron}} $1 {{PLURAL:$1|entrada|entradas}} de registro.",
"importfailed": "La importación ha fallado: $1",
"importunknownsource": "Tipo de fuente de importación desconocida",
"importcantopen": "No se pudo importar el archivo",
"group-sysop.js": "/* Cualquier código JavaScript escrito aquí se cargará para todos los usuarios del grupo Administradores */",
"group-bureaucrat.js": "/* Cualquier código JavaScript escrito aquí se cargará para todos los usuarios del grupo Burócratas */",
"anonymous": "{{PLURAL:$1|Usuario anónimo|Usuarios anónimos}} de {{SITENAME}}",
- "siteuser": "{{GENDER:$1|Usuario|Usuaria}} $1 de {{SITENAME}}",
- "anonuser": "{{SITENAME}} usuario anónimo $1",
- "lastmodifiedatby": "Esta página fue modificada por última vez en $2, $1 por $3.",
+ "siteuser": "{{GENDER:$1|el usuario|la usuaria}} $1 de {{SITENAME}}",
+ "anonuser": "el usuario anónimo $1 de {{SITENAME}}",
+ "lastmodifiedatby": "Esta página fue modificada por última vez el $1 a las $2 por $3.",
"othercontribs": "Basado en el trabajo de $1.",
"others": "otros",
- "siteusers": "{{PLURAL:$2|Usuario|Usuarios}} $1 de {{SITENAME}}",
- "anonusers": "{{SITENAME}} {{PLURAL:$2|usuario|usuarios}} anónimos $1",
+ "siteusers": "{{PLURAL:$2|el usuario|los usuarios}} $1 de {{SITENAME}}",
+ "anonusers": "{{PLURAL:$2|el usuario anónimo|los usuarios anónimos}} $1 de {{SITENAME}}",
"creditspage": "Créditos de la página",
"nocredits": "No hay información de créditos para esta página.",
"spamprotectiontitle": "Filtro de protección contra spam",
"htmlform-user-not-valid": "<strong>$1</strong> no es un nombre de usuario válido.",
"sqlite-has-fts": "$1 con soporte para búsqueda de texto completo",
"sqlite-no-fts": "$1 sin soporte para búsqueda de texto completo",
- "logentry-delete-delete": "$1 {{GENDER:$2|borró}} la página «$3»",
+ "logentry-delete-delete": "$1 {{GENDER:$2|borró}} la página $3",
"logentry-delete-restore": "$1 restauró la página «$3»",
"logentry-delete-event": "$1 {{GENDER:$2|modificó}} la visibilidad de {{PLURAL:$5|un evento|$5 eventos}} del registro en $3: $4",
"logentry-delete-revision": "$1 {{GENDER:$2|modificó}} la visibilidad de {{PLURAL:$5|una revisión |$5 revisiones}} en la página $3: $4",
"logentry-delete-event-legacy": "$1 ha {{GENDER:$2|cambiado}} la visibilidad de registro de eventos en $3",
"logentry-delete-revision-legacy": "$1 ha {{GENDER:$2|cambiado}} la visibilidad de las revisiones en la página $3",
- "logentry-suppress-delete": "$1 {{GENDER:$2|borró}}, con restricciones para administradores aplicadas, la página $3",
+ "logentry-suppress-delete": "$1 {{GENDER:$2|borró}} la página $3",
"logentry-suppress-event": "$1 {{GENDER:$2|modificó}} secretamente la visibilidad de {{PLURAL:$5|una edición|$5 ediciones}} en la página $3: $4",
"logentry-suppress-revision": "$1 {{GENDER:$2|modificó}} secretamente la visibilidad de {{PLURAL:$5|una edición|$5 ediciones}} en la página $3: $4",
"logentry-suppress-event-legacy": "$1 {{GENDER:$2|modificó}} secretamente la visibilidad de los eventos del registro en $3",
"createacct-benefit-body2": "{{PLURAL:$1|páxina|páxinas}}",
"createacct-benefit-body3": "{{PLURAL:$1|colaborador recente|colaboradores recentes}}",
"badretype": "Os contrasinais que inseriu non coinciden.",
+ "usernameinprogress": "Xa está en marcha a creación dunha conta para este nome de usuario.\nPor favor, agarde.",
"userexists": "O nome de usuario que inseriu xa está en uso.\nEscolla un nome diferente.",
"loginerror": "Erro ao acceder ao sistema",
"createacct-error": "Erro ao crear a conta",
"blocked-notice-logextract": "Este usuario está bloqueado.\nVelaquí está a última entrada do rexistro de bloqueos, por se quere consultala:",
"clearyourcache": "'''Nota:''' Despois de gardar, cómpre limpar a memoria caché do seu navegador para ver os cambios.\n* '''Firefox/Safari:''' Prema ''Maiúsculas'' á vez que en ''Recargar'', ou prema en ''Ctrl-F5'' ou ''Ctrl-R'' (''⌘-R'' nos Mac)\n* '''Google Chrome:''' Prema en ''Ctrl-Maiús-R'' (''⌘-Maiús-R'' nos Mac)\n* '''Internet Explorer:''' Prema ''Ctrl'' ao tempo que fai clic en ''Refrescar'', ou prema en ''Ctrl-F5''\n* '''Opera:''' Limpe a súa memoria caché en ''Ferramentas → Preferencias''",
"usercssyoucanpreview": "'''Nota:''' Use o botón \"{{int:showpreview}}\" para verificar o novo CSS antes de gardalo.",
- "userjsyoucanpreview": "'''Nota:''' Use o botón \"{{int:showpreview}}\" para verificar o novo JS antes de gardalo.",
+ "userjsyoucanpreview": "<strong>Nota:</strong> Use o botón \"{{int:showpreview}}\" para verificar o novo JavaScript antes de gardalo.",
"usercsspreview": "'''Lembre que só está vendo a vista previa do seu CSS de usuario.'''\n'''Este aínda non foi gardado!'''",
"userjspreview": "'''Lembre que só está probando/previsualizando o seu JavaScript de usuario.'''\n'''Este aínda non foi gardado!'''",
"sitecsspreview": "'''Lembre que só está vendo a vista previa deste CSS.'''\n'''Este aínda non foi gardado!'''",
"sitejspreview": "'''Lembre que só está vendo a vista previa deste código JavaScript.'''\n'''Este aínda non foi gardado!'''",
- "userinvalidcssjstitle": "'''Aviso:''' Non hai ningunha aparencia chamada \"$1\".\nLembre que as páxinas .css e .js personalizadas utilizan un título en minúsculas, como por exemplo \"{{ns:user}}:Foo/vector.css\" no canto de \"{{ns:user}}:Foo/Vector.css\".",
+ "userinvalidcssjstitle": "<strong>Aviso:</strong> Non hai ningunha aparencia chamada \"$1\".\nLembre que as páxinas .css e .js personalizadas utilizan un título en minúsculas, como por exemplo \"{{ns:user}}:Exemplo/vector.css\" no canto de \"{{ns:user}}:Exemplo/Vector.css\".",
"updated": "(Actualizado)",
"note": "'''Nota:'''",
"previewnote": "'''Lembre que esta é só unha vista previa e que aínda non gardou os seus cambios!'''",
"default": "predeterminado",
"prefs-files": "Ficheiros",
"prefs-custom-css": "CSS personalizado",
- "prefs-custom-js": "JS personalizado",
- "prefs-common-css-js": "CSS/JS compartido por todas as aparencias:",
+ "prefs-custom-js": "JavaScript personalizado",
+ "prefs-common-css-js": "CSS/JavaScript compartido por todas as aparencias:",
"prefs-reset-intro": "Pode usar esta páxina para restablecer as súas preferencias ás que veñen dadas por defecto.\nEste cambio non se poderá desfacer.",
"prefs-emailconfirm-label": "Confirmación do correo:",
"youremail": "Correo electrónico:",
"noindex-category-desc": "A páxina non está indexada polos bots porque contén a palabra máxica <code><nowiki>__NOINDEX__</nowiki></code> e está nun espazo de nomes no que esa marca está permitida.",
"index-category-desc": "A páxina contén a palabra máxica <code><nowiki>__INDEX__</nowiki></code> (e está nun espazo de nomes no que esa marca está permitida) e, polo tanto, será indexada polos bots cando non debera selo normalmente.",
"post-expand-template-inclusion-category-desc": "O tamaño da páxina é maior que <code>$wgMaxArticleSize</code> despois de expandir todos os modelos; algúns modelos non se expandiron.",
- "post-expand-template-argument-category-desc": "A páxina é maior que <code>$wgMaxArticleSize</code> despois de expandir o argumento dun modelo (algo entre chaves triples, como <code>{{{Proba}}}</code>).",
+ "post-expand-template-argument-category-desc": "A páxina é maior que <code>$wgMaxArticleSize</code> despois de expandir o argumento dun modelo (algo entre chaves triples, como <code>{{{Exemplo}}}</code>).",
"expensive-parserfunction-category-desc": "A páxina utiliza demasiadas funcións analíticas custosas (como <code>#ifexist</code>). Consulte [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
"broken-file-category-desc": "A páxina contén unha ligazón de ficheiro rota (unha ligazón para incorporar un ficheiro que non existe).",
"hidden-category-category-desc": "A categoría contén a palabra máxica <code><nowiki>__HIDDENCAT__</nowiki></code>, que impide que se mostre por defecto na caixa de categorías das páxinas.",
"logentry-newusers-create2": "$1 {{GENDER:$2|creou}} a conta de usuario $3",
"logentry-newusers-byemail": "$1 {{GENDER:$2|creou}} a conta de usuario $3; o contrasinal enviouse por correo electrónico",
"logentry-newusers-autocreate": "A conta de {{GENDER:$2|usuario|usuaria}} $1 creouse automaticamente",
+ "logentry-protect-move_prot": "$1 {{GENDER:$2|trasladou}} a protección de \"$4\" a \"$3\"",
"logentry-rights-rights": "$1 {{GENDER:$2|cambiou}} o grupo ao que pertence $3 de $4 a $5",
"logentry-rights-rights-legacy": "$1 {{GENDER:$2|cambiou}} o grupo ao que pertence $3",
"logentry-rights-autopromote": "$1 foi {{GENDER:$2|promovido|promovida}} automaticamente de $4 a $5",
"json-warn-trailing-comma": "{{PLURAL:$1|Eliminouse $1 coma final|Elimináronse $1 comas finais}} do JSON.",
"json-error-unknown": "Houbo un problema co JSON. Erro: $1",
"json-error-depth": "Superouse o número máximo de ficheiros apartados.",
- "json-error-state-mismatch": "O JSON non é válido.",
+ "json-error-state-mismatch": "O JSON non é válido ou ten un formato incorrecto",
"json-error-ctrl-char": "Produciuse un erro de carácter de control, trátase probablemente dun problema de codificación.",
"json-error-syntax": "Erro de sintaxe",
"json-error-utf8": "Hai caracteres UTF-8 incorrectos, trátase probablemente dun problema de codificación.",
"prefs-watchlist-days": "מספר הימים המרבי שיוצגו ברשימת המעקב:",
"prefs-watchlist-days-max": "לכל היותר {{PLURAL:$1|יום אחד|יומיים|$1 ימים}}",
"prefs-watchlist-edits": "מספר העריכות המרבי שיוצגו ברשימת המעקב המורחבת:",
- "prefs-watchlist-edits-max": "×\9eספר ×\9e×\99ר×\91×\99: 1000",
+ "prefs-watchlist-edits-max": "מספר מרבי: 1000",
"prefs-watchlist-token": "אסימון לרשימת המעקב:",
"prefs-misc": "שונות",
"prefs-resetpass": "שינוי סיסמה",
"tooltip-p-logo": "Sarungkaran ti umuna a panid",
"tooltip-n-mainpage": "Sarungkaran ti umuna a panid",
"tooltip-n-mainpage-description": "Sarungkaran ti umuna a panid",
- "tooltip-n-portal": "Maipapan ti gandat, ti aniaman a maaramidmo, no sadino ti pagbirukam kadagiti banbanag",
+ "tooltip-n-portal": "Maipapan iti proyekto, no ania ti maaramidmo, ti pagbirukan kadagiti banag",
"tooltip-n-currentevents": "Agsapul ti pakaammo kadagiti agdama a paspasamak",
"tooltip-n-recentchanges": "Listaan dagiti naudi a sinukatan iti wiki",
"tooltip-n-randompage": "Agikarga iti pugto a panid",
"createacct-benefit-body2": "{{PLURAL:$1|pagina|pagine}}",
"createacct-benefit-body3": "{{PLURAL:$1|contributore recente|contributori recenti}}",
"badretype": "Le password inserite non coincidono tra loro.",
+ "usernameinprogress": "La creazione di account con questo nome utente è già in corso.\nSi prega di attendere.",
"userexists": "Il nome utente inserito è già utilizzato.\nScegli un nome utente diverso.",
"loginerror": "Errore durante l'accesso",
"createacct-error": "Errore durante la creazione dell'utenza",
"changeemail": "이메일 주소 바꾸기",
"changeemail-text": "이메일 주소를 바꾸려면 이 양식을 채우세요. 이 바뀜을 확인하기 위해 비밀번호를 입력해야 합니다.",
"changeemail-no-info": "이 특수 문서에 직접 접근하려면 반드시 로그인해야 합니다.",
- "changeemail-oldemail": "현재 이메일 주소 :",
+ "changeemail-oldemail": "현재 이메일 주소:",
"changeemail-newemail": "새 이메일 주소:",
"changeemail-none": "(없음)",
"changeemail-password": "{{SITENAME}} 비밀번호:",
"newpages": "새 문서 목록",
"newpages-username": "사용자 이름:",
"ancientpages": "오래된 문서 목록",
- "move": "ì\98®ê¸°ê¸°",
+ "move": "ì\9d´ë\8f\99",
"movethispage": "이 문서 옮기기",
"unusedimagestext": "다음은 어떠한 문서도 사용하지 않는 파일의 목록입니다.\n다른 사이트에서 URL 접근을 통해 파일을 사용할 수 있기 때문에, 아래 목록에 있는 파일도 실제로 사용 중일 가능성이 있다는 점을 주의해주세요.",
"unusedcategoriestext": "사용하지 않는 분류 문서의 목록입니다.",
"htmlform-cloner-create": "더 추가",
"htmlform-cloner-delete": "제거",
"htmlform-cloner-required": "적어도 하나의 값이 필요합니다.",
+ "htmlform-title-badnamespace": "[[:$1]] 문서는 \"{{ns:$2}}\" 이름공간에 없습니다.",
"htmlform-title-not-creatable": "\"$1\"은 만들 수 없는 문서 제목입니다.",
"htmlform-title-not-exists": "[[:$1]] 문서는 존재하지 않습니다.",
"htmlform-user-not-exists": "<strong>$1</strong> 문서는 존재하지 않습니다.",
"logentry-newusers-create2": "$1 사용자가 $3 사용자 계정을 {{GENDER:$2|만들었습니다}}",
"logentry-newusers-byemail": "$3 사용자 계정을 $1님이 {{GENDER:$2|만들었고}} 비밀번호는 이메일로 보냈습니다",
"logentry-newusers-autocreate": "$1 사용자 계정을 자동으로 {{GENDER:$2|만들었습니다}}",
+ "logentry-protect-move_prot": "$1 사용자가 보호 설정을 $4에서 $3으로 {{GENDER:$2|옮겼습니다}}",
"logentry-rights-rights": "$1 사용자가 $3 사용자의 권한을 $4에서 $5(으)로 {{GENDER:$2|바꾸었습니다}}",
"logentry-rights-rights-legacy": "$1 사용자가 $3 사용자의 권한을 {{GENDER:$2|바꾸었습니다}}",
"logentry-rights-autopromote": "$1 사용자의 권한을 자동적으로 $4에서 $5으로 {{GENDER:$2|바꾸었습니다}}",
"thu": "Ce",
"fri": "Pk",
"sat": "Se",
- "january": "janvārī,",
- "february": "februārī,",
- "march": "martā,",
- "april": "aprīlī,",
- "may_long": "maijā,",
- "june": "jūnijā,",
- "july": "jūlijā,",
- "august": "augustā,",
- "september": "septembrī,",
- "october": "oktobrī,",
- "november": "novembrī,",
- "december": "decembrī,",
- "january-gen": "Janvāra",
- "february-gen": "Februāra",
- "march-gen": "Marta",
- "april-gen": "Aprīļa",
- "may-gen": "Maija",
- "june-gen": "Jūnija",
- "july-gen": "Jūlija",
- "august-gen": "Augusta",
- "september-gen": "Septembra",
- "october-gen": "Oktobra",
- "november-gen": "Novembra",
- "december-gen": "Decembra",
- "jan": "janvārī,",
- "feb": "februārī,",
- "mar": "martā,",
- "apr": "aprīlī,",
- "may": "maijā,",
- "jun": "jūnijā,",
- "jul": "jūlijā,",
- "aug": "augustā,",
- "sep": "septembrī,",
- "oct": "oktobrī,",
- "nov": "novembrī,",
- "dec": "decembrī,",
+ "january": "janvāris",
+ "february": "februāris",
+ "march": "marts",
+ "april": "aprīlis",
+ "may_long": "maijs",
+ "june": "jūnijs",
+ "july": "jūlijs",
+ "august": "augusts",
+ "september": "septembris",
+ "october": "oktobris",
+ "november": "novembris",
+ "december": "decembris",
+ "january-gen": "janvāra",
+ "february-gen": "februāra",
+ "march-gen": "marta",
+ "april-gen": "aprīļa",
+ "may-gen": "maija",
+ "june-gen": "jūnija",
+ "july-gen": "jūlija",
+ "august-gen": "augusta",
+ "september-gen": "septembra",
+ "october-gen": "oktobra",
+ "november-gen": "novembra",
+ "december-gen": "decembra",
+ "jan": "janvāris",
+ "feb": "februāris",
+ "mar": "marts",
+ "apr": "aprīlis",
+ "may": "maijs",
+ "jun": "jūnijs",
+ "jul": "jūlijs",
+ "aug": "augusts",
+ "sep": "septembris",
+ "oct": "oktobris",
+ "nov": "novembris",
+ "dec": "decembris",
"january-date": "$1. janvāris",
"february-date": "$1. februāris",
"march-date": "$1. marts",
"accmailtitle": "Parole nosūtīta.",
"accmailtext": "Nejauši ģenerēta parole lietotājam [[User talk:$1|$1]] tika nosūtīta uz $2.\n\nŠī konta paroli pēc ielogošanās varēs nomainīt ''[[Special:ChangePassword|šeit]]''.",
"newarticle": "(Jauns raksts)",
- "newarticletext": "Tu šeit nonāci sekojot saitei uz, pagaidām vēl neuzrakstītu, lapu.\nLai izveidotu lapu, sāc rakstīt teksta logā apakšā (par teksta formatēšanu un sīkākai informācija skatīt [$1 palīdzības lapu]).\nJa tu šeit nonāci kļūdas pēc, vienkārši uzspied '''back''' pogu pārlūkprogrammā.",
+ "newarticletext": "Šajā projektā vēl nav lapas ar šādu nosaukumu.\nLai izveidotu lapu, sāc rakstīt teksta logā apakšā (par teksta formatēšanu un sīkākai informācija skatīt [$1 palīdzības lapu]).\nJa tu šeit nonāci kļūdas pēc, vienkārši uzspied <strong>back</strong> pogu pārlūkprogrammā.",
"anontalkpagetext": "----''Šī ir diskusiju lapa anonīmam lietotājam, kurš vēl nav kļuvis par reģistrētu lietotāju vai arī neizmanto savu lietotājvārdu. Tādēļ mums ir jāizmanto skaitliskā IP adrese, lai viņu identificētu.\nŠāda IP adrese var būt vairākiem lietotājiem.\nJa tu esi anonīms lietotājs un uzskati, ka tev ir adresēti neatbilstoši komentāri, lūdzu, [[Special:UserLogin/signup|kļūsti par lietotāju]] vai arī [[Special:UserLogin|izmanto jau izveidotu lietotājvārdu]], lai izvairītos no turpmākām neskaidrībām un tu netiktu sajaukts ar citiem anonīmiem lietotājiem.''",
"noarticletext": "Šajā lapā šobrīd nav nekāda teksta, tu vari [[Special:Search/{{PAGENAME}}|meklēt citās lapās pēc šīs lapas nosaukuma]], <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} meklēt saistītos reģistru ierakstos] vai arī [{{fullurl:{{FULLPAGENAME}}|action=edit}} sākt rediģēt šo lapu]</span>.",
"noarticletext-nopermission": "Šajā lapā pašlaik nav nekāda teksta.\nTu vari [[Special:Search/{{PAGENAME}}|meklēt šīs lapas nosaukumu]] citās lapās,\nvai <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} meklēt saistītus reģistru ierakstus]</span>, bet jums nav atļauja izveidot si lapu.",
"actionthrottled": "Handeling tegengehouden",
"actionthrottledtext": "Als maatregel tegen spam is het aantal keren per tijdseenheid dat u deze handeling kunt verrichten beperkt.\nDe limiet is overschreden.\nProbeer het over een aantal minuten opnieuw.",
"protectedpagetext": "Deze pagina is beveiligd. Bewerken of andere handelingen zijn niet mogelijk.",
- "viewsourcetext": "U kunt de brontekst van deze pagina bekijken en kopiëren:",
- "viewyourtext": "U kunt '''uw bewerkingen''' aan de brontekst van deze pagina bekijken en kopiëren:",
+ "viewsourcetext": "U kunt de brontekst van deze pagina bekijken en kopiëren.",
+ "viewyourtext": "U kunt <strong>uw bewerkingen</strong> aan de brontekst van deze pagina bekijken en kopiëren.",
"protectedinterface": "Deze pagina bevat tekst voor berichten van de software op deze wiki en is beveiligd om misbruik te voorkomen.\nGebruik [//translatewiki.net/ translatewiki.net], het vertaalproject voor MediaWiki, om vertalingen voor alle wiki's toe te voegen of te wijzigen.",
"editinginterface": "<strong>Waarschuwing:</strong> u bewerkt een pagina die interfacetekst voor de software bevat.\nBewerkingen op deze pagina beïnvloeden de gebruikersinterface van iedereen op deze wiki.\nGebruik [//translatewiki.net/ translatewiki.net], het vertaalproject voor MediaWiki, om vertalingen toe te voegen of te wijzigen voor alle wiki's.",
"translateinterface": "Om vertalingen voor alle wiki's toe te voegen of te wijzigen kunt u gebruik maken van [//translatewiki.net/ translatewiki.net], het vertaalproject voor MediaWiki.",
- "cascadeprotected": "Deze pagina kan niet bewerkt worden, omdat die is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:\n$2",
+ "cascadeprotected": "Deze pagina kan niet bewerkt worden, omdat ze is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:\n$2",
"namespaceprotected": "U hebt geen rechten om pagina's in de naamruimte <strong>$1</strong> te bewerken.",
"customcssprotected": "U kunt deze CSS-pagina niet bewerken, omdat die persoonlijke instellingen van een andere gebruiker bevat.",
"customjsprotected": "U kunt deze JavaScriptpagina niet bewerken, omdat die persoonlijke instellingen van een andere gebruiker bevat.",
"createacct-benefit-body2": "pagina{{PLURAL:$1||'s}}",
"createacct-benefit-body3": "recente bijdrager{{PLURAL:$1||s}}",
"badretype": "De ingevoerde wachtwoorden verschillen van elkaar.",
+ "usernameinprogress": "Het aanmaken van een gebruiker met die naam is al bezig.\nGelieve te wachten.",
"userexists": "De gekozen gebruikersnaam is al in gebruik.\nKies een andere naam.",
"loginerror": "Aanmeldfout",
"createacct-error": "Fout tijdens aanmaken gebruiker",
"readonlywarning": "'''Waarschuwing: u kunt deze bewerking nu niet opslaan omdat de database is geblokkeerd voor bewerkingen wegens onderhoudswerkzaamheden.'''\nHet is misschien verstandig om uw tekst tijdelijk in een tekstbestand op te slaan om dit te bewaren voor wanneer de blokkering van de database opgeheven is.\n\nEen beheerder heeft de database geblokkeerd om de volgende reden: $1",
"protectedpagewarning": "'''Waarschuwing: deze beveiligde pagina kan alleen door gebruikers met beheerdersrechten bewerkt worden.'''\nDe laatste logboekregel staat hieronder:",
"semiprotectedpagewarning": "'''Let op:''' deze pagina is beveiligd en kan alleen door geregistreerde gebruikers bewerkt worden.\nDe laatste logboekregel staat hieronder:",
- "cascadeprotectedwarning": "'''Waarschuwing:''' deze pagina is beveiligd en kan alleen door beheerders bewerkt worden, omdat deze is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:",
+ "cascadeprotectedwarning": "<strong>Waarschuwing:</strong> deze pagina is beveiligd en kan alleen door beheerders bewerkt worden, omdat ze is opgenomen in de volgende {{PLURAL:$1|pagina|pagina's}} die beveiligd {{PLURAL:$1|is|zijn}} met de cascade-optie:",
"titleprotectedwarning": "'''Waarschuwing: Deze pagina is beveiligd. Er zijn [[Special:ListGroupRights|speciale rechten]] nodig om de pagina aan te kunnen maken.'''\nDe laatste logboekregel staat hieronder:",
"templatesused": "Op deze pagina {{PLURAL:$1|gebruikt sjabloon|gebruikte sjablonen}}:",
"templatesusedpreview": "{{PLURAL:$1|Sjabloon|Sjablonen}} gebruikt in deze voorvertoning:",
"newpageletter": "N",
"boteditletter": "b",
"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|keer|keer}} op een volglijst]",
- "rc_categories": "Beperken tot categorieën (scheiden met een \"|\")",
- "rc_categories_any": "Elke",
+ "rc_categories": "Beperken tot categorieën (scheiden met een \"|\"):",
+ "rc_categories_any": "Een van de aangeduide",
"rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} na de wijziging",
"newsectionsummary": "/* $1 */ nieuwe subkop",
"rc-enhanced-expand": "Details weergeven",
"php-uploaddisabledtext": "Het uploaden van bestanden is uitgeschakeld in PHP.\nControleer de instelling \"file_uploads\".",
"uploadscripted": "Dit bestand bevat HTML- of scriptcode die foutief door uw browser kan worden weergegeven.",
"upload-scripted-pi-callback": "Het uploaden van een bestand met instructies voor de verwerking van XML-stijlbladen is niet mogelijk.",
- "uploaded-script-svg": "Gevonden scriptable element \"$1\" in het geüploade SVG-bestand.",
- "uploaded-hostile-svg": "Gevonden onveilige CSS in de stijl element van het geüploade SVG-bestand .",
+ "uploaded-script-svg": "Scriptable element \"$1\" in het geüploade SVG-bestand gevonden.",
+ "uploaded-hostile-svg": "Onveilige CSS in het \"style\"-element van het geüploade SVG-bestand gevonden.",
"uploaded-event-handler-on-svg": "Het instellen van de event-handler attributen <code>$1=\"$2\"</code> is niet toegestaan in SVG-bestanden.",
"uploaded-href-attribute-svg": "href-attributen <code><$1 $2=\"$3\"></code> met niet-lokaal doel (bv. http://, javascript:, enz.) zijn niet toegestaan in SVG-bestanden.",
- "uploaded-href-unsafe-target-svg": "Gevonden href tot onveilige doel <code><$1 $2=\"$3\"></code> in het geüploade SVG-bestand .",
- "uploaded-animate-svg": "Gevonden \"animeren\" tag die kan veranderen href behulp van de \"uit\" - attribuut <code><$1 $2=\"$3\"></code> in het geüploade svg-bestand.",
- "uploaded-setting-event-handler-svg": "Het instellen van de event-handler attributen is geblokkeerd, gevonden <code><$1 $2=\"$3\"></code> in het geüploade SVG-bestand.",
+ "uploaded-href-unsafe-target-svg": "href met onveilig doel <code><$1 $2=\"$3\"></code> in het geüploade SVG-bestand gevonden.",
+ "uploaded-animate-svg": "\"animate\"-tag gevonden in het geüploade svg-bestand die href zou kunnen veranderen, met behulp van het \"from\"-attribuut <code><$1 $2=\"$3\"></code>.",
+ "uploaded-setting-event-handler-svg": "Het instellen van de event-handler-attributen is geblokkeerd, <code><$1 $2=\"$3\"></code> gevonden in het geüploade SVG-bestand.",
"uploaded-setting-href-svg": "Met behulp van de \"set\" tag toevoegen \"href\" attribuut te bovenliggende element is geblokkeerd.",
"uploaded-wrong-setting-svg": "Met behulp van de \"set\" tag toevoegen van een afstandsbediening/data/script doel aan een kenmerk is geblokkeerd. Gevonden <code><set=\"$1\"></code> in het geüploade SVG-bestand.",
"uploaded-setting-handler-svg": "SVG-dat stelt de \"handler\" attribuut met afstandsbediening/data/script geblokkeerd. Gevonden <code>$1=\"$2\"</code> in de SVG-bestand geüpload.",
"logentry-newusers-create2": "$1 {{GENDER:$2|utworzył|utworzyła}} konto użytkownika $3",
"logentry-newusers-byemail": "Konto $3 zostało utworzone przez użytkownika $1, hasło wysłano e-mailem",
"logentry-newusers-autocreate": "$1 automatycznie {{GENDER:$2|utworzył|utworzyła|utworzył}} konto użytkownika",
+ "logentry-protect-move_prot": "$1 {{GENDER:$2|przeniósł|przeniosła}} ustawienia zabezpieczeń z $4 do $3",
"logentry-rights-rights": "$1 {{GENDER:$2|zmienił|zmieniła}} przynależność $3 do grup ($4 → $5)",
"logentry-rights-rights-legacy": "$1 {{GENDER:$2|zmienił|zmieniła}} przynależność $3 do grup",
"logentry-rights-autopromote": "$1 automatycznie {{GENDER:$2|zmienił|zmieniła}} przynależność ($4 → $5)",
"shown-title": "Mostrar $1 {{PLURAL:$1|resultado|resultados}} por página",
"viewprevnext": "Ver ($1 {{int:pipe-separator}} $2) ($3).",
"searchmenu-exists": "<strong>Há uma página com o nome \"[[:$1]]\" nesta wiki.</strong> {{PLURAL:$2|0=|Veja também os outros resultados da pesquisa encontrados.}}",
- "searchmenu-new": "<strong>Criar a página \"[[:$1]]\" nesta wiki!</strong>{{PLURAL:$2|0=| Veja também a página encontrada com sua pesquisa.|Veja também os resultados das pesquisas encontradas.}}",
+ "searchmenu-new": "<strong>Criar a página \"[[:$1]]\" nesta wiki!</strong> {{PLURAL:$2|0=|Veja também a página encontrada com sua pesquisa.|Veja também os resultados da pesquisa encontrados.}}",
"searchprofile-articles": "Páginas de conteúdo",
"searchprofile-images": "Multimídia",
"searchprofile-everything": "Tudo",
"log": "Registros",
"all-logs-page": "Todos os registros públicos",
"alllogstext": "Exibição combinada de todos registros disponíveis para o {{SITENAME}}.\nVocê pode diminuir a lista escolhendo um tipo de registro, um nome de usuário (sensível a maiúsculas e minúsculas), ou uma página afetada (também sensível a maiúsculas e minúsculas).",
- "logempty": "Nenhum item idêntico no registro.",
+ "logempty": "Nenhum item correspondente no registro.",
"log-title-wildcard": "Procurar por títulos que sejam iniciados com o seguinte texto",
"showhideselectedlogentries": "Exibir/ocultar os itens de registros selecionados",
"log-edit-tags": "Editar etiquetas das entradas selecionadas",
"log": "Registos",
"all-logs-page": "Todos os registos públicos",
"alllogstext": "Apresentação combinada de todos os registos disponíveis na wiki {{SITENAME}}.\nPode reduzir a lista escolhendo um tipo de registo, um nome de utilizador ou um título de página. Respeite maiúsculas e minúsculas.",
- "logempty": "Não há dados a apresentar.",
+ "logempty": "Nenhum item correspondente no registo.",
"log-title-wildcard": "Procurar títulos iniciados por este texto",
"showhideselectedlogentries": "Mostrar ou ocultar as entradas selecionadas",
"log-edit-tags": "Editar etiquetas das entradas de registo selecionadas",
"version-api": "{{optional}}",
"version-other": "{{Identical|Other}}",
"version-mediahandlers": "Used in [[Special:Version]]. It is the title of a section for media handler extensions (e.g. [[mw:Extension:OggHandler]]).\nThere are no such extensions here, so look at [[wikipedia:Special:Version]] for an example.",
- "version-hooks": "Shown in [[Special:Version]]",
+ "version-hooks": "Shown in [[Special:Version]]\n{{Identical|Hook}}",
"version-parser-extensiontags": "Part of [[Special:Version]].\nThis message is followed by the list of parser extension tags like <code><nowiki><charinsert></nowiki></code>, <code><nowiki><coordinates></nowiki></code>, etc.",
"version-parser-function-hooks": "Shown in [[Special:Version]]",
"version-hook-name": "Shown in [[Special:Version]].\n\nFor meaning of hook see [[mw:Special:MyLanguage/Manual:Hooks|mw:Manual:Hooks]] and [[w:Hooking]].",
"아라",
"Gertakapllani",
"OrvenBregu",
- "Macofe"
+ "Macofe",
+ "Liridon"
]
},
"tog-underline": "Nënvizo lidhjet:",
"currentrev": "Versioni i tanishëm",
"currentrev-asof": "Versioni momental që nga $1",
"revisionasof": "Versioni i $1",
- "revision-info": "Versioni më $1 nga $2",
+ "revision-info": "Rishikimet të $1 nga {{GENDER:$6|$2}}$7",
"previousrevision": "← Version më i vjetër",
"nextrevision": "Version më i ri →",
"currentrevisionlink": "shikoni versionin e tanishëm",
"compareselectedversions": "Krahasoni versionet e zgjedhura",
"showhideselectedversions": "Shfaq/fshih versionet e zgjedhura",
"editundo": "zhbëje",
+ "diff-multi-sameuser": "({{PLURAL:$1|Një versioni i ndërmjetshëm|$1 versione të ndërmjetshme}} nga përdoruesi i njëjtë nuk janë paraqitur)",
"diff-multi-manyusers": "({{PLURAL:$1|Një versioni i ndërmjetshëm|$1 versione të ndërmjetshme}} nga më shumë se $2 {{PLURAL:$2|përdorues|përdorues}} i/të pashfaqur)",
"searchresults": "Rezultatet e kërkimit",
"searchresults-title": "Rezultatet e kërkimit për \"$1\"",
"shown-title": "Trego $1 {{PLURAL:$1|rezultat|rezultate}} për faqe",
"viewprevnext": "Shikoni ($1 {{int:pipe-separator}} $2) ($3).",
"searchmenu-exists": "'''Në këtë wiki kjo faqe është emëruar \"[[:$1]]\"'''",
- "searchmenu-new": "'''Hapë faqen \"[[:$1]]\" në këtë wiki!'''",
+ "searchmenu-new": "<strong>Krijo faqen \"[[:$1]]\" në këtë wiki!</strong> {{PLURAL:$2|0=|Shih gjithashtu faqen e gjetur në kërkimin tuaj.|Shih gjithashtu rezultatet e gjetura nga kërkimi.}}",
"searchprofile-articles": "Përmbajtja e faqeve",
"searchprofile-images": "Multimedia",
"searchprofile-everything": "Gjithçka",
"searchrelated": "të ngjashme",
"searchall": "të gjitha",
"showingresults": "Më poshtë tregohen {{PLURAL:$1|'''1''' përfundim|'''$1''' përfundime}} duke filluar nga #'''$2'''.",
+ "search-showingresults": "{{PLURAL:$4|Rezultati <strong>$1</strong> i <strong>$3</strong>|Rezultati <strong>$1 - $2</strong> i <strong>$3</strong>}}",
"search-nonefound": "Nuk ka rezultate që përputhen me kërkesën.",
"powersearch-legend": "Kërkim i përparuar",
"powersearch-ns": "Kërkim në hapësira:",
"action-siteadmin": "mbyll ose hap bazën e të dhënave",
"action-sendemail": "dërgo e-maile",
"nchanges": "$1 {{PLURAL:$1|ndryshim|ndryshime}}",
+ "enhancedrc-history": "historia",
"recentchanges": "Ndryshimet e fundit",
"recentchanges-legend": "Zgjedhjet e ndryshimeve momentale",
"recentchanges-summary": "Ndiqni ndryshime së fundmi tek kjo faqe.",
"recentchanges-label-minor": "Ky është një editim i vogël",
"recentchanges-label-bot": "Ky editim është kryer nga një bot",
"recentchanges-label-unpatrolled": "Ky editim ende nuk është patrolluar",
- "recentchanges-legend-newpage": "$1 - faqe të re",
+ "recentchanges-label-plusminus": "Madhësia e faqed ndryshoj me këtë numër të bytes",
+ "recentchanges-legend-heading": "\"'Legjenda:\"'",
+ "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (gjithashtu shih [[Special:NewPages|listën e faqeve të reja]])",
"rcnotefrom": "Më poshtë janë ndryshime së fundmi nga <b>$2</b> (treguar deri në <b>$1</b>).",
"rclistfrom": "Tregon ndryshime së fundmi duke filluar nga $3 $2",
"rcshowhideminor": "$1 redaktimet e vogla",
+ "rcshowhideminor-show": "Shfaq",
+ "rcshowhideminor-hide": "Fshih",
"rcshowhidebots": "$1 robotët",
- "rcshowhideliu": "$1 përdoruesit e regjistruar",
+ "rcshowhidebots-show": "Shfaq",
+ "rcshowhidebots-hide": "Fshih",
+ "rcshowhideliu": "$1 përdorues të regjistruar",
+ "rcshowhideliu-hide": "Fshih",
"rcshowhideanons": "$1 përdoruesit anonim",
+ "rcshowhideanons-show": "Shfaq",
+ "rcshowhideanons-hide": "Fshih",
"rcshowhidepatr": "$1 redaktime të patrulluara",
"rcshowhidemine": "$1 redaktimet e mia",
+ "rcshowhidemine-show": "Shfaq",
+ "rcshowhidemine-hide": "Fshih",
"rclinks": "Trego $1 ndryshime gjatë $2 ditëve<br />$3",
"diff": "ndrysh",
"hist": "hist",
"querypage-disabled": "Kjo faqe speciale është çaktivizuar për arsye të performancës.",
"booksources": "Burime librash",
"booksources-search-legend": "Kërkim burimor librash",
+ "booksources-search": "Kërko",
"booksources-text": "Më posht është një listë me lidhje të cilët shesin ose përdorin libra dhe munden të kenë informacione për librat që kërkoni ju:",
"booksources-invalid-isbn": "ISBN-ja e dhënë nuk duket të jetë e vlefshme; kontrolloni oër gabime gjatë kopjimit nga burimi origjinal.",
"specialloguserlabel": "Performuesi:",
"mailnologin": "S'ka adresë dërgimi",
"mailnologintext": "Duhet të keni [[Special:UserLogin|hyrë brenda]] dhe të keni një adresë të saktë në [[Special:Preferences|parapëlqimet]] tuaja për tu dërguar email përdoruesve të tjerë.",
"emailuser": "Email përdoruesit",
- "emailpage": "Dërgo email përdoruesve",
"emailpagetext": "Mund të përdorni formularin e mëposhtëm për të dërguar e-mail tek ky përdorues.\nAdresa e email-it që shkruat tek [[Special:Preferences|preferencat tuaja]] do të duket si \"Nga\" adresa e email-it, pra marrësi do të ketë mundësinë t'ju përgjigjet direkt.",
"defemailsubject": "{{SITENAME}} posta elektronike nga përdoruesi \"$1\"",
"usermaildisabled": "Email-i i përdoruesit çaktivizua",
"tooltip-pt-mycontris": "Lista e kontributeve tuaja",
"tooltip-pt-login": "Identifikimi nuk është i detyrueshëm, megjithatë ne jua rekomandojmë.",
"tooltip-pt-logout": "Dalje",
+ "tooltip-pt-createaccount": "Ju rekomandojmë të krijoni një llogari dhe të kyqeni; megjithatë, nuk është e detyrueshme",
"tooltip-ca-talk": "Diskutim për përmbajtjen e faqes",
"tooltip-ca-edit": "Redakto këtë faqe",
"tooltip-ca-addsection": "Fillo një temë të re diskutimi.",
"spam_reverting": "U kthye tek versioni i fundit që s'ka lidhje tek $1",
"spam_blanking": "U boshatis sepse të gjitha versionet kanë lidhje tek $1",
"spam_deleting": "Të gjitha inspektimet përmbanin lidhje në $1, duke fshirë",
- "simpleantispam-label": "Kontroll anti-spam.\n'''MOS''' e plotësoni këtë!",
+ "simpleantispam-label": "Kontrolli anti-spam.\n<strong>Mos</strong> e plotëso këtë!",
"pageinfo-title": "Informacion për \" $1 \"",
"pageinfo-header-edits": "Redaktimet",
"pageinfo-watchers": "Numri i mbikqyrësve",
"pageinfo-edits": "Numri i redaktimeve",
"pageinfo-authors": "Numri i autorëve të veçantë",
+ "pageinfo-toolboxlink": "Informacioni i faqes",
"markaspatrolleddiff": "Shënoje si të patrulluar",
"markaspatrolledtext": "Shënoje këtë artikull të patrulluar",
"markedaspatrolled": "Shënoje të patrulluar",
"file-info-size-pages": "$1 × $2 pixel, madhësia e dokumentit: $3 , MIME tipi: $4 , $5 {{PLURAL:$5| faqe | faqet}}",
"file-nohires": "Nuk ka rezolucion më të madh.",
"svg-long-desc": "skedë SVG, fillimisht $1 × $2 pixel, madhësia e skedës: $3",
- "show-big-image": "Rezolucion i plotë",
+ "show-big-image": "Dokumenti origjinal",
"show-big-image-preview": "Madhësia e këtij shikimi: $1.",
"show-big-image-other": "{{PLURAL:$2|Rezolucion tjetër|Rezolucione të tjera}}: $1.",
"show-big-image-size": "$1 × $2 pixel",
"tags": "Etiketat e ndryshimeve të pavlefshme",
"tag-filter": "[[Special:Tags|Etiketa]] filter:",
"tag-filter-submit": "Filtër",
+ "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Etiketa|Etiketat}}]]: $2)",
"tags-title": "Etiketat",
"tags-intro": "Kjo faqe liston etiketat që softueri mund t'i shënojë me një redaktim, dhe kuptimin e tyre.",
"tags-tag": "Emri i etiketës",
"htmlform-selectorother-other": "Gjitha",
"sqlite-has-fts": "$1 me mbështetje të kërkimit me teskt të plotë",
"sqlite-no-fts": "$1 pa mbështetje të kërkimit me teskt të plotë",
- "logentry-delete-delete": "$1 grisi faqen $3",
+ "logentry-delete-delete": "$1 faqe të {{GENDER:$2|grisura}} $3",
"logentry-delete-restore": "$1 riktheu faqen $3",
"logentry-delete-event": "$1 ndryshoi dukshmërinë e {{PLURAL:$5|një ngjarje regjistri|$5 ngjarjeve regjistri}} në $3: $4",
"logentry-delete-revision": "$1 ndryshoi dukshmërinë e {{PLURAL:$5|një versioni|$5 versioneve}} në $3: $4",
"revdelete-uname-unhid": "emri i përdoruesit jo i fshehur",
"revdelete-restricted": "u vendosën kufizime për administruesit",
"revdelete-unrestricted": "u hoqën kufizimet për administruesit",
- "logentry-move-move": "$1 zhvendosi faqen $3 te $4",
+ "logentry-move-move": "$1 {{GENDER:$2|zhvendosi}} faqen $3 tek $4",
"logentry-move-move-noredirect": "$1 zhvendosi faqen $3 te $4 pa lënë një përcjellim",
"logentry-move-move_redir": "$1 zhvendosi faqen $3 te $4 nëpërmjet përcjellimit",
"logentry-move-move_redir-noredirect": "$1 zhvendosi faqen $3 te $4 nëpërmjet një përcjellimi pa lënë një përcjellim",
"logentry-patrol-patrol": "$1 shënoi versionin $4 të faqes $3 të patrolluar",
"logentry-patrol-patrol-auto": "$1 automatikisht shënoi versionin $4 të faqes $3 të patrolluar",
"logentry-newusers-newusers": "$1 krijoi një llogari",
- "logentry-newusers-create": "$1 krijoi një llogari",
+ "logentry-newusers-create": "Llogari e përdoruesit $1 ishte {{GENDER:$2|krijuar}}",
"logentry-newusers-create2": "$1 krijoi një llogari $3",
"logentry-newusers-autocreate": "Llogaria $1 u krijua automatikisht",
+ "logentry-upload-upload": "$1 {{GENDER:$2|ngarkoj}} $3",
"rightsnone": "(asgjë)",
"revdelete-summary": "përmbledhja redaktimit",
"feedback-adding": "Duke shtuar përshtypjen te faqja...",
"undeletepagetext": "{{PLURAL:$1|Следећа страница је обрисана, али је још у архиви и може бити враћена|Следеће $1 странице су обрисане, али су још у архиви и могу бити враћене|Следећих $1 страница је обрисано, али су још у архиви и могу бити враћене}}.\nАрхива се повремено чисти од оваквих страница.",
"undelete-fieldset-title": "Враћање измена",
"undeleteextrahelp": "Да бисте вратили целу историју странице, оставите све кућице неозначене и кликните на дугме '''''{{int:undeletebtn}}'''''.\nАко желите да вратите одређене измене, означите их и кликните на '''''{{int:undeletebtn}}'''''.",
- "undeleterevisions": "$1 {{PLURAL:$1|измена је архивирана|измене су архивиране|измена је архивирано}}",
+ "undeleterevisions": "{{PLURAL:$1|Измена}} обрисано: $1",
"undeletehistory": "Ако вратите страницу, све ревизије ће бити враћене њеној историји.\nАко је у међувремену направљена нова страница с истим називом, враћене измене ће се појавити у њеној ранијој историји.",
"undeleterevdel": "Враћање неће бити извршено ако је резултат тога делимично брисање последње измене.\nУ таквим случајевима морате искључити или открити најновије обрисане измене.",
"undeletehistorynoadmin": "Ова страница је обрисана.\nРазлог за брисање се налази испод, заједно с детаљима о кориснику који је изменио ову страницу пре брисања.\nТекст обрисаних измена је доступан само администраторима.",
"tags-deactivate-reason": "Разлог:",
"tags-deactivate-not-allowed": "Није могуће деактивирати ознаку „$1“.",
"tags-deactivate-submit": "Декативирај",
+ "tags-edit-title": "Уреди ознаке",
"tags-edit-existing-tags": "Постојеће ознаке:",
"tags-edit-new-tags": "Нове ознаке:",
"tags-edit-reason": "Разлог:",
"logentry-newusers-create2": "Användarkonto $3 har {{GENDER:$2|skapats}} av $1",
"logentry-newusers-byemail": "Användarkontot $3 har {{GENDER:$2|skapats}} av $1 och lösenordet skickades via e-post",
"logentry-newusers-autocreate": "Användarkontot $1 {{GENDER:$2|skapades}} automatiskt",
+ "logentry-protect-move_prot": "$1 {{GENDER:$2|flyttade}} skyddsinställningarna från $4 till $3",
"logentry-rights-rights": "$1 {{GENDER:$2|ändrade}} gruppmedlemskapet för $3 från $4 till $5",
"logentry-rights-rights-legacy": "$1 {{GENDER:$2|ändrade}} gruppmedlemskapet för $3",
"logentry-rights-autopromote": "$1 {{GENDER:$2|befordrades}} automatiskt från $4 till $5",
"minoreditletter": "சி",
"newpageletter": "பு",
"boteditletter": "தா",
- "unpatrolledletter": "\n{{delete}}\n!",
"number_of_watching_users_pageview": "[இப்பக்க்த்தை {{PLURAL:$1|ஒரு பயனர் பார்கிறார்|$1 பயனர்கள் பார்கிறார்கள்}}]",
"rc_categories": "பகுப்புகளுக்கு மட்டுப்படுத்து (\"|\" குறியீட்டால் பிரிக்கப்பட்டுள்ளது)",
"rc_categories_any": "ஏதாவது",
"permalink": "Link parmanente",
"print": "Stanpa",
"view": "Varda",
+ "view-foreign": "Varda su $1",
"edit": "Canbia",
"create": "Crea",
"editthispage": "Canbia sta pagina",
"loginlanguagelabel": "Lengua: $1",
"suspicious-userlogout": "Ła to richiesta de disconesion xè sta negà parché e a senbra invià da on browser non funsionante o on proxy de caching.",
"pt-login": "Va drento",
+ "pt-userlogout": "Và fora",
"php-mail-error-unknown": "Erore sconosudo nte'l funsionamento deła posta ełetronega PHP",
"user-mail-no-addy": "Te ghe provà spedire un mesajo de posta ełetronega sensa un indiriso.",
"user-mail-no-body": "Tentà de inviar na e-mail có un testo vodo o masa curto.",
"recentchanges-label-bot": "Sta modifica el la ga fata un bot",
"recentchanges-label-unpatrolled": "Sta modifica no la xe stà gnancora verificà",
"recentchanges-label-plusminus": "La dimension de la pagina la xe canbià de sto nùmaro de byte",
+ "recentchanges-legend-heading": "'''Legenda:'''",
"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (varda anca [[Special:NewPages|l'elenco de le pagine nove]])",
"rcnotefrom": "Qui di seguito sono elencate le modifiche da '''$2''' (fino a '''$1''').",
"rclistfrom": "Mostra i canbiamenti fati da ƚe $2 del $3",
"rcshowhideliu": "$1 i utenti registrài",
"rcshowhideliu-hide": "Scondi",
"rcshowhideanons": "$1 i utenti anonimi",
+ "rcshowhideanons-show": "Mostra",
"rcshowhideanons-hide": "Scondi",
"rcshowhidepatr": "$1 łe modifeghe controłae",
"rcshowhidemine": "$1 i me canbiamenti",
"emailuser": "Scrìveghe a sto utente",
"emailuser-title-target": "Scrivi na e-mail a {{GENDER:$1|sto|sta}} utente",
"emailuser-title-notarget": "Scrivi na e-mail a l'utente",
- "emailpage": "Scrivi na e-mail a l'utente",
"emailpagetext": "Te podi usar el moduło chi soto par mandare na e-mail a sto {{GENDER:$1|utente}}.\nŁa e-mail che te ghè indicà inte łe [[Special:Preferences|to prefarense]] ła vegnarà fora inte'l canpo \"Da\" de la mail, cusì che'l destinatario el posa rispóndarte diretamente a ti.",
"defemailsubject": "Mesajo da {{SITENAME}} dal utente \"$1\"",
"usermaildisabled": "e-mail utente disabiłità",
"spam_reverting": "Ripristinà l'ultima version priva de colegamenti a $1",
"spam_blanking": "Pàxena svodà, tute łe version le contegneva cołegamenti a $1",
"spam_deleting": "Pàjina scansełà, tute łe version łe contegneva ligamenti a $1",
- "simpleantispam-label": "Controlo anti spam.\n'''NO STA''' scrivar gnente qua de soto!",
+ "simpleantispam-label": "Controlo anti spam.\n<strong>No stà</strong> scrivar gnente qua drento!",
"pageinfo-title": "Informasion par \"$1\"",
"pageinfo-not-current": "Ne disipiaxe, ma xe inposibiłe fornir sta informasion par vecie version.",
"pageinfo-header-basic": "Informassion de base",
"logentry-rights-rights": "$1 {{GENDER:$2|el|la}} ga canbià l'apartenensa de $3 dal grupo $4 al grupo $5",
"logentry-rights-rights-legacy": "$1 {{GENDER:$2|el|la}} ga canbià l'apartenensa a grupi de $3",
"logentry-rights-autopromote": "$1 {{GENDER:$2|el|la}} xe stà automategamente promoso/a da $4 a $5",
+ "logentry-upload-upload": "$1 {{GENDER:$2|el|la}} gà cargà $3",
"rightsnone": "(nissun)",
"revdelete-summary": "modifica ogeto",
"feedback-adding": "Inserimento del feedback inte ła pàjina...",
"autosumm-newblank": "Đã tạo trang trống",
"size-kilobytes": "$1 kB",
"size-kilopixel": "$1 kP",
- "bitrate-bits": "$1 bps",
- "bitrate-kilobits": "$1 kbps",
- "bitrate-megabits": "$1 Mbps",
- "bitrate-gigabits": "$1 Gbps",
- "bitrate-terabits": "$1 Tbps",
- "bitrate-petabits": "$1 Pbps",
+ "bitrate-bits": "$1 bit/s",
+ "bitrate-kilobits": "$1 kbit/s",
+ "bitrate-megabits": "$1 Mbit/s",
+ "bitrate-gigabits": "$1 Gbit/s",
+ "bitrate-terabits": "$1 Tbit/s",
+ "bitrate-petabits": "$1 Pbit/s",
"bitrate-exabits": "$1 Ebps",
- "bitrate-zetabits": "$1 Zbps",
- "bitrate-yottabits": "$1 Ybps",
+ "bitrate-zetabits": "$1 Zbit/s",
+ "bitrate-yottabits": "$1 Ybit/s",
"lag-warn-normal": "Những thay đổi trong vòng $1 {{PLURAL:||}}giây trở lại đây có thể chưa xuất hiện trong danh sách.",
"lag-warn-high": "Do độ trễ của máy chủ cơ sở dữ liệu, những thay đổi trong vòng $1 {{PLURAL:$1||}}giây trở lại đây có thể chưa xuất hiện trong danh sách.",
"watchlistedit-normal-title": "Sửa các trang tôi theo dõi",
"javascripttest-pagetext-frameworks": "请选择以下的框架之一：$1",
"javascripttest-pagetext-skins": "选择外观来运行测试：",
"javascripttest-qunit-intro": "请见mediawiki.org的[$1 测试说明文件]。",
- "tooltip-pt-userpage": "你的用户页面",
+ "tooltip-pt-userpage": "您的用户页",
"tooltip-pt-anonuserpage": "你用于编辑的IP地址的用户页面",
"tooltip-pt-mytalk": "你的讨论页面",
"tooltip-pt-anontalk": "有关本IP地址的编辑的讨论",
* @ingroup Language
* @file
*
+ * @author Rachitrali
*/
$fallback = 'ur';
$namespaceNames = array(
NS_MEDIA => 'میڈیا',
NS_SPECIAL => 'خاص',
- NS_TALK => 'مشقولگی',
- NS_USER => 'ممبار/یوزر',
+ NS_TALK => 'تبادلۂ_خیال',
+ NS_USER => 'صارف',
+ NS_USER_TALK => 'تبادلۂ_خیال_صارف',
+ NS_PROJECT_TALK => 'تبادلۂ_خیال_$1',
+ NS_FILE => 'فائل',
+ NS_FILE_TALK => 'تبادلۂ_خیال_فائل',
+ NS_MEDIAWIKI => 'میڈیاویکی',
+ NS_MEDIAWIKI_TALK => 'تبادلۂ_خیال_میڈیاویکی',
+ NS_TEMPLATE => 'سانچہ',
+ NS_TEMPLATE_TALK => 'تبادلۂ_خیال_سانچہ',
+ NS_HELP => 'مدد',
+ NS_HELP_TALK => 'تبادلۂ_خیال_مدد',
+ NS_CATEGORY => 'زمرہ',
+ NS_CATEGORY_TALK => 'تبادلۂ_خیال_زمرہ',
);
);
$separatorTransformTable = array( ',' => "\xc2\xa0", '.' => ',' );
+/**
+ * A list of date format preference keys, which can be selected in user
+ * preferences. New preference keys can be added, provided they are supported
+ * by the language class's timeanddate(). Only the 5 keys listed below are
+ * supported by the wikitext converter (parser/DateFormatter.php).
+ *
+ * The special key "default" is an alias for either dmy or mdy depending on
+ * $wgAmericanDates
+ */
+$datePreferences = array(
+ 'default',
+ 'ydm',
+ 'mdy',
+ 'dmy',
+ 'ymd',
+ 'ISO 8601',
+);
+
+/**
+ * The date format to use for generated dates in the user interface.
+ * This may be one of the above date preferences, or the special value
+ * "dmy or mdy", which uses mdy if $wgAmericanDates is true, and dmy
+ * if $wgAmericanDates is false.
+ */
+$defaultDateFormat = 'ydm';
+
+/**
+ * Associative array mapping old numeric date formats, which may still be
+ * stored in user preferences, to the new string formats.
+ */
+$datePreferenceMigrationMap = array(
+ 'default',
+ 'mdy',
+ 'dmy',
+ 'ymd'
+);
+
+/**
+ * These are formats for dates generated by MediaWiki (as opposed to the wikitext
+ * DateFormatter). Documentation for the format string can be found in
+ * Language.php, search for sprintfDate.
+ *
+ * This array is automatically inherited by all subclasses. Individual keys can be
+ * overridden.
+ */
+$dateFormats = array(
+ 'ydm time' => 'H.i',
+ 'ydm date' => 'Y". gada" j. F',
+ 'ydm monthonly' => 'Y". gada" F',
+ 'ydm both' => 'Y". gada" j. F", plkst." H.i',
+ 'ydm pretty' => 'j F',
+
+ 'mdy time' => 'H:i',
+ 'mdy date' => 'F j, Y',
+ 'mdy monthonly' => 'F Y',
+ 'mdy both' => 'H:i, F j, Y',
+ 'mdy pretty' => 'F j',
+
+ 'dmy time' => 'H:i',
+ 'dmy date' => 'j F Y',
+ 'dmy monthonly' => 'F Y',
+ 'dmy both' => 'H:i, j F Y',
+ 'dmy pretty' => 'j F',
+
+ 'ymd time' => 'H:i',
+ 'ymd date' => 'Y F j',
+ 'ymd monthonly' => 'Y F',
+ 'ymd both' => 'H:i, Y F j',
+ 'ymd pretty' => 'F j',
+
+ 'ISO 8601 time' => 'xnH:xni:xns',
+ 'ISO 8601 date' => 'xnY-xnm-xnd',
+ 'ISO 8601 monthonly' => 'xnY-xnm',
+ 'ISO 8601 both' => 'xnY-xnm-xnd"T"xnH:xni:xns',
+ 'ISO 8601 pretty' => 'xnm-xnd'
+);
$namespaceNames = array(
NS_MEDIA => 'माध्यमम्',
- NS_SPECIAL => 'विशà¥\87षमà¥\8d',
+ NS_SPECIAL => 'विशà¥\87षà¤\83',
NS_TALK => 'सम्भाषणम्',
- NS_USER => 'यà¥\8bà¤\9cà¤\95ः',
- NS_USER_TALK => 'यà¥\8bà¤\9cà¤\95सम्भाषणम्',
+ NS_USER => 'सदसà¥\8dयः',
+ NS_USER_TALK => 'सदसà¥\8dयसम्भाषणम्',
NS_PROJECT_TALK => '$1सम्भाषणम्',
- NS_FILE => 'à¤\9aितà¥\8dरमà¥\8d',
- NS_FILE_TALK => 'à¤\9aितà¥\8dरसम्भाषणम्',
- NS_MEDIAWIKI => 'मिडà¥\80याविà¤\95à¥\80',
- NS_MEDIAWIKI_TALK => 'मिडियाविà¤\95à¥\80सम्भाषणम्',
+ NS_FILE => 'सà¤\9eà¥\8dà¤\9aिà¤\95ा',
+ NS_FILE_TALK => 'सà¤\9eà¥\8dà¤\9aिà¤\95ासम्भाषणम्',
+ NS_MEDIAWIKI => 'मà¥\80डियाविà¤\95ि',
+ NS_MEDIAWIKI_TALK => 'मà¥\80डियाविà¤\95िसम्भाषणम्',
NS_TEMPLATE => 'फलकम्',
- NS_TEMPLATE_TALK => 'फलà¤\95सà¥\8dय_समà¥\8dà¤à¤¾à¤·à¤£à¤®à¥\8d',
- NS_HELP => 'सहाय्यम्',
- NS_HELP_TALK => 'सहायà¥\8dयसà¥\8dय_सम्भाषणम्',
+ NS_TEMPLATE_TALK => 'फलकसम्भाषणम्',
+ NS_HELP => 'साहायà¥\8dयमà¥\8d',
+ NS_HELP_TALK => 'साहायà¥\8dयसम्भाषणम्',
NS_CATEGORY => 'वर्गः',
NS_CATEGORY_TALK => 'वर्गसम्भाषणम्',
);
$namespaceAliases = array(
'माध्यम' => NS_MEDIA,
'विशेष' => NS_SPECIAL,
+ 'विशेषम्' => NS_SPECIAL,
'संभाषणं' => NS_TALK,
+ 'योजकः' => NS_USER,
'योजकसंभाषणं' => NS_USER_TALK,
- '$1संभाषणं' => NS_PROJECT_TALK,
+ 'योजकसम्भाषणम्' => NS_USER_TALK,
+ '$1संभाषणं' => NS_PROJECT_TALK,
'चित्रं' => NS_FILE,
+ 'चित्रम्' => NS_FILE,
'चित्रसंभाषणं' => NS_FILE_TALK,
- 'मिडियाविकीसंभाषणं' => NS_MEDIAWIKI_TALK,
+ 'चित्रसम्भाषणम्' => NS_FILE_TALK,
+ 'मिडीयाविकी' => NS_MEDIAWIKI,
+ 'मिडियाविकीसंभाषणं' => NS_MEDIAWIKI_TALK,
+ 'मिडियाविकीसम्भाषणम्' => NS_MEDIAWIKI_TALK,
'बिंबधर' => NS_TEMPLATE,
- 'बिंबधर_संभाषणं' => NS_TEMPLATE_TALK,
+ 'बिंबधर_संभाषणं' => NS_TEMPLATE_TALK,
+ 'फलकस्य_सम्भाषणम्' => NS_TEMPLATE_TALK,
'सहाय्य' => NS_HELP,
+ 'सहाय्यम्' => NS_HELP,
'सहाय्यसंभाषणं' => NS_HELP_TALK,
+ 'सहाय्यस्य_सम्भाषणम्' => NS_HELP_TALK,
'उपकारः' => NS_HELP,
- 'उपकारसंभाषणं' => NS_HELP_TALK,
- 'वर्गसंभाषणं' => NS_CATEGORY_TALK,
+ 'उपकारसंभाषणं' => NS_HELP_TALK,
+ 'वर्गसंभाषणं' => NS_CATEGORY_TALK,
);
$specialPageAliases = array(
}
$this->output( $title->getPrefixedText() );
- $dbw->begin( __METHOD__ );
if ( $title->getNamespace() == NS_FILE ) {
$img = wfFindFile( $title, array( 'ignoreRedirect' => true ) );
if ( $img && $img->isLocal() && !$img->delete( $reason ) ) {
}
$page = WikiPage::factory( $title );
$error = '';
- $success = $page->doDeleteArticle( $reason, false, 0, false, $error, $user );
- $dbw->commit( __METHOD__ );
+ $success = $page->doDeleteArticle( $reason, false, 0, true, $error, $user );
if ( $success ) {
$this->output( " Deleted!\n" );
} else {
$dbw->ping();
$title = Title::makeTitle( $row->page_namespace, $row->page_title );
$page = WikiPage::factory( $title );
- $dbw->begin( __METHOD__ );
$error = ''; // Passed by ref
- $page->doDeleteArticle( 'No longer required', false, 0, false, $error, $user );
- $dbw->commit( __METHOD__ );
+ // FIXME: Deletion failures should be reported, not silently ignored.
+ $page->doDeleteArticle( 'No longer required', false, 0, true, $error, $user );
}
$this->output( "done!\n", 'msg' );
$this->output( "\n* [[$title]]" );
$page = WikiPage::factory( $title );
$error = ''; // Passed by ref
- $page->doDeleteArticle( 'No longer required', false, 0, false, $error, $user );
+ $success = $page->doDeleteArticle( 'No longer required', false, 0, true, $error, $user );
+ if ( !$success ) {
+ $this->output( " (Failed!)" );
+ }
if ( $result['hasTalk'] && $doDeleteTalk ) {
$title = Title::makeTitle( NS_MEDIAWIKI_TALK, $result['title'] );
$this->output( "\n* [[$title]]" );
$page = WikiPage::factory( $title );
$error = ''; // Passed by ref
- $page->doDeleteArticle( 'Orphaned talk page of no longer required message',
- false, 0, false, $error, $user );
+ $success = $page->doDeleteArticle( 'Orphaned talk page of no longer required message',
+ false, 0, true, $error, $user );
+ if ( !$success ) {
+ $this->output( " (Failed!)" );
+ }
}
}
$this->output( "\n\ndone!\n" );
"mw.user",
"mw.util",
"mw.plugin.*",
- "mw.cookie"
+ "mw.cookie",
+ "mw.experiments"
]
},
{
* @ingroup Maintenance
*/
class ShowJobs extends Maintenance {
+ protected static $stateMethods = array(
+ 'unclaimed' => 'getAllQueuedJobs',
+ 'delayed' => 'getAllDelayedJobs',
+ 'claimed' => 'getAllAcquiredJobs',
+ 'abandoned' => 'getAllAbandonedJobs',
+ );
+
public function __construct() {
parent::__construct();
$this->mDescription = "Show number of jobs waiting in master database";
$this->addOption( 'group', 'Show number of jobs per job type' );
- $this->addOption( 'list',
- 'Show a list of all jobs in a machine-readable format, instead of statistics' );
+ $this->addOption( 'list', 'Show a list of all jobs instead of counts' );
$this->addOption( 'type', 'Only show/count jobs of a given type', false, true );
+ $this->addOption( 'status', 'Filter list by state (unclaimed,delayed,claimed,abandoned)' );
+ $this->addOption( 'limit', 'Limit of jobs listed' );
}
public function execute() {
- $filterType = $this->getOption( 'type', '' );
+ $typeFilter = $this->getOption( 'type', '' );
+ $stateFilter = $this->getOption( 'status', '' );
+ $stateLimit = (float)$this->getOption( 'limit', INF );
+
$group = JobQueueGroup::singleton();
+
+ $filteredTypes = $typeFilter
+ ? array( $typeFilter )
+ : $group->getQueueTypes();
+ $filteredStates = $stateFilter
+ ? array_intersect_key( self::$stateMethods, array( $stateFilter => 1 ) )
+ : self::$stateMethods;
+
if ( $this->hasOption( 'list' ) ) {
- foreach ( $group->getQueueTypes() as $type ) {
- if ( $filterType != '' && $type != $filterType ) {
- continue;
- }
+ $count = 0;
+ foreach ( $filteredTypes as $type ) {
$queue = $group->get( $type );
- foreach ( $queue->getAllQueuedJobs() as $job ) {
- $this->output( $job->toString() . " status=unclaimed\n" );
- }
- foreach ( $queue->getAllDelayedJobs() as $job ) {
- $this->output( $job->toString() . " status=delayed\n" );
- }
- foreach ( $queue->getAllAcquiredJobs() as $job ) {
- $this->output( $job->toString() . " status=claimed\n" );
- }
- foreach ( $queue->getAllAbandonedJobs() as $job ) {
- $this->output( $job->toString() . " status=abandoned\n" );
+ foreach ( $filteredStates as $state => $method ) {
+ foreach ( $queue->$method() as $job ) {
+ /** @var Job $job */
+ $this->output( $job->toString() . " status=$state\n" );
+ if ( ++$count >= $stateLimit ) {
+ return;
+ }
+ }
}
}
} elseif ( $this->hasOption( 'group' ) ) {
- foreach ( $group->getQueueTypes() as $type ) {
- if ( $filterType != '' && $type != $filterType ) {
- continue;
- }
+ foreach ( $filteredTypes as $type ) {
$queue = $group->get( $type );
$delayed = $queue->getDelayedCount();
$pending = $queue->getSize();
}
} else {
$count = 0;
- foreach ( $group->getQueueTypes() as $type ) {
- if ( $filterType != '' && $type != $filterType ) {
- continue;
- }
+ foreach ( $filteredTypes as $type ) {
$count += $group->get( $type )->getSize();
}
$this->output( "$count\n" );
),
),
'mediawiki.ForeignApi' => array(
+ 'targets' => array( 'desktop', 'mobile' ),
'class' => 'ResourceLoaderForeignApiModule',
// Additional dependencies generated dynamically
'dependencies' => 'mediawiki.ForeignApi.core',
'mediawiki.api',
'oojs',
),
+ 'targets' => array( 'desktop', 'mobile' ),
),
'mediawiki.helplink' => array(
'position' => 'top',
'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
'position' => 'top',
),
+ 'mediawiki.experiments' => array(
+ 'scripts' => 'resources/src/mediawiki/mediawiki.experiments.js',
+ 'targets' => array( 'desktop', 'mobile' ),
+ ),
/* MediaWiki Action */
'mediawiki.page.gallery' => array(
'scripts' => 'resources/src/mediawiki.page/mediawiki.page.gallery.js',
'dependencies' => array(
+ 'mediawiki.page.gallery.styles',
'jquery.throttle-debounce',
)
),
+ 'mediawiki.page.gallery.styles' => array(
+ 'styles' => array(
+ 'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
+ 'resources/src/mediawiki.page/mediawiki.page.gallery.css',
+ ),
+ 'position' => 'top',
+ 'targets' => array( 'desktop', 'mobile' ),
+ ),
'mediawiki.page.ready' => array(
'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
'dependencies' => array(
'mediawiki.legacy.commonPrint' => array(
'position' => 'top',
'styles' => array(
+ // @todo: Remove mediawiki.page.gallery when cache has cleared
+ 'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
),
'group' => 'print',
'mediawiki.legacy.shared' => array(
'position' => 'top',
'styles' => array(
+ // @todo: Remove when mediawiki.page.gallery in cached html.
+ 'resources/src/mediawiki.page/mediawiki.page.gallery.css',
'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
),
),
if ( substr( $name, 0, 5 ) === 'icons' ) {
$module['selectorWithoutVariant'] = '.oo-ui-icon-{name}, .mw-ui-icon-{name}:before';
- $module['selectorWithVariant'] = '.oo-ui-image-{variant} .oo-ui-icon-{name},
+ $module['selectorWithVariant'] = '
.oo-ui-image-{variant}.oo-ui-icon-{name}, .mw-ui-icon-{name}-{variant}:before,
+ /* Hack for Flow, see T110051 */
.mw-ui-hovericon:hover .mw-ui-icon-{name}-{variant}-hover:before,
.mw-ui-hovericon.mw-ui-icon-{name}-{variant}-hover:hover:before';
}
"ooui-dialog-process-retry": "Vuelvi a intentalo",
"ooui-dialog-process-continue": "Siguir",
"ooui-selectfile-not-supported": "Nun hai encontu pa la seleición de ficheros",
- "ooui-selectfile-placeholder": "Nun se seleicionó nengún ficheru"
+ "ooui-selectfile-placeholder": "Nun se seleicionó nengún ficheru",
+ "ooui-selectfile-dragdrop-placeholder": "Soltar el ficheru equí (o facer clic pa restolar)"
}
"ooui-dialog-process-retry": "Torneu-ho a provar",
"ooui-dialog-process-continue": "Continua",
"ooui-selectfile-not-supported": "El tipus de fitxer no és compatible",
- "ooui-selectfile-placeholder": "No s'ha seleccionat cap fitxer"
+ "ooui-selectfile-placeholder": "No s'ha seleccionat cap fitxer",
+ "ooui-selectfile-dragdrop-placeholder": "Deixeu-hi anar el fitxer (o feu clic a navega)"
}
"ooui-dialog-process-retry": "Erneut versuchen",
"ooui-dialog-process-continue": "Fortfahren",
"ooui-selectfile-not-supported": "Die Dateiauswahl wird nicht unterstützt",
- "ooui-selectfile-placeholder": "Keine Datei ausgewählt"
+ "ooui-selectfile-placeholder": "Keine Datei ausgewählt",
+ "ooui-selectfile-dragdrop-placeholder": "Dateien hier ablegen (oder klicken zum Durchsuchen)"
}
"Geraki",
"Glavkos",
"Nikosguard",
- "Tifa93"
+ "Tifa93",
+ "Stam.nikos"
]
},
"ooui-outline-control-move-down": "Μετακίνηση στοιχείου προς τα κάτω",
"ooui-dialog-process-retry": "Δοκιμάστε ξανά",
"ooui-dialog-process-continue": "Συνέχεια",
"ooui-selectfile-not-supported": "Επιλογή αρχείου δεν υποστηρίζεται",
- "ooui-selectfile-placeholder": "Κανένα αρχείο δεν είναι επιλεγμένο"
+ "ooui-selectfile-placeholder": "Κανένα αρχείο δεν είναι επιλεγμένο",
+ "ooui-selectfile-dragdrop-placeholder": "Σύρετε ένα αρχείο εδώ (ή κάντε κλικ για αναζήτηση)"
}
"ooui-dialog-process-continue": "Continue",
"ooui-selectfile-not-supported": "File selection is not supported",
"ooui-selectfile-placeholder": "No file is selected",
+ "ooui-selectfile-dragdrop-placeholder": "Drop file here (or click to browse)",
"ooui-semicolon-separator": "; "
}
"ooui-dialog-process-retry": "Intentar de nuevo",
"ooui-dialog-process-continue": "Continuar",
"ooui-selectfile-not-supported": "No se admite la selección de archivos",
- "ooui-selectfile-placeholder": "Ningún archivo seleccionado"
+ "ooui-selectfile-placeholder": "Ningún archivo seleccionado",
+ "ooui-selectfile-dragdrop-placeholder": "Soltar el archivo aquí (o pulsa para examinar)"
}
"ooui-dialog-process-retry": "Proovi uuesti",
"ooui-dialog-process-continue": "Jätka",
"ooui-selectfile-not-supported": "Faili valiku tugi puudub",
- "ooui-selectfile-placeholder": "Faili ei ole valitud"
+ "ooui-selectfile-placeholder": "Faili ei ole valitud",
+ "ooui-selectfile-dragdrop-placeholder": "Lohista fail siia (või klõpsa, et sirvida)"
}
"ooui-dialog-process-retry": "Réessayer",
"ooui-dialog-process-continue": "Continuer",
"ooui-selectfile-not-supported": "La sélection de fichier n’est pas prise en charge",
- "ooui-selectfile-placeholder": "Aucun fichier sélectionné"
+ "ooui-selectfile-placeholder": "Aucun fichier sélectionné",
+ "ooui-selectfile-dragdrop-placeholder": "Déposer le fichier ici (ou cliquez pour parcourir)"
}
"ooui-dialog-process-retry": "Inténteo de novo",
"ooui-dialog-process-continue": "Continuar",
"ooui-selectfile-not-supported": "Non está soportada a selección de ficheiros",
- "ooui-selectfile-placeholder": "Non se seleccionou ningún ficheiro"
+ "ooui-selectfile-placeholder": "Non se seleccionou ningún ficheiro",
+ "ooui-selectfile-dragdrop-placeholder": "Solte un ficheiro aquí (ou prema para buscalo)"
}
"ooui-dialog-process-retry": "לנסות שוב",
"ooui-dialog-process-continue": "המשך",
"ooui-selectfile-not-supported": "בחירת קבצים אינה נתמכת",
- "ooui-selectfile-placeholder": "לא נבחר שום קובץ"
+ "ooui-selectfile-placeholder": "לא נבחר שום קובץ",
+ "ooui-selectfile-dragdrop-placeholder": "נא לשחרר את הקובץ כאן (או ללחוץ לעיון)"
}
"ooui-dialog-process-error": "មានបញ្ហាអ្វីមួយ",
"ooui-dialog-process-dismiss": "បិទ",
"ooui-dialog-process-retry": "ព្យាយាមម្ដងទៀត",
- "ooui-dialog-process-continue": "បន្ត"
+ "ooui-dialog-process-continue": "បន្ត",
+ "ooui-selectfile-not-supported": "ការជ្រើសរើសឯកសារមិនអាចប្រើបានទេ",
+ "ooui-selectfile-placeholder": "គ្មានឯកសារណាមួយត្រូវបានជ្រើសរើស",
+ "ooui-selectfile-dragdrop-placeholder": "ទម្លាក់ឯកសារនៅទីនេះ(ឬចុចដើម្បីរាវរក)"
}
"ooui-dialog-process-dismiss": "Verwerfen",
"ooui-dialog-process-retry": "Nach eng Kéier probéieren",
"ooui-dialog-process-continue": "Virufueren",
- "ooui-selectfile-placeholder": "Et ass kee Fichier erausgesicht"
+ "ooui-selectfile-placeholder": "Et ass kee Fichier erausgesicht",
+ "ooui-selectfile-dragdrop-placeholder": "Fichier hei deposéieren (oder klickt fir ze sichen)"
}
"ooui-dialog-process-retry": "Bandykite dar kartą",
"ooui-dialog-process-continue": "Tęsti",
"ooui-selectfile-not-supported": "Failų pasirinkimas nepalaikomas",
- "ooui-selectfile-placeholder": "Nėra pasirinktų failų"
+ "ooui-selectfile-placeholder": "Nėra pasirinktų failų",
+ "ooui-selectfile-dragdrop-placeholder": "Atitempkite failą čia (arba paspauskite paieškai)"
}
"ooui-dialog-process-retry": "Обиди се пак",
"ooui-dialog-process-continue": "Продолжи",
"ooui-selectfile-not-supported": "Изборот на податотеки не е поддржан",
- "ooui-selectfile-placeholder": "Немате одбрано податотека"
+ "ooui-selectfile-placeholder": "Немате одбрано податотека",
+ "ooui-selectfile-dragdrop-placeholder": "Тука пуштете ја податотеката (или стиснете за да прелистате)"
}
"Jacenty359",
"Matik7",
"Gloria sah",
- "Andrzej aa"
+ "Andrzej aa",
+ "The Polish"
]
},
"ooui-outline-control-move-down": "Przenieś niżej",
"ooui-dialog-process-retry": "Spróbuj ponownie",
"ooui-dialog-process-continue": "Kontynuuj",
"ooui-selectfile-not-supported": "Wybór pliku nie jest obsługiwany",
- "ooui-selectfile-placeholder": "Nie wybrano pliku"
+ "ooui-selectfile-placeholder": "Nie wybrano pliku",
+ "ooui-selectfile-dragdrop-placeholder": "Umieść plik tutaj (lub kliknij, aby je przeglądać)"
}
"ooui-dialog-process-continue": "Label for process dialog retry action button, visible when describing only warnings\n{{Identical|Continue}}",
"ooui-selectfile-not-supported": "Label for the file selection dialog if file selection is not supported",
"ooui-selectfile-placeholder": "Label for the file selection dialog when no file is currently selected",
+ "ooui-selectfile-dragdrop-placeholder": "Label for the file selection dialog when no file is currently selected in the drag drop UI. Suggests clicking to open the browse dialog.",
"ooui-semicolon-separator": "{{optional}} Semicolon used as a separator"
}
"ooui-dialog-process-retry": "Reîncearcă",
"ooui-dialog-process-continue": "Continuă",
"ooui-selectfile-not-supported": "Selecția de fișiere nu este acceptată",
- "ooui-selectfile-placeholder": "Niciun fișier selectat"
+ "ooui-selectfile-placeholder": "Niciun fișier selectat",
+ "ooui-selectfile-dragdrop-placeholder": "Trageți fișierul aici (sau faceți clic pentru a răsfoi)"
}
--- /dev/null
+{
+ "@metadata": {
+ "authors": [
+ "Kandar"
+ ]
+ },
+ "ooui-outline-control-move-down": "Pindahkeun ka handap",
+ "ooui-outline-control-move-up": "Pindahkeun ka luhur",
+ "ooui-outline-control-remove": "Hapus",
+ "ooui-toolbar-more": "Lobaan",
+ "ooui-toolgroup-expand": "Lobaan",
+ "ooui-toolgroup-collapse": "Saeutikan",
+ "ooui-dialog-message-accept": "Heug",
+ "ooui-dialog-message-reject": "Bolay",
+ "ooui-dialog-process-error": "Aya nu teu bener",
+ "ooui-dialog-process-dismiss": "Tutup",
+ "ooui-dialog-process-retry": "Cobaan deui",
+ "ooui-dialog-process-continue": "Teruskeun",
+ "ooui-selectfile-not-supported": "Pamilihan berkas teu dirojong",
+ "ooui-selectfile-placeholder": "Taya berkas anu dipilih"
+}
"Tifinaghes",
"Ата",
"Piramidion",
- "A1"
+ "A1",
+ "Dars"
]
},
"ooui-outline-control-move-down": "Перемістити елемент униз",
"ooui-dialog-process-retry": "Спробуйте ще раз",
"ooui-dialog-process-continue": "Продовжити",
"ooui-selectfile-not-supported": "Вибір файлу не підтримується",
- "ooui-selectfile-placeholder": "Жодного файлу не вибрано"
+ "ooui-selectfile-placeholder": "Жодного файлу не вибрано",
+ "ooui-selectfile-dragdrop-placeholder": "Помістіть файл сюди (або натисніть, щоб переглянути)"
}
"Yfdyh000",
"Zhangjintao",
"乌拉跨氪",
- "Great Brightstar"
+ "Great Brightstar",
+ "Nbdd0121"
]
},
- "ooui-outline-control-move-down": "项目下移",
- "ooui-outline-control-move-up": "项目上移",
+ "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-message-accept": "确定",
"ooui-dialog-message-reject": "取消",
- "ooui-dialog-process-error": "发生一些错误",
- "ooui-dialog-process-dismiss": "解除",
+ "ooui-dialog-process-error": "å\8f\91ç\94\9fäº\86ä¸\80äº\9bé\94\99误",
+ "ooui-dialog-process-dismiss": "关闭",
"ooui-dialog-process-retry": "重试",
"ooui-dialog-process-continue": "继续",
"ooui-selectfile-not-supported": "文件选择不受支持",
- "ooui-selectfile-placeholder": "没有选定文件"
+ "ooui-selectfile-placeholder": "没有选定文件",
+ "ooui-selectfile-dragdrop-placeholder": "将文件拖动至此（或点击以浏览）"
}
/*!
- * OOjs UI v0.12.5
+ * OOjs UI v0.12.6
* 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-08-19T02:10:25Z
+ * Date: 2015-08-26T00:14:44Z
*/
@-webkit-keyframes oo-ui-progressBarWidget-slide {
from {
.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle {
padding-right: 2em;
}
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle {
+ height: 3.5em;
+ border: 1px dashed #aaaaaa;
+ padding: 0.5em 1em;
+ background: #ffffff;
+ text-align: center;
+ vertical-align: middle;
+}
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle .oo-ui-iconElement-icon {
+ margin: 0.6em 0;
+}
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-label {
+ color: #000000;
+}
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle:hover,
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui.oo-ui-selectFileWidget-canDrop .oo-ui-selectFileWidget-handle {
+ background-color: #eeeeee;
+}
.oo-ui-outlineOptionWidget {
position: relative;
cursor: pointer;
/*!
- * OOjs UI v0.12.5
+ * OOjs UI v0.12.6
* 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-08-19T02:10:17Z
+ * Date: 2015-08-26T00:14:36Z
*/
/**
* @class
/*!
- * OOjs UI v0.12.5
+ * OOjs UI v0.12.6
* 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-08-19T02:10:25Z
+ * Date: 2015-08-26T00:14:44Z
*/
@-webkit-keyframes oo-ui-progressBarWidget-slide {
from {
}
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label,
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label {
- color: #347bff;
+ color: #2962cc;
}
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
- color: #777777;
+ color: #347bff;
}
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label,
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
}
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label,
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label {
- color: #00af89;
+ color: #008064;
}
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
- color: #777777;
+ color: #00af89;
}
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label,
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-constructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
}
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:hover > .oo-ui-labelElement-label,
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button:focus > .oo-ui-labelElement-label {
- color: #d11d13;
+ color: #8c130d;
}
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
- color: #777777;
+ color: #d11d13;
}
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled > .oo-ui-buttonElement-button:active > .oo-ui-labelElement-label,
.oo-ui-buttonElement-frameless.oo-ui-widget-enabled.oo-ui-flaggedElement-destructive.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button > .oo-ui-labelElement-label {
background-image: -webkit-linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/check.svg");
background-image: linear-gradient(transparent, transparent), /* @embed */ url("themes/mediawiki/images/icons/check.svg");
background-image: -o-linear-gradient(transparent, transparent), url("themes/mediawiki/images/icons/check.png");
+ background-size: contain;
+ background-position: center center;
+ background-repeat: no-repeat;
}
.oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover {
background-color: #eeeeee;
.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle {
padding-right: 2em;
}
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle {
+ height: 3.5em;
+ border: 1px dashed #cccccc;
+ border-radius: 0;
+ padding: 0.5em 1em;
+ background: #ffffff;
+ text-align: center;
+ vertical-align: middle;
+}
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle .oo-ui-iconElement-icon {
+ margin: 0.6em 0;
+}
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-label {
+ color: #000000;
+}
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle:hover,
+.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui.oo-ui-selectFileWidget-canDrop .oo-ui-selectFileWidget-handle {
+ background-color: #eeeeee;
+}
.oo-ui-outlineOptionWidget {
position: relative;
cursor: pointer;
/*!
- * OOjs UI v0.12.5
+ * OOjs UI v0.12.6
* 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-08-19T02:10:17Z
+ * Date: 2015-08-26T00:14:36Z
*/
/**
* @class
}
}
+ if ( element instanceof OO.ui.SelectFileWidget ) {
+ if ( !element.isDisabled() && element.active ) {
+ variants.invert = true;
+ }
+ }
+
for ( variant in variants ) {
classes[ variants[ variant ] ? 'on' : 'off' ].push( 'oo-ui-image-' + variant );
}
/*!
- * OOjs UI v0.12.5
+ * OOjs UI v0.12.6
* 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-08-19T02:10:17Z
+ * Date: 2015-08-26T00:14:36Z
*/
( function ( OO ) {
* Inspired from :focusable in jQueryUI v1.11.4 - 2015-04-14
*
* @param {jQuery} element Element to test
- * @return {Boolean} [description]
+ * @return {boolean}
*/
OO.ui.isFocusableElement = function ( $element ) {
- var node = $element[0],
+ var node = $element[ 0 ],
nodeName = node.nodeName.toLowerCase(),
// Check if the element have tabindex set
isInElementGroup = /^(input|select|textarea|button|object)$/.test( nodeName ),
'ooui-selectfile-not-supported': 'File selection is not supported',
// Default placeholder for file selection widgets
'ooui-selectfile-placeholder': 'No file is selected',
+ // Default placeholder for file selection widgets when using drag drop UI
+ 'ooui-selectfile-dragdrop-placeholder': 'Drop file here (or click to browse)',
// Semicolon separator
'ooui-semicolon-separator': '; '
};
return true;
}
- protocol = url.split( ':', 1 )[0] + ':';
+ protocol = url.split( ':', 1 )[ 0 ] + ':';
if ( !protocol.match( /^([A-za-z0-9\+\.\-])+:/ ) ) {
// Not a valid protocol, safe
return true;
}
// Safe if in the whitelist
- return $.inArray( protocol, whitelist ) !== -1;
+ return whitelist.indexOf( protocol ) !== -1;
};
} )();
this.$element = config.$element ||
$( document.createElement( this.getTagName() ) );
this.elementGroup = null;
- this.debouncedUpdateThemeClassesHandler = this.debouncedUpdateThemeClasses.bind( this );
- this.updateThemeClassesPending = false;
+ this.debouncedUpdateThemeClassesHandler = OO.ui.debounce( this.debouncedUpdateThemeClasses );
// Initialization
if ( Array.isArray( config.classes ) ) {
if ( !$elem.length ) {
throw new Error( 'Widget not found: ' + id );
}
- data = $elem.data( 'ooui-infused' ) || $elem[0].oouiInfused;
+ data = $elem.data( 'ooui-infused' ) || $elem[ 0 ].oouiInfused;
if ( data ) {
// cached!
if ( data === true ) {
// This element is now gone from the DOM, but if anyone is holding a reference to it,
// let's allow them to OO.ui.infuse() it and do what they expect (T105828).
// Do not use jQuery.data(), as using it on detached nodes leaks memory in 1.x line by design.
- $elem[0].oouiInfused = obj;
+ $elem[ 0 ].oouiInfused = obj;
top.resolve();
}
obj.$element.data( 'ooui-infused', obj );
*/
OO.ui.Element.static.getWindow = function ( obj ) {
var doc = this.getDocument( obj );
+ // Support: IE 8
+ // Standard Document.defaultView is IE9+
return doc.parentWindow || doc.defaultView;
};
*/
OO.ui.Element.static.getBorders = function ( el ) {
var doc = el.ownerDocument,
+ // Support: IE 8
+ // Standard Document.defaultView is IE9+
win = doc.parentWindow || doc.defaultView,
style = win && win.getComputedStyle ?
win.getComputedStyle( el, null ) :
+ // Support: IE 8
+ // Standard getComputedStyle() is IE9+
el.currentStyle,
$el = $( el ),
top = parseFloat( style ? style.borderTopWidth : $el.css( 'borderTopWidth' ) ) || 0,
OO.ui.Element.static.getDimensions = function ( el ) {
var $el, $win,
doc = el.ownerDocument || el.document,
+ // Support: IE 8
+ // Standard Document.defaultView is IE9+
win = doc.parentWindow || doc.defaultView;
if ( win === el || el === doc.documentElement ) {
* @param {Function} [config.complete] Function to call when scrolling completes
*/
OO.ui.Element.static.scrollIntoView = function ( el, config ) {
+ var rel, anim, callback, sc, $sc, eld, scd, $win;
+
// Configuration initialization
config = config || {};
- var rel, anim = {},
- callback = typeof config.complete === 'function' && config.complete,
- sc = this.getClosestScrollableContainer( el, config.direction ),
- $sc = $( sc ),
- eld = this.getDimensions( el ),
- scd = this.getDimensions( sc ),
- $win = $( this.getWindow( el ) );
+ anim = {};
+ callback = typeof config.complete === 'function' && config.complete;
+ sc = this.getClosestScrollableContainer( el, config.direction );
+ $sc = $( sc );
+ eld = this.getDimensions( el );
+ scd = this.getDimensions( sc );
+ $win = $( this.getWindow( el ) );
// Compute the distances between the edges of el and the edges of the scroll viewport
if ( $sc.is( 'html, body' ) ) {
* guaranteeing that theme updates do not occur within an element's constructor
*/
OO.ui.Element.prototype.updateThemeClasses = function () {
- if ( !this.updateThemeClassesPending ) {
- this.updateThemeClassesPending = true;
- setTimeout( this.debouncedUpdateThemeClassesHandler );
- }
+ this.debouncedUpdateThemeClassesHandler();
};
/**
* @private
+ * @localdoc This method is called directly from the QUnit tests instead of #updateThemeClasses, to
+ * make them synchronous.
*/
OO.ui.Element.prototype.debouncedUpdateThemeClasses = function () {
OO.ui.theme.updateElementClasses( this );
- this.updateThemeClassesPending = false;
};
/**
this.actions = new OO.ui.ActionSet();
this.attachedActions = [];
this.currentAction = null;
- this.onDocumentKeyDownHandler = this.onDocumentKeyDown.bind( this );
+ this.onDialogKeyDownHandler = this.onDialogKeyDown.bind( this );
// Events
this.actions.connect( this, {
* @private
* @param {jQuery.Event} e Key down event
*/
-OO.ui.Dialog.prototype.onDocumentKeyDown = function ( e ) {
+OO.ui.Dialog.prototype.onDialogKeyDown = function ( e ) {
if ( e.which === OO.ui.Keys.ESCAPE ) {
this.close();
e.preventDefault();
this.actions.add( this.getActionWidgets( actions ) );
if ( this.constructor.static.escapable ) {
- this.$document.on( 'keydown', this.onDocumentKeyDownHandler );
+ this.$element.on( 'keydown', this.onDialogKeyDownHandler );
}
}, this );
};
return OO.ui.Dialog.parent.prototype.getTeardownProcess.call( this, data )
.first( function () {
if ( this.constructor.static.escapable ) {
- this.$document.off( 'keydown', this.onDocumentKeyDownHandler );
+ this.$element.off( 'keydown', this.onDialogKeyDownHandler );
}
this.actions.clear();
* @inheritdoc
*/
OO.ui.Dialog.prototype.initialize = function () {
+ var titleId;
+
// Parent method
OO.ui.Dialog.parent.prototype.initialize.call( this );
- var titleId = OO.ui.generateElementId();
+ titleId = OO.ui.generateElementId();
// Properties
this.title = new OO.ui.LabelWidget( {
* @chainable
*/
OO.ui.WindowManager.prototype.updateWindowSize = function ( win ) {
+ var isFullscreen;
+
// Bypass for non-current, and thus invisible, windows
if ( win !== this.currentWindow ) {
return;
}
- var isFullscreen = win.getSize() === 'full';
+ isFullscreen = win.getSize() === 'full';
this.$element.toggleClass( 'oo-ui-windowManager-fullscreen', isFullscreen );
this.$element.toggleClass( 'oo-ui-windowManager-floating', !isFullscreen );
* @chainable
*/
OO.ui.WindowManager.prototype.toggleGlobalEvents = function ( on ) {
- on = on === undefined ? !!this.globalEvents : !!on;
-
var scrollWidth, bodyMargin,
$body = $( this.getElementDocument().body ),
// We could have multiple window managers open so only modify
// the body css at the bottom of the stack
stackDepth = $body.data( 'windowManagerGlobalEvents' ) || 0 ;
+ on = on === undefined ? !!this.globalEvents : !!on;
+
if ( on ) {
if ( !this.globalEvents ) {
$( this.getElementWindow() ).on( {
* @constructor
*/
OO.ui.ToolGroupFactory = function OoUiToolGroupFactory() {
+ var i, l, defaultClasses;
// Parent constructor
OO.Factory.call( this );
- var i, l,
- defaultClasses = this.constructor.static.getDefaultClasses();
+ defaultClasses = this.constructor.static.getDefaultClasses();
// Register default toolgroups
for ( i = 0, l = defaultClasses.length; i < l; i++ ) {
* @return {Object.<string,string[]>} Categorized class names with `on` and `off` lists
*/
OO.ui.Theme.prototype.updateElementClasses = function ( element ) {
- var classes = this.getElementClasses( element );
+ var $elements = $( [] ),
+ classes = this.getElementClasses( element );
+
+ if ( element.$icon ) {
+ $elements = $elements.add( element.$icon );
+ }
+ if ( element.$indicator ) {
+ $elements = $elements.add( element.$indicator );
+ }
- element.$element
+ $elements
.removeClass( classes.off.join( ' ' ) )
.addClass( classes.on.join( ' ' ) );
};
// Do not index over disabled elements
this.$tabIndexed.attr( {
tabindex: this.isDisabled() ? -1 : this.tabIndex,
- // ChromeVox and NVDA do not seem to inherit this from parent elements
+ // Support: ChromeVox and NVDA
+ // These do not seem to inherit aria-disabled from parent elements
'aria-disabled': this.isDisabled().toString()
} );
} else {
* @cfg {jQuery} [$button] The button element created by the class.
* If this configuration is omitted, the button element will use a generated `<a>`.
* @cfg {boolean} [framed=true] Render the button with a frame
- * @cfg {string} [accessKey] Button's access key
*/
OO.ui.mixin.ButtonElement = function OoUiMixinButtonElement( config ) {
// Configuration initialization
// Properties
this.$button = null;
this.framed = null;
- this.accessKey = null;
this.active = false;
this.onMouseUpHandler = this.onMouseUp.bind( this );
this.onMouseDownHandler = this.onMouseDown.bind( this );
// Initialization
this.$element.addClass( 'oo-ui-buttonElement' );
this.toggleFramed( config.framed === undefined || config.framed );
- this.setAccessKey( config.accessKey );
this.setButtonElement( config.$button || $( '<a>' ) );
};
this.$button = $button
.addClass( 'oo-ui-buttonElement-button' )
- .attr( { role: 'button', accesskey: this.accessKey } )
+ .attr( { role: 'button' } )
.on( {
mousedown: this.onMouseDownHandler,
keydown: this.onKeyDownHandler,
return this;
};
-/**
- * Set the button's access key.
- *
- * @param {string} accessKey Button's access key, use empty string to remove
- * @chainable
- */
-OO.ui.mixin.ButtonElement.prototype.setAccessKey = function ( accessKey ) {
- accessKey = typeof accessKey === 'string' && accessKey.length ? accessKey : null;
-
- if ( this.accessKey !== accessKey ) {
- if ( this.$button ) {
- if ( accessKey !== null ) {
- this.$button.attr( 'accesskey', accessKey );
- } else {
- this.$button.removeAttr( 'accesskey' );
- }
- }
- this.accessKey = accessKey;
- }
-
- return this;
-};
-
/**
* Set the button to its 'active' state.
*
item = this.items[ i ];
if ( item.connect && item.disconnect ) {
remove = {};
- remove[ itemEvent ] = [ 'emit', this.aggregateItemEvents[itemEvent], item ];
+ remove[ itemEvent ] = [ 'emit', this.aggregateItemEvents[ itemEvent ], item ];
item.disconnect( this, remove );
}
}
item = items[ i ];
// Check if item exists then remove it first, effectively "moving" it
- currentIndex = $.inArray( item, this.items );
+ currentIndex = this.items.indexOf( item );
if ( currentIndex >= 0 ) {
this.removeItems( [ item ] );
// Adjust index to compensate for removal
// Remove specific items
for ( i = 0, len = items.length; i < len; i++ ) {
item = items[ i ];
- index = $.inArray( item, this.items );
+ index = this.items.indexOf( item );
if ( index !== -1 ) {
if (
item.connect && item.disconnect &&
// Define drop effect
dataTransfer.dropEffect = 'none';
dataTransfer.effectAllowed = 'move';
+ // Support: Firefox
// We must set up a dataTransfer data property or Firefox seems to
// ignore the fact the element is draggable.
try {
dataTransfer.setData( 'application-x/OOjs-UI-draggable', this.getIndex() );
} catch ( err ) {
- // The above is only for firefox. No need to set a catch clause
- // if it fails, move on.
+ // The above is only for Firefox. Move on if it fails.
}
// Add dragging class
this.$element.addClass( 'oo-ui-draggableElement-dragging' );
itemDragEnd: 'onItemDragEnd'
} );
this.$element.on( {
- dragover: $.proxy( this.onDragOver, this ),
- dragleave: $.proxy( this.onDragLeave, this )
+ dragover: this.onDragOver.bind( this ),
+ dragleave: this.onDragLeave.bind( this )
} );
// Initialize
if ( this.iconTitle !== null ) {
this.$icon.attr( 'title', this.iconTitle );
}
+
+ this.updateThemeClasses();
};
/**
if ( this.indicatorTitle !== null ) {
this.$indicator.attr( 'title', this.indicatorTitle );
}
+
+ this.updateThemeClasses();
};
/**
* {@link OO.ui.mixin.ClippableElement#clip} to make sure it's still
* clipping correctly.
*
+ * The dimensions of #$clippableContainer will be compared to the boundaries of the
+ * nearest scrollable container. If #$clippableContainer is too tall and/or too wide,
+ * then #$clippable will be given a fixed reduced height and/or width and will be made
+ * scrollable. By default, #$clippable and #$clippableContainer are the same element,
+ * but you can build a static footer by setting #$clippableContainer to an element that contains
+ * #$clippable and the footer.
+ *
* @abstract
* @class
*
* @constructor
* @param {Object} [config] Configuration options
- * @cfg {jQuery} [$clippable] Nodes to clip, assigned to #$clippable, omit to use #$element
+ * @cfg {jQuery} [$clippable] Node to clip, assigned to #$clippable, omit to use #$element
+ * @cfg {jQuery} [$clippableContainer] Node to keep visible, assigned to #$clippableContainer,
+ * omit to use #$clippable
*/
OO.ui.mixin.ClippableElement = function OoUiMixinClippableElement( config ) {
// Configuration initialization
// Properties
this.$clippable = null;
+ this.$clippableContainer = null;
this.clipping = false;
this.clippedHorizontally = false;
this.clippedVertically = false;
- this.$clippableContainer = null;
+ this.$clippableScrollableContainer = null;
this.$clippableScroller = null;
this.$clippableWindow = null;
this.idealWidth = null;
this.idealHeight = null;
- this.onClippableContainerScrollHandler = this.clip.bind( this );
+ this.onClippableScrollHandler = this.clip.bind( this );
this.onClippableWindowResizeHandler = this.clip.bind( this );
// Initialization
+ if ( config.$clippableContainer ) {
+ this.setClippableContainer( config.$clippableContainer );
+ }
this.setClippableElement( config.$clippable || this.$element );
};
this.clip();
};
+/**
+ * Set clippable container.
+ *
+ * This is the container that will be measured when deciding whether to clip. When clipping,
+ * #$clippable will be resized in order to keep the clippable container fully visible.
+ *
+ * If the clippable container is unset, #$clippable will be used.
+ *
+ * @param {jQuery|null} $clippableContainer Container to keep visible, or null to unset
+ */
+OO.ui.mixin.ClippableElement.prototype.setClippableContainer = function ( $clippableContainer ) {
+ this.$clippableContainer = $clippableContainer;
+ if ( this.$clippable ) {
+ this.clip();
+ }
+};
+
/**
* Toggle clipping.
*
if ( this.clipping !== clipping ) {
this.clipping = clipping;
if ( clipping ) {
- this.$clippableContainer = $( this.getClosestScrollableElementContainer() );
+ this.$clippableScrollableContainer = $( this.getClosestScrollableElementContainer() );
// If the clippable container is the root, we have to listen to scroll events and check
// jQuery.scrollTop on the window because of browser inconsistencies
- this.$clippableScroller = this.$clippableContainer.is( 'html, body' ) ?
- $( OO.ui.Element.static.getWindow( this.$clippableContainer ) ) :
- this.$clippableContainer;
- this.$clippableScroller.on( 'scroll', this.onClippableContainerScrollHandler );
+ this.$clippableScroller = this.$clippableScrollableContainer.is( 'html, body' ) ?
+ $( OO.ui.Element.static.getWindow( this.$clippableScrollableContainer ) ) :
+ this.$clippableScrollableContainer;
+ this.$clippableScroller.on( 'scroll', this.onClippableScrollHandler );
this.$clippableWindow = $( this.getElementWindow() )
.on( 'resize', this.onClippableWindowResizeHandler );
// Initial clip after visible
this.$clippable.css( { width: '', height: '', overflowX: '', overflowY: '' } );
OO.ui.Element.static.reconsiderScrollbars( this.$clippable[ 0 ] );
- this.$clippableContainer = null;
- this.$clippableScroller.off( 'scroll', this.onClippableContainerScrollHandler );
+ this.$clippableScrollableContainer = null;
+ this.$clippableScroller.off( 'scroll', this.onClippableScrollHandler );
this.$clippableScroller = null;
this.$clippableWindow.off( 'resize', this.onClippableWindowResizeHandler );
this.$clippableWindow = null;
* @chainable
*/
OO.ui.mixin.ClippableElement.prototype.clip = function () {
+ var $container, extraHeight, extraWidth, ccOffset,
+ $scrollableContainer, scOffset, scHeight, scWidth,
+ ccWidth, scrollerIsWindow, scrollTop, scrollLeft,
+ desiredWidth, desiredHeight, allotedWidth, allotedHeight,
+ naturalWidth, naturalHeight, clipWidth, clipHeight,
+ buffer = 7; // Chosen by fair dice roll
+
if ( !this.clipping ) {
- // this.$clippableContainer and this.$clippableWindow are null, so the below will fail
+ // this.$clippableScrollableContainer and this.$clippableWindow are null, so the below will fail
return this;
}
- var buffer = 7, // Chosen by fair dice roll
- cOffset = this.$clippable.offset(),
- $container = this.$clippableContainer.is( 'html, body' ) ?
- this.$clippableWindow : this.$clippableContainer,
- ccOffset = $container.offset() || { top: 0, left: 0 },
- ccHeight = $container.innerHeight() - buffer,
- ccWidth = $container.innerWidth() - buffer,
- cWidth = this.$clippable.outerWidth() + buffer,
- scrollerIsWindow = this.$clippableScroller[0] === this.$clippableWindow[0],
- scrollTop = scrollerIsWindow ? this.$clippableScroller.scrollTop() : 0,
- scrollLeft = scrollerIsWindow ? this.$clippableScroller.scrollLeft() : 0,
- desiredWidth = cOffset.left < 0 ?
- cWidth + cOffset.left :
- ( ccOffset.left + scrollLeft + ccWidth ) - cOffset.left,
- desiredHeight = ( ccOffset.top + scrollTop + ccHeight ) - cOffset.top,
- naturalWidth = this.$clippable.prop( 'scrollWidth' ),
- naturalHeight = this.$clippable.prop( 'scrollHeight' ),
- clipWidth = desiredWidth < naturalWidth,
- clipHeight = desiredHeight < naturalHeight;
+ $container = this.$clippableContainer || this.$clippable;
+ extraHeight = $container.outerHeight() - this.$clippable.outerHeight();
+ extraWidth = $container.outerWidth() - this.$clippable.outerWidth();
+ ccOffset = $container.offset();
+ $scrollableContainer = this.$clippableScrollableContainer.is( 'html, body' ) ?
+ this.$clippableWindow : this.$clippableScrollableContainer;
+ scOffset = $scrollableContainer.offset() || { top: 0, left: 0 };
+ scHeight = $scrollableContainer.innerHeight() - buffer;
+ scWidth = $scrollableContainer.innerWidth() - buffer;
+ ccWidth = $container.outerWidth() + buffer;
+ scrollerIsWindow = this.$clippableScroller[ 0 ] === this.$clippableWindow[ 0 ];
+ scrollTop = scrollerIsWindow ? this.$clippableScroller.scrollTop() : 0;
+ scrollLeft = scrollerIsWindow ? this.$clippableScroller.scrollLeft() : 0;
+ desiredWidth = ccOffset.left < 0 ?
+ ccWidth + ccOffset.left :
+ ( scOffset.left + scrollLeft + scWidth ) - ccOffset.left;
+ desiredHeight = ( scOffset.top + scrollTop + scHeight ) - ccOffset.top;
+ allotedWidth = desiredWidth - extraWidth;
+ allotedHeight = desiredHeight - extraHeight;
+ naturalWidth = this.$clippable.prop( 'scrollWidth' );
+ naturalHeight = this.$clippable.prop( 'scrollHeight' );
+ clipWidth = allotedWidth < naturalWidth;
+ clipHeight = allotedHeight < naturalHeight;
if ( clipWidth ) {
- this.$clippable.css( { overflowX: 'scroll', width: desiredWidth } );
+ this.$clippable.css( { overflowX: 'scroll', width: Math.max( 0, allotedWidth ) } );
} else {
- this.$clippable.css( { width: this.idealWidth || '', overflowX: '' } );
+ this.$clippable.css( { width: this.idealWidth ? this.idealWidth - extraWidth : '', overflowX: '' } );
}
if ( clipHeight ) {
- this.$clippable.css( { overflowY: 'scroll', height: desiredHeight } );
+ this.$clippable.css( { overflowY: 'scroll', height: Math.max( 0, allotedHeight ) } );
} else {
- this.$clippable.css( { height: this.idealHeight || '', overflowY: '' } );
+ this.$clippable.css( { height: this.idealHeight ? this.idealHeight - extraHeight : '', overflowY: '' } );
}
// If we stopped clipping in at least one of the dimensions
return this;
};
+/**
+ * AccessKeyedElement is mixed into other classes to provide an `accesskey` attribute.
+ * Accesskeys allow an user to go to a specific element by using
+ * a shortcut combination of a browser specific keys + the key
+ * set to the field.
+ *
+ * @example
+ * // AccessKeyedElement provides an 'accesskey' attribute to the
+ * // ButtonWidget class
+ * var button = new OO.ui.ButtonWidget( {
+ * label: 'Button with Accesskey',
+ * accessKey: 'k'
+ * } );
+ * $( 'body' ).append( button.$element );
+ *
+ * @abstract
+ * @class
+ *
+ * @constructor
+ * @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$accessKeyed] The element to which the `accesskey` attribute is applied.
+ * If this config is omitted, the accesskey functionality is applied to $element, the
+ * element created by the class.
+ * @cfg {string|Function} [accessKey] The key or a function that returns the key. If
+ * this config is omitted, no accesskey will be added.
+ */
+OO.ui.mixin.AccessKeyedElement = function OoUiMixinAccessKeyedElement( config ) {
+ // Configuration initialization
+ config = config || {};
+
+ // Properties
+ this.$accessKeyed = null;
+ this.accessKey = null;
+
+ // Initialization
+ this.setAccessKey( config.accessKey || null );
+ this.setAccessKeyedElement( config.$accessKeyed || this.$element );
+};
+
+/* Setup */
+
+OO.initClass( OO.ui.mixin.AccessKeyedElement );
+
+/* Static Properties */
+
+/**
+ * The access key, a function that returns a key, or `null` for no accesskey.
+ *
+ * @static
+ * @inheritable
+ * @property {string|Function|null}
+ */
+OO.ui.mixin.AccessKeyedElement.static.accessKey = null;
+
+/* Methods */
+
+/**
+ * Set the accesskeyed element.
+ *
+ * This method is used to retarget a AccessKeyedElement mixin so that its functionality applies to the specified element.
+ * If an element is already set, the mixin's effect on that element is removed before the new element is set up.
+ *
+ * @param {jQuery} $accessKeyed Element that should use the 'accesskeyes' functionality
+ */
+OO.ui.mixin.AccessKeyedElement.prototype.setAccessKeyedElement = function ( $accessKeyed ) {
+ if ( this.$accessKeyed ) {
+ this.$accessKeyed.removeAttr( 'accesskey' );
+ }
+
+ this.$accessKeyed = $accessKeyed;
+ if ( this.accessKey ) {
+ this.$accessKeyed.attr( 'accesskey', this.accessKey );
+ }
+};
+
+/**
+ * Set accesskey.
+ *
+ * @param {string|Function|null} accesskey Key, a function that returns a key, or `null` for no accesskey
+ * @chainable
+ */
+OO.ui.mixin.AccessKeyedElement.prototype.setAccessKey = function ( accessKey ) {
+ accessKey = typeof accessKey === 'string' ? OO.ui.resolveMsg( accessKey ) : null;
+
+ if ( this.accessKey !== accessKey ) {
+ if ( this.$accessKeyed ) {
+ if ( accessKey !== null ) {
+ this.$accessKeyed.attr( 'accesskey', accessKey );
+ } else {
+ this.$accessKeyed.removeAttr( 'accesskey' );
+ }
+ }
+ this.accessKey = accessKey;
+ }
+
+ return this;
+};
+
+/**
+ * Get accesskey.
+ *
+ * @return {string} accessKey string
+ */
+OO.ui.mixin.AccessKeyedElement.prototype.getAccessKey = function () {
+ return this.accessKey;
+};
+
/**
* Tools, together with {@link OO.ui.ToolGroup toolgroups}, constitute {@link OO.ui.Toolbar toolbars}.
* Each tool is configured with a static name, title, and icon and is customized with the command to carry
return action.getFlags().indexOf( 'primary' ) > -1;
} );
if ( actions.length > 0 ) {
- actions[0].$button.focus();
+ actions[ 0 ].$button.focus();
}
}, this );
};
}
this.$errorItems = $( items );
if ( recoverable ) {
- abilities[this.currentAction] = true;
+ abilities[ this.currentAction ] = true;
// Copy the flags from the first matching action
actions = this.actions.get( { actions: this.currentAction } );
if ( actions.length ) {
- this.retryButton.clearFlags().setFlags( actions[0].getFlags() );
+ this.retryButton.clearFlags().setFlags( actions[ 0 ].getFlags() );
}
} else {
- abilities[this.currentAction] = false;
+ abilities[ this.currentAction ] = false;
this.actions.setAbilities( abilities );
}
if ( warning ) {
* @throws {Error} An error is thrown if no widget is specified
*/
OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) {
+ var hasInputWidget, div, i;
+
// Allow passing positional parameters inside the config object
if ( OO.isPlainObject( fieldWidget ) && config === undefined ) {
config = fieldWidget;
throw new Error( 'Widget not found' );
}
- var hasInputWidget = fieldWidget.constructor.static.supportsSimpleLabel,
- div, i;
+ hasInputWidget = fieldWidget.constructor.static.supportsSimpleLabel;
// Configuration initialization
config = $.extend( { align: 'left' }, config );
.append( this.fieldWidget.$element );
for ( i = 0; i < this.notices.length; i++ ) {
- this.$messages.append( this.makeMessage( 'notice', this.notices[i] ) );
+ this.$messages.append( this.makeMessage( 'notice', this.notices[ i ] ) );
}
for ( i = 0; i < this.errors.length; i++ ) {
- this.$messages.append( this.makeMessage( 'error', this.errors[i] ) );
+ this.$messages.append( this.makeMessage( 'error', this.errors[ i ] ) );
}
this.setAlignment( config.align );
}
// Find all potentially focusable elements in the item
// and check if they are focusable
- items[i].$element
+ items[ i ].$element
.find( 'input, select, textarea, button, object' )
/* jshint loopfunc:true */
.each( checkAndFocus );
OO.ui.BookletLayout.prototype.getClosestPage = function ( page ) {
var next, prev, level,
pages = this.stackLayout.getItems(),
- index = $.inArray( page, pages );
+ index = pages.indexOf( page );
if ( index !== -1 ) {
next = pages[ index + 1 ];
if ( Object.prototype.hasOwnProperty.call( this.pages, name ) ) {
// Correct the insertion index
- currentIndex = $.inArray( this.pages[ name ], stackLayoutPages );
+ currentIndex = stackLayoutPages.indexOf( this.pages[ name ] );
if ( currentIndex !== -1 && currentIndex + 1 < index ) {
index--;
}
}
// Find all potentially focusable elements in the item
// and check if they are focusable
- items[i].$element
+ items[ i ].$element
.find( 'input, select, textarea, button, object' )
.each( checkAndFocus );
}
OO.ui.IndexLayout.prototype.getClosestCard = function ( card ) {
var next, prev, level,
cards = this.stackLayout.getItems(),
- index = $.inArray( card, cards );
+ index = cards.indexOf( card );
if ( index !== -1 ) {
next = cards[ index + 1 ];
if ( Object.prototype.hasOwnProperty.call( this.cards, name ) ) {
// Correct the insertion index
- currentIndex = $.inArray( this.cards[ name ], stackLayoutCards );
+ currentIndex = stackLayoutCards.indexOf( this.cards[ name ] );
if ( currentIndex !== -1 && currentIndex + 1 < index ) {
index--;
}
// Mixin method
OO.ui.mixin.GroupElement.prototype.removeItems.call( this, items );
- if ( $.inArray( this.currentItem, items ) !== -1 ) {
+ if ( items.indexOf( this.currentItem ) !== -1 ) {
if ( this.items.length ) {
this.setItem( this.items[ 0 ] );
} else {
if ( item !== this.currentItem ) {
this.updateHiddenState( this.items, item );
- if ( $.inArray( item, this.items ) !== -1 ) {
+ if ( this.items.indexOf( item ) !== -1 ) {
this.currentItem = item;
this.emit( 'set', item );
} else {
};
OO.ui.ListToolGroup.prototype.getExpandCollapseTool = function () {
+ var ExpandCollapseTool;
if ( this.expandCollapseTool === undefined ) {
- var ExpandCollapseTool = function () {
+ ExpandCollapseTool = function () {
ExpandCollapseTool.parent.apply( this, arguments );
};
var ability;
for ( ability in this.abilities ) {
- if ( abilities[ability] !== undefined ) {
- this.abilities[ability] = !!abilities[ability];
+ if ( abilities[ ability ] !== undefined ) {
+ this.abilities[ ability ] = !!abilities[ ability ];
}
}
* @mixins OO.ui.mixin.TitledElement
* @mixins OO.ui.mixin.FlaggedElement
* @mixins OO.ui.mixin.TabIndexedElement
+ * @mixins OO.ui.mixin.AccessKeyedElement
*
* @constructor
* @param {Object} [config] Configuration options
OO.ui.mixin.TitledElement.call( this, $.extend( {}, config, { $titled: this.$button } ) );
OO.ui.mixin.FlaggedElement.call( this, config );
OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, { $tabIndexed: this.$button } ) );
+ OO.ui.mixin.AccessKeyedElement.call( this, $.extend( {}, config, { $accessKeyed: this.$button } ) );
// Properties
this.href = null;
OO.mixinClass( OO.ui.ButtonWidget, OO.ui.mixin.TitledElement );
OO.mixinClass( OO.ui.ButtonWidget, OO.ui.mixin.FlaggedElement );
OO.mixinClass( OO.ui.ButtonWidget, OO.ui.mixin.TabIndexedElement );
+OO.mixinClass( OO.ui.ButtonWidget, OO.ui.mixin.AccessKeyedElement );
/* Methods */
item = null;
for ( j = 0; j < items.length; j++ ) {
- if ( items[j].data === data && items[j].label === label ) {
- item = items[j];
+ if ( items[ j ].data === data && items[ j ].label === label ) {
+ item = items[ j ];
items.splice( j, 1 );
break;
}
} else {
same = true;
for ( i = 0, l = oldItems.length; same && i < l; i++ ) {
- same = same && this.items[i] === oldItems[i];
+ same = same && this.items[ i ] === oldItems[ i ];
}
}
if ( !same ) {
} else {
same = true;
for ( i = 0, l = oldItems.length; same && i < l; i++ ) {
- same = same && this.items[i] === oldItems[i];
+ same = same && this.items[ i ] === oldItems[ i ];
}
}
if ( !same ) {
setTimeout( function () {
if (
widget.isVisible() &&
- !OO.ui.contains( widget.$element[0], document.activeElement, true ) &&
+ !OO.ui.contains( widget.$element[ 0 ], document.activeElement, true ) &&
( !widget.$autoCloseIgnore || !widget.$autoCloseIgnore.has( document.activeElement ).length )
) {
widget.toggle( false );
if ( this.items ) {
for ( i = 0, len = this.items.length; i < len; i++ ) {
- this.items[i].updateDisabled();
+ this.items[ i ].updateDisabled();
}
}
* @cfg {string} [placeholder] Text to display when no file is selected.
* @cfg {string} [notsupported] Text to display when file support is missing in the browser.
* @cfg {boolean} [droppable=true] Whether to accept files by drag and drop.
+ * @cfg {boolean} [dragDropUI=false] Whether to render the drag and drop UI.
*/
OO.ui.SelectFileWidget = function OoUiSelectFileWidget( config ) {
- var dragHandler;
+ var dragHandler,
+ placeholderMsg = ( config && config.dragDropUI ) ?
+ 'ooui-selectfile-dragdrop-placeholder' :
+ 'ooui-selectfile-placeholder';
// Configuration initialization
config = $.extend( {
accept: null,
- placeholder: OO.ui.msg( 'ooui-selectfile-placeholder' ),
+ placeholder: OO.ui.msg( placeholderMsg ),
notsupported: OO.ui.msg( 'ooui-selectfile-not-supported' ),
- droppable: true
+ droppable: true,
+ dragDropUI: false
}, config );
// Parent constructor
OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, { $tabIndexed: this.$handle } ) );
// Properties
+ this.active = false;
+ this.dragDropUI = config.dragDropUI;
this.isSupported = this.constructor.static.isSupported();
this.currentFile = null;
if ( Array.isArray( config.accept ) ) {
.addClass( 'oo-ui-selectFileWidget' )
.append( this.$handle );
if ( config.droppable ) {
- this.$element.addClass( 'oo-ui-selectFileWidget-droppable' );
+ if ( config.dragDropUI ) {
+ this.$element.addClass( 'oo-ui-selectFileWidget-dragdrop-ui' );
+ this.$element.on( {
+ mouseover: this.onMouseOver.bind( this ),
+ mouseleave: this.onMouseLeave.bind( this )
+ } );
+ } else {
+ this.$element.addClass( 'oo-ui-selectFileWidget-droppable' );
+ }
}
};
var $input;
if ( OO.ui.SelectFileWidget.static.isSupportedCache === null ) {
$input = $( '<input type="file">' );
- OO.ui.SelectFileWidget.static.isSupportedCache = $input[0].files !== undefined;
+ OO.ui.SelectFileWidget.static.isSupportedCache = $input[ 0 ].files !== undefined;
}
return OO.ui.SelectFileWidget.static.isSupportedCache;
};
mime = file.type;
for ( i = 0; i < this.accept.length; i++ ) {
- mimeTest = this.accept[i];
+ mimeTest = this.accept[ i ];
if ( mimeTest === mime ) {
return true;
} else if ( mimeTest.substr( -2 ) === '/*' ) {
OO.ui.SelectFileWidget.prototype.onFileSelected = function ( e ) {
var file = null;
- if ( e.target.files && e.target.files[0] ) {
- file = e.target.files[0];
+ if ( e.target.files && e.target.files[ 0 ] ) {
+ file = e.target.files[ 0 ];
if ( !this.isFileAcceptable( file ) ) {
file = null;
}
if ( this.isDisabled() || !this.isSupported ) {
this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
+ this.setActive( false );
dt.dropEffect = 'none';
return false;
}
- if ( dt && dt.files && dt.files[0] ) {
- file = dt.files[0];
+ if ( dt && dt.files && dt.files[ 0 ] ) {
+ file = dt.files[ 0 ];
if ( !this.isFileAcceptable( file ) ) {
file = null;
}
- } else if ( dt && dt.types && $.inArray( 'Files', dt.types ) ) {
+ } else if ( dt && dt.types && dt.types.indexOf( 'Files' ) !== -1 ) {
// We know we have files so set 'file' to something truthy, we just
// can't know any details about them.
// * https://bugzilla.mozilla.org/show_bug.cgi?id=640534
}
if ( file ) {
this.$element.addClass( 'oo-ui-selectFileWidget-canDrop' );
+ this.setActive( true );
} else {
this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
+ this.setActive( false );
dt.dropEffect = 'none';
}
*/
OO.ui.SelectFileWidget.prototype.onDragLeave = function () {
this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
+ this.setActive( false );
};
/**
e.preventDefault();
e.stopPropagation();
this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
+ this.setActive( false );
if ( this.isDisabled() || !this.isSupported ) {
return false;
}
- if ( dt && dt.files && dt.files[0] ) {
- file = dt.files[0];
+ if ( dt && dt.files && dt.files[ 0 ] ) {
+ file = dt.files[ 0 ];
if ( !this.isFileAcceptable( file ) ) {
file = null;
}
return false;
};
+/**
+ * Handle mouse over events.
+ *
+ * @private
+ * @param {jQuery.Event} e Mouse over event
+ */
+OO.ui.SelectFileWidget.prototype.onMouseOver = function () {
+ this.setActive( true );
+};
+
+/**
+ * Handle mouse leave events.
+ *
+ * @private
+ * @param {jQuery.Event} e Mouse over event
+ */
+OO.ui.SelectFileWidget.prototype.onMouseLeave = function () {
+ this.setActive( false );
+};
+
/**
* @inheritdoc
*/
return this;
};
+/**
+ * Set 'active' (hover) state, only matters for widgets with `dragDropUI: true`.
+ *
+ * @param {boolean} value Whether widget is active
+ * @chainable
+ */
+OO.ui.SelectFileWidget.prototype.setActive = function ( value ) {
+ if ( this.dragDropUI ) {
+ this.active = value;
+ this.updateThemeClasses();
+ }
+ return this;
+};
+
/**
* IconWidget is a generic widget for {@link OO.ui.mixin.IconElement icons}. In general, IconWidgets should be used with OO.ui.LabelWidget,
* which creates a label that identifies the icon’s function. See the [OOjs UI documentation on MediaWiki] [1]
* @extends OO.ui.Widget
* @mixins OO.ui.mixin.FlaggedElement
* @mixins OO.ui.mixin.TabIndexedElement
+ * @mixins OO.ui.mixin.TitledElement
+ * @mixins OO.ui.mixin.AccessKeyedElement
*
* @constructor
* @param {Object} [config] Configuration options
* @cfg {string} [name=''] The value of the input’s HTML `name` attribute.
* @cfg {string} [value=''] The value of the input.
+ * @cfg {string} [accessKey=''] The access key of the input.
* @cfg {Function} [inputFilter] The name of an input filter function. Input filters modify the value of an input
* before it is accepted.
*/
// Mixin constructors
OO.ui.mixin.FlaggedElement.call( this, config );
OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, { $tabIndexed: this.$input } ) );
+ OO.ui.mixin.TitledElement.call( this, $.extend( {}, config, { $titled: this.$input } ) );
+ OO.ui.mixin.AccessKeyedElement.call( this, $.extend( {}, config, { $accessKeyed: this.$input } ) );
// Events
this.$input.on( 'keydown mouseup cut paste change input select', this.onEdit.bind( this ) );
.addClass( 'oo-ui-inputWidget' )
.append( this.$input );
this.setValue( config.value );
+ this.setAccessKey( config.accessKey );
};
/* Setup */
OO.inheritClass( OO.ui.InputWidget, OO.ui.Widget );
OO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.FlaggedElement );
OO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.TabIndexedElement );
+OO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.TitledElement );
+OO.mixinClass( OO.ui.InputWidget, OO.ui.mixin.AccessKeyedElement );
/* Static Properties */
return this;
};
+/**
+ * Set the input's access key.
+ * FIXME: This is the same code as in OO.ui.mixin.ButtonElement, maybe find a better place for it?
+ *
+ * @param {string} accessKey Input's access key, use empty string to remove
+ * @chainable
+ */
+OO.ui.InputWidget.prototype.setAccessKey = function ( accessKey ) {
+ accessKey = typeof accessKey === 'string' && accessKey.length ? accessKey : null;
+
+ if ( this.accessKey !== accessKey ) {
+ if ( this.$input ) {
+ if ( accessKey !== null ) {
+ this.$input.attr( 'accesskey', accessKey );
+ } else {
+ this.$input.removeAttr( 'accesskey' );
+ }
+ }
+ this.accessKey = accessKey;
+ }
+
+ return this;
+};
+
/**
* Clean up incoming value.
*
* @constructor
* @param {Object} [config] Configuration options
* @cfg {Object[]} [options=[]] Array of menu options in the format `{ data: …, label: … }`
+ * @cfg {Object} [dropdown] Configuration options for {@link OO.ui.DropdownWidget DropdownWidget}
*/
OO.ui.DropdownInputWidget = function OoUiDropdownInputWidget( config ) {
// Configuration initialization
config = config || {};
// Properties (must be done before parent constructor which calls #setDisabled)
- this.dropdownWidget = new OO.ui.DropdownWidget();
+ this.dropdownWidget = new OO.ui.DropdownWidget( config.dropdown );
// Parent constructor
OO.ui.DropdownInputWidget.parent.call( this, config );
}
// Find topmost node in the tree
- topmostNode = this.$element[0];
+ topmostNode = this.$element[ 0 ];
while ( topmostNode.parentNode ) {
topmostNode = topmostNode.parentNode;
}
};
// Create a fake parent and observe it
- fakeParentNode = $( '<div>' ).append( topmostNode )[0];
+ fakeParentNode = $( '<div>' ).append( topmostNode )[ 0 ];
mutationObserver.observe( fakeParentNode, { childList: true } );
} else {
// Using the DOMNodeInsertedIntoDocument event is much nicer and less magical, and works for
return this;
};
+/**
+ * Focus the input and move the cursor to the end.
+ */
+OO.ui.TextInputWidget.prototype.moveCursorToEnd = function () {
+ var textRange,
+ element = this.$input[ 0 ];
+ this.focus();
+ if ( element.selectionStart !== undefined ) {
+ element.selectionStart = element.selectionEnd = element.value.length;
+ } else if ( element.createTextRange ) {
+ // IE 8 and below
+ textRange = element.createTextRange();
+ textRange.collapse( false );
+ textRange.select();
+ }
+};
+
/**
* Set the validation pattern.
*
* @return {jQuery.Promise} A promise that resolves to a boolean `true` if the value is valid.
*/
OO.ui.TextInputWidget.prototype.isValid = function () {
+ var result;
+
if ( this.validate instanceof Function ) {
- var result = this.validate( this.getValue() );
+ result = this.validate( this.getValue() );
if ( $.isFunction( result.promise ) ) {
return result.promise();
} else {
* @chainable
*/
OO.ui.TextInputWidget.prototype.positionLabel = function () {
+ var after, rtl, property;
// Clear old values
this.$input
// Clear old values if present
return;
}
- var after = this.labelPosition === 'after',
- rtl = this.$element.css( 'direction' ) === 'rtl',
- property = after === rtl ? 'padding-left' : 'padding-right';
+ after = this.labelPosition === 'after';
+ rtl = this.$element.css( 'direction' ) === 'rtl';
+ property = after === rtl ? 'padding-left' : 'padding-right';
this.$input.css( property, this.$label.outerWidth( true ) );
* @extends OO.ui.DecoratedOptionWidget
* @mixins OO.ui.mixin.ButtonElement
* @mixins OO.ui.mixin.TabIndexedElement
+ * @mixins OO.ui.mixin.TitledElement
*
* @constructor
* @param {Object} [config] Configuration options
// Mixin constructors
OO.ui.mixin.ButtonElement.call( this, config );
+ OO.ui.mixin.TitledElement.call( this, $.extend( {}, config, { $titled: this.$button } ) );
OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, {
$tabIndexed: this.$button,
tabIndex: -1
OO.inheritClass( OO.ui.ButtonOptionWidget, OO.ui.DecoratedOptionWidget );
OO.mixinClass( OO.ui.ButtonOptionWidget, OO.ui.mixin.ButtonElement );
+OO.mixinClass( OO.ui.ButtonOptionWidget, OO.ui.mixin.TitledElement );
OO.mixinClass( OO.ui.ButtonOptionWidget, OO.ui.mixin.TabIndexedElement );
/* Static Properties */
* [3]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Popups#containerExample
* @cfg {number} [containerPadding=10] Padding between the popup and its container, specified as a number of pixels.
* @cfg {jQuery} [$content] Content to append to the popup's body
+ * @cfg {jQuery} [$footer] Content to append to the popup's footer
* @cfg {boolean} [autoClose=false] Automatically close the popup when it loses focus.
* @cfg {jQuery} [$autoCloseIgnore] Elements that will not close the popup when clicked.
* This config option is only relevant if #autoClose is set to `true`. See the [OOjs UI docs on MediaWiki][2]
// Properties (must be set before ClippableElement constructor call)
this.$body = $( '<div>' );
+ this.$popup = $( '<div>' );
// Mixin constructors
OO.ui.mixin.LabelElement.call( this, config );
- OO.ui.mixin.ClippableElement.call( this, $.extend( {}, config, { $clippable: this.$body } ) );
+ OO.ui.mixin.ClippableElement.call( this, $.extend( {}, config, {
+ $clippable: this.$body,
+ $clippableContainer: this.$popup
+ } ) );
// Properties
- this.$popup = $( '<div>' );
this.$head = $( '<div>' );
+ this.$footer = $( '<div>' );
this.$anchor = $( '<div>' );
// If undefined, will be computed lazily in updateDimensions()
this.$container = config.$container;
this.$head
.addClass( 'oo-ui-popupWidget-head' )
.append( this.$label, this.closeButton.$element );
+ this.$footer.addClass( 'oo-ui-popupWidget-footer' );
if ( !config.head ) {
this.$head.addClass( 'oo-ui-element-hidden' );
}
+ if ( !config.$footer ) {
+ this.$footer.addClass( 'oo-ui-element-hidden' );
+ }
this.$popup
.addClass( 'oo-ui-popupWidget-popup' )
- .append( this.$head, this.$body );
+ .append( this.$head, this.$body, this.$footer );
this.$element
.addClass( 'oo-ui-popupWidget' )
.append( this.$popup, this.$anchor );
if ( config.$content instanceof jQuery ) {
this.$body.append( config.$content );
}
+ if ( config.$footer instanceof jQuery ) {
+ this.$footer.append( config.$footer );
+ }
if ( config.padded ) {
this.$body.addClass( 'oo-ui-popupWidget-body-padded' );
}
* @inheritdoc
*/
OO.ui.PopupWidget.prototype.toggle = function ( show ) {
+ var change;
show = show === undefined ? !this.isVisible() : !!show;
- var change = show !== this.isVisible();
+ change = show !== this.isVisible();
// Parent method
OO.ui.PopupWidget.parent.prototype.toggle.call( this, show );
filter = this.getItemMatcher( label, true );
for ( i = 0; i < len; i++ ) {
- item = this.items[i];
+ item = this.items[ i ];
if ( item instanceof OO.ui.OptionWidget && item.isSelectable() && filter( item ) ) {
return item;
}
found = null;
filter = this.getItemMatcher( label, false );
for ( i = 0; i < len; i++ ) {
- item = this.items[i];
+ item = this.items[ i ];
if ( item instanceof OO.ui.OptionWidget && item.isSelectable() && filter( item ) ) {
if ( found ) {
return null;
}
if ( item instanceof OO.ui.OptionWidget ) {
- currentIndex = $.inArray( item, this.items );
+ currentIndex = this.items.indexOf( item );
nextIndex = ( currentIndex + increase + len ) % len;
} else {
// If no item is selected and moving forward, start at the beginning.
filter = showAll ? null : this.getItemMatcher( this.$input.val() );
for ( i = 0; i < len; i++ ) {
- item = this.items[i];
+ item = this.items[ i ];
if ( item instanceof OO.ui.OptionWidget ) {
item.toggle( showAll || filter( item ) );
}
* @inheritdoc
*/
OO.ui.MenuSelectWidget.prototype.toggle = function ( visible ) {
- visible = ( visible === undefined ? !this.visible : !!visible ) && !!this.items.length;
+ var i, len, change;
- var i, len,
- change = visible !== this.isVisible();
+ visible = ( visible === undefined ? !this.visible : !!visible ) && !!this.items.length;
+ change = visible !== this.isVisible();
// Parent method
OO.ui.MenuSelectWidget.parent.prototype.toggle.call( this, visible );
* @inheritdoc
*/
OO.ui.FloatingMenuSelectWidget.prototype.toggle = function ( visible ) {
+ var change;
visible = visible === undefined ? !this.isVisible() : !!visible;
- var change = visible !== this.isVisible();
+ change = visible !== this.isVisible();
if ( change && visible ) {
// Make sure the width is set before the parent method runs.
"alignCentre": { "file": "images/icons/align-center.svg" },
"alignLeft": { "file": "images/icons/align-float-left.svg" },
"alignRight": { "file": "images/icons/align-float-right.svg" },
+ "calendar": { "file": {
+ "ltr": "images/icons/calendar-ltr.svg",
+ "rtl": "images/icons/calendar-rtl.svg"
+ } },
"find": { "file": {
"ltr": "images/icons/find-ltr.svg",
"rtl": "images/icons/find-rtl.svg"
"prefix": "oo-ui-icon",
"intro": "@import '../../../../src/styles/common';",
"images": {
- "circle": { "file": "images/icons/circle.svg" },
"add": { "file": "images/icons/add.svg" },
"advanced": { "file": "images/icons/advanced.svg" },
- "cancel": { "file": "images/icons/cancel.svg" },
"alert": { "file": "images/icons/alert.svg" },
+ "cancel": { "file": "images/icons/cancel.svg" },
"check": { "file": "images/icons/check.svg" },
+ "circle": { "file": "images/icons/circle.svg" },
"close": { "file": "images/icons/close.svg" },
"code": { "file": "images/icons/code.svg" },
"collapse": { "file": "images/icons/collapse.svg" },
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+ <path d="M4 5v10c0 1.7 1.3 3 3 3h14V8c0-1.7-1.3-3-3-3H4zm2 1c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zM5 9h3v2H5V9zm4 0h3v2H9V9zm4 0h3v2h-3V9zm4 0h3v2h-3V9zM5 12h3v2H5v-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2zM5 15h3v2H7c-1.195 0-2-.805-2-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2z"/>
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+ <path d="M21 5v10c0 1.7-1.3 3-3 3H4V8c0-1.7 1.3-3 3-3h14zm-2 1c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zM7 6c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm13 3h-3v2h3V9zm-4 0h-3v2h3V9zm-4 0H9v2h3V9zM8 9H5v2h3V9zm12 3h-3v2h3v-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2zm12 3h-3v2h1c1.195 0 2-.805 2-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2z"/>
+</svg>
"alignCentre": { "file": "images/icons/align-center.svg" },
"alignLeft": { "file": "images/icons/align-float-left.svg" },
"alignRight": { "file": "images/icons/align-float-right.svg" },
+ "calendar": { "file": {
+ "ltr": "images/icons/calendar-ltr.svg",
+ "rtl": "images/icons/calendar-rtl.svg"
+ } },
"find": { "file": {
"ltr": "images/icons/find-ltr.svg",
"rtl": "images/icons/find-rtl.svg"
{
"selectorWithoutVariant": ".oo-ui-icon-{name}",
- "selectorWithVariant": ".oo-ui-image-{variant} .oo-ui-icon-{name}, .oo-ui-image-{variant}.oo-ui-icon-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-icon-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
+ <path d="M4 5v10c0 1.7 1.3 3 3 3h14V8c0-1.7-1.3-3-3-3H4zm2 1c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zM5 9h3v2H5V9zm4 0h3v2H9V9zm4 0h3v2h-3V9zm4 0h3v2h-3V9zM5 12h3v2H5v-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2zM5 15h3v2H7c-1.195 0-2-.805-2-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2z"/>
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+ <path d="M4 5v10c0 1.7 1.3 3 3 3h14V8c0-1.7-1.3-3-3-3H4zm2 1c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zm4 0c.552 0 1 .448 1 1s-.448 1-1 1-1-.448-1-1 .448-1 1-1zM5 9h3v2H5V9zm4 0h3v2H9V9zm4 0h3v2h-3V9zm4 0h3v2h-3V9zM5 12h3v2H5v-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2zM5 15h3v2H7c-1.195 0-2-.805-2-2zm4 0h3v2H9v-2zm4 0h3v2h-3v-2zm4 0h3v2h-3v-2z"/>
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
+ <path d="M21 5v10c0 1.7-1.3 3-3 3H4V8c0-1.7 1.3-3 3-3h14zm-2 1c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zM7 6c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm13 3h-3v2h3V9zm-4 0h-3v2h3V9zm-4 0H9v2h3V9zM8 9H5v2h3V9zm12 3h-3v2h3v-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2zm12 3h-3v2h1c1.195 0 2-.805 2-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2z"/>
+</svg>
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+ <path d="M21 5v10c0 1.7-1.3 3-3 3H4V8c0-1.7 1.3-3 3-3h14zm-2 1c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm-4 0c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zM7 6c-.552 0-1 .448-1 1s.448 1 1 1 1-.448 1-1-.448-1-1-1zm13 3h-3v2h3V9zm-4 0h-3v2h3V9zm-4 0H9v2h3V9zM8 9H5v2h3V9zm12 3h-3v2h3v-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2zm12 3h-3v2h1c1.195 0 2-.805 2-2zm-4 0h-3v2h3v-2zm-4 0H9v2h3v-2zm-4 0H5v2h3v-2z"/>
+</svg>
{
"selectorWithoutVariant": ".oo-ui-indicator-{name}",
- "selectorWithVariant": ".oo-ui-image-{variant} .oo-ui-indicator-{name}, .oo-ui-image-{variant}.oo-ui-indicator-{name}",
+ "selectorWithVariant": ".oo-ui-image-{variant}.oo-ui-indicator-{name}",
"intro": "@import '../../../../src/styles/common';",
"variants": {
"invert": {
/*!
- * OOjs v1.1.8 optimised for jQuery
+ * OOjs v1.1.9 optimised for jQuery
* https://www.mediawiki.org/wiki/OOjs
*
* Copyright 2011-2015 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2015-07-23T19:16:00Z
+ * Date: 2015-08-25T21:35:29Z
*/
( function ( global ) {
oo = {},
// Optimisation: Local reference to Object.prototype.hasOwnProperty
hasOwn = oo.hasOwnProperty,
- toString = oo.toString;
+ toString = oo.toString,
+ // Object.create() is impossible to fully polyfill, so don't require it
+ createObject = Object.create || ( function () {
+ // Reusable constructor function
+ function Empty() {}
+ return function ( prototype, properties ) {
+ var obj;
+ Empty.prototype = prototype;
+ obj = new Empty();
+ if ( properties && hasOwn.call( properties, 'constructor' ) ) {
+ obj.constructor = properties.constructor.value;
+ }
+ return obj;
+ };
+ } )();
/* Class Methods */
// allows people to comply with their style guide.
targetFn['super'] = targetFn.parent = originFn;
- targetFn.prototype = Object.create( originFn.prototype, {
+ targetFn.prototype = createObject( originFn.prototype, {
// Restore constructor property of targetFn
constructor: {
value: targetConstructor,
// Extend static properties - always initialize both sides
oo.initClass( originFn );
- targetFn.static = Object.create( originFn.static );
+ targetFn.static = createObject( originFn.static );
};
/**
oo.cloneObject = function ( origin ) {
var key, r;
- r = Object.create( origin.constructor.prototype );
+ r = createObject( origin.constructor.prototype );
for ( key in origin ) {
if ( hasOwn.call( origin, key ) ) {
}
};
+/*global createObject */
+
/**
* @class OO.Factory
* @extends OO.Registry
// the constructor's prototype (which also makes it an "instanceof" the constructor),
// then invoke the constructor with the object as context, and return it (ignoring
// the constructor's return value).
- obj = Object.create( constructor.prototype );
+ obj = createObject( constructor.prototype );
constructor.apply( obj, args );
return obj;
};
* "fobo", not "foba". Basically emulating the native maxlength by
* reconstructing where the insertion occurred.
*
- * @private
+ * @static
* @param {string} safeVal Known value that was previously returned by this
* function, if none, pass empty string.
* @param {string} newVal New value that may have to be trimmed down.
* @param {number} byteLimit Number of bytes the value may be in size.
- * @param {Function} [fn] See jQuery.byteLimit.
+ * @param {Function} [fn] See jQuery#byteLimit.
* @return {Object}
* @return {string} return.newVal
* @return {boolean} return.trimmed
*/
- function trimValueForByteLength( safeVal, newVal, byteLimit, fn ) {
+ $.trimByteLength = function ( safeVal, newVal, byteLimit, fn ) {
var startMatches, endMatches, matchesLen, inpParts,
oldVal = safeVal;
newVal: newVal,
trimmed: true
};
- }
+ };
var eventKeys = [
'keyup.byteLimit',
// See http://www.w3.org/TR/DOM-Level-3-Events/#events-keyboard-event-order for
// the order and characteristics of the key events.
$el.on( eventKeys, function () {
- var res = trimValueForByteLength(
+ var res = $.trimByteLength(
prevSafeVal,
this.value,
elLimit,
this.value = res.newVal;
}
// Always adjust prevSafeVal to reflect the input value. Not doing this could cause
- // trimValueForByteLength to compare the new value to an empty string instead of the
+ // trimByteLength to compare the new value to an empty string instead of the
// old value, resulting in trimming always from the end (bug 40850).
prevSafeVal = res.newVal;
} );
} );
};
- $.fn.byteLimit.trimValueForByteLength = trimValueForByteLength;
-
/**
* @class jQuery
* @mixins jQuery.plugin.byteLimit
* @return {string}
*/
CoreForeignApi.prototype.getOrigin = function () {
- var origin = window.location.protocol + '//' + window.location.hostname;
- if ( window.location.port ) {
- origin += ':' + window.location.port;
+ var origin = location.protocol + '//' + location.hostname;
+ if ( location.port ) {
+ origin += ':' + location.port;
}
return origin;
};
$.extend( mw.Api.prototype, {
/**
* Upload a file to MediaWiki.
- * @param {HTMLInputElement|File} file HTML input type=file element with a file already inside of it, or a File object.
+ *
+ * The file will be uploaded using AJAX and FormData, if the browser supports it, or via an
+ * iframe if it doesn't.
+ *
+ * Caveats of iframe upload:
+ * - The returned jQuery.Promise will not receive `progress` notifications during the upload
+ * - It is incompatible with uploads to a foreign wiki using mw.ForeignApi
+ * - You must pass a HTMLInputElement and not a File for it to be possible
+ *
+ * @param {HTMLInputElement|File} file HTML input type=file element with a file already inside
+ * of it, or a File object.
* @param {Object} data Other upload options, see action=upload API docs for more
* @return {jQuery.Promise}
*/
* APIs, and continues to work in browsers with those APIs.
*
* The rough sketch of how this method works is as follows:
- * * An iframe is loaded with no content.
- * * A form is submitted with the passed-in file input and some extras.
- * * The MediaWiki API receives that form data, and sends back a response.
- * * The response is sent to the iframe, because we set target=(iframe id)
- * * The response is parsed out of the iframe's document, and passed back
- * through the promise.
+ * 1. An iframe is loaded with no content.
+ * 2. A form is submitted with the passed-in file input and some extras.
+ * 3. The MediaWiki API receives that form data, and sends back a response.
+ * 4. The response is sent to the iframe, because we set target=(iframe id)
+ * 5. The response is parsed out of the iframe's document, and passed back
+ * through the promise.
+ *
+ * @private
* @param {HTMLInputElement} file The file input with a file in it.
* @param {Object} data Other upload options, see action=upload API docs for more
* @return {jQuery.Promise}
/**
* Uploads a file using the FormData API.
+ *
+ * @private
* @param {File} file
- * @param {Object} data
+ * @param {Object} data Other upload options, see action=upload API docs for more
* @return {jQuery.Promise}
*/
uploadWithFormData: function ( file, data ) {
return $.Deferred().reject( 'Filename not included in file data.' );
}
- return api.postWithEditToken( data );
+ return api.postWithEditToken( data ).then( function ( result ) {
+ if ( result.upload && ( result.upload.error || result.upload.warnings ) ) {
+ return $.Deferred().reject( result.upload.error || result.upload.warnings ).promise();
+ }
+ return result;
+ } );
}
return this.upload( file, { stash: true, filename: data.filename } ).then( function ( result ) {
border: 1px solid #dddddd;
}
-/**
- * Galleries (see shared.css for more info)
- */
-li.gallerybox {
- vertical-align: top;
- display: inline-block;
-}
-
-ul.gallery, li.gallerybox {
- zoom: 1;
- *display: inline;
-}
-
-ul.gallery {
- margin: 2px;
- padding: 2px;
- display: block;
-}
-
-li.gallerycaption {
- font-weight: bold;
- text-align: center;
- display: block;
- word-wrap: break-word;
-}
-
-li.gallerybox div.thumb {
- text-align: center;
- border: 1px solid #ccc;
- margin: 2px;
-}
-
-div.gallerytext {
- overflow: hidden;
- font-size: 94%;
- padding: 2px 4px;
- word-wrap: break-word;
-}
-
/**
* Table rendering
* As on shared.css but with white background.
margin-left: 0;
}
-/* Galleries */
-/* These display attributes look nonsensical, but are needed to support IE and FF2 */
-/* Don't forget to update commonPrint.css */
-li.gallerybox {
- vertical-align: top;
- display: -moz-inline-box;
- display: inline-block;
-}
-
-ul.gallery,
-li.gallerybox {
- zoom: 1;
- *display: inline;
-}
-
-ul.gallery {
- margin: 2px;
- padding: 2px;
- display: block;
-}
-
-li.gallerycaption {
- font-weight: bold;
- text-align: center;
- display: block;
- word-wrap: break-word;
-}
-
-li.gallerybox div.thumb {
- text-align: center;
- border: 1px solid #ccc;
- background-color: #f9f9f9;
- margin: 2px;
-}
-
-li.gallerybox div.thumb img {
- display: block;
- margin: 0 auto;
-}
-
-div.gallerytext {
- overflow: hidden;
- font-size: 94%;
- padding: 2px 4px;
- word-wrap: break-word;
-}
-
-/* new gallery stuff */
-ul.mw-gallery-nolines li.gallerybox div.thumb {
- background-color: transparent;
- border: none;
-}
-
-ul.mw-gallery-nolines li.gallerybox div.gallerytext {
- text-align: center;
-}
-
-/* height constrained gallery */
-
-ul.mw-gallery-packed li.gallerybox div.thumb,
-ul.mw-gallery-packed-overlay li.gallerybox div.thumb,
-ul.mw-gallery-packed-hover li.gallerybox div.thumb {
- background-color: transparent;
- border: none;
-}
-
-ul.mw-gallery-packed li.gallerybox div.thumb img,
-ul.mw-gallery-packed-overlay li.gallerybox div.thumb img,
-ul.mw-gallery-packed-hover li.gallerybox div.thumb img {
- margin: 0 auto;
-}
-
-ul.mw-gallery-packed-hover li.gallerybox,
-ul.mw-gallery-packed-overlay li.gallerybox {
- position: relative;
-}
-
-ul.mw-gallery-packed-hover div.gallerytextwrapper {
- overflow: hidden;
- height: 0;
-}
-
-ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper,
-ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper,
-ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper {
- position: absolute;
- background: white;
- background: rgba(255, 255, 255, 0.8);
- padding: 5px 10px;
- bottom: 0;
- left: 0; /* Needed for IE */
- height: auto;
- font-weight: bold;
- margin: 2px; /* correspond to style on div.thumb */
-}
-
-ul.mw-gallery-packed-hover,
-ul.mw-gallery-packed-overlay,
-ul.mw-gallery-packed {
- text-align: center;
-}
-
.mw-ajax-loader {
background-image: url(images/ajax-loader.gif);
background-position: center center;
--- /dev/null
+/* Galleries */
+/* These display attributes look nonsensical, but are needed to support IE and FF2 */
+/* Don't forget to update commonPrint.css */
+li.gallerybox {
+ vertical-align: top;
+ display: -moz-inline-box;
+ display: inline-block;
+}
+
+ul.gallery,
+li.gallerybox {
+ zoom: 1;
+ *display: inline;
+}
+
+ul.gallery {
+ margin: 2px;
+ padding: 2px;
+ display: block;
+}
+
+li.gallerycaption {
+ font-weight: bold;
+ text-align: center;
+ display: block;
+ word-wrap: break-word;
+}
+
+li.gallerybox div.thumb {
+ text-align: center;
+ border: 1px solid #ccc;
+ background-color: #f9f9f9;
+ margin: 2px;
+}
+
+li.gallerybox div.thumb img {
+ display: block;
+ margin: 0 auto;
+}
+
+div.gallerytext {
+ overflow: hidden;
+ font-size: 94%;
+ padding: 2px 4px;
+ word-wrap: break-word;
+}
+
+/* new gallery stuff */
+ul.mw-gallery-nolines li.gallerybox div.thumb {
+ background-color: transparent;
+ border: none;
+}
+
+ul.mw-gallery-nolines li.gallerybox div.gallerytext {
+ text-align: center;
+}
+
+/* height constrained gallery */
+
+ul.mw-gallery-packed li.gallerybox div.thumb,
+ul.mw-gallery-packed-overlay li.gallerybox div.thumb,
+ul.mw-gallery-packed-hover li.gallerybox div.thumb {
+ background-color: transparent;
+ border: none;
+}
+
+ul.mw-gallery-packed li.gallerybox div.thumb img,
+ul.mw-gallery-packed-overlay li.gallerybox div.thumb img,
+ul.mw-gallery-packed-hover li.gallerybox div.thumb img {
+ margin: 0 auto;
+}
+
+ul.mw-gallery-packed-hover li.gallerybox,
+ul.mw-gallery-packed-overlay li.gallerybox {
+ position: relative;
+}
+
+ul.mw-gallery-packed-hover div.gallerytextwrapper {
+ overflow: hidden;
+ height: 0;
+}
+
+ul.mw-gallery-packed-hover li.gallerybox:hover div.gallerytextwrapper,
+ul.mw-gallery-packed-overlay li.gallerybox div.gallerytextwrapper,
+ul.mw-gallery-packed-hover li.gallerybox.mw-gallery-focused div.gallerytextwrapper {
+ position: absolute;
+ background: white;
+ background: rgba(255, 255, 255, 0.8);
+ padding: 5px 10px;
+ bottom: 0;
+ left: 0; /* Needed for IE */
+ height: auto;
+ font-weight: bold;
+ margin: 2px; /* correspond to style on div.thumb */
+}
+
+ul.mw-gallery-packed-hover,
+ul.mw-gallery-packed-overlay,
+ul.mw-gallery-packed {
+ text-align: center;
+}
--- /dev/null
+li.gallerybox {
+ vertical-align: top;
+ display: inline-block;
+}
+
+ul.gallery, li.gallerybox {
+ zoom: 1;
+ *display: inline;
+}
+
+ul.gallery {
+ margin: 2px;
+ padding: 2px;
+ display: block;
+}
+
+li.gallerycaption {
+ font-weight: bold;
+ text-align: center;
+ display: block;
+ word-wrap: break-word;
+}
+
+li.gallerybox div.thumb {
+ text-align: center;
+ border: 1px solid #ccc;
+ margin: 2px;
+}
+
+div.gallerytext {
+ overflow: hidden;
+ font-size: 94%;
+ padding: 2px 4px;
+ word-wrap: break-word;
+}
mw.widgets.TitleInputWidget.prototype.cleanUpValue = function ( value ) {
var widget = this;
value = mw.widgets.TitleInputWidget.parent.prototype.cleanUpValue.call( this, value );
- return $.fn.byteLimit.trimValueForByteLength( this.value, value, this.maxLength, function ( value ) {
+ return $.trimByteLength( this.value, value, this.maxLength, function ( value ) {
var title = widget.getTitle( value );
return title ? title.getMain() : value;
} ).newVal;
return false;
}
- dialog.upload.finishStashUpload().then( function () {
+ dialog.upload.finishStashUpload().always( function () {
var name;
if ( dialog.upload.getState() === mw.Upload.State.ERROR ) {
--- /dev/null
+/* jshint bitwise:false */
+( function ( mw, $ ) {
+
+ var CONTROL_BUCKET = 'control',
+ MAX_INT32_UNSIGNED = 4294967295;
+
+ /**
+ * An implementation of Jenkins' one-at-a-time hash.
+ *
+ * @see http://en.wikipedia.org/wiki/Jenkins_hash_function
+ *
+ * @param {String} string String to hash
+ * @return {Number} The hash as a 32-bit unsigned integer
+ * @ignore
+ *
+ * @author Ori Livneh <ori@wikimedia.org>
+ * @see http://jsbin.com/kejewi/4/watch?js,console
+ */
+ function hashString( string ) {
+ var hash = 0,
+ i = string.length;
+
+ while ( i-- ) {
+ hash += string.charCodeAt( i );
+ hash += ( hash << 10 );
+ hash ^= ( hash >> 6 );
+ }
+ hash += ( hash << 3 );
+ hash ^= ( hash >> 11 );
+ hash += ( hash << 15 );
+
+ return hash >>> 0;
+ }
+
+ /**
+ * Provides an API for bucketing users in experiments.
+ *
+ * @class mw.experiments
+ * @singleton
+ */
+ mw.experiments = {
+
+ /**
+ * Gets the bucket for the experiment given the token.
+ *
+ * The name of the experiment and the token are hashed. The hash is converted
+ * to a number which is then used to get a bucket.
+ *
+ * Consider the following experiment specification:
+ *
+ * ```
+ * {
+ * name: 'My first experiment',
+ * enabled: true,
+ * buckets: {
+ * control: 0.5
+ * A: 0.25,
+ * B: 0.25
+ * }
+ * }
+ * ```
+ *
+ * The experiment has three buckets: control, A, and B. The user has a 50%
+ * chance of being assigned to the control bucket, and a 25% chance of being
+ * assigned to either the A or B buckets. If the experiment were disabled,
+ * then the user would always be assigned to the control bucket.
+ *
+ * This function is based on the deprecated `mw.user.bucket` function.
+ *
+ * @param {Object} experiment
+ * @param {String} experiment.name The name of the experiment
+ * @param {Boolean} experiment.enabled Whether or not the experiment is
+ * enabled. If the experiment is disabled, then the user is always assigned
+ * to the control bucket
+ * @param {Object} experiment.buckets A map of bucket name to probability
+ * that the user will be assigned to that bucket
+ * @param {String} token A token that uniquely identifies the user for the
+ * duration of the experiment
+ * @returns {String} The bucket
+ */
+ getBucket: function ( experiment, token ) {
+ var buckets = experiment.buckets,
+ key,
+ range = 0,
+ hash,
+ max,
+ acc = 0;
+
+ if ( !experiment.enabled || $.isEmptyObject( experiment.buckets ) ) {
+ return CONTROL_BUCKET;
+ }
+
+ for ( key in buckets ) {
+ range += buckets[key];
+ }
+
+ hash = hashString( experiment.name + ':' + token );
+ max = ( hash / MAX_INT32_UNSIGNED ) * range;
+
+ for ( key in buckets ) {
+ acc += buckets[key];
+
+ if ( max <= acc ) {
+ return key;
+ }
+ }
+ }
+ };
+
+}( mediaWiki, jQuery ) );
}
protected function tearDown() {
- foreach ( glob( $this->tmpPrefix . '*' ) as $directory ) {
- $this->deleteFilesRecursively( $directory );
- }
+ foreach ( glob( $this->tmpPrefix . '*' ) as $directory ) {
+ $this->deleteFilesRecursively( $directory );
+ }
- unlink( $this->tmpFilepath );
+ unlink( $this->tmpFilepath );
parent::tearDown();
}
+++ /dev/null
-<?php
-
-/**
- * @group IPSet
- */
-class IPSetTest extends PHPUnit_Framework_TestCase {
- /**
- * Provides test cases for IPSetTest::testIPSet
- *
- * Returns an array of test cases. Each case is an array of (description,
- * config, tests). Description is just text output for failure messages,
- * config is an array constructor argument for IPSet, and the tests are
- * an array of IP => expected (boolean) result against the config dataset.
- */
- public static function provideIPSets() {
- return array(
- array(
- 'old_list_subset',
- array(
- '208.80.152.162',
- '10.64.0.123',
- '10.64.0.124',
- '10.64.0.125',
- '10.64.0.126',
- '10.64.0.127',
- '10.64.0.128',
- '10.64.0.129',
- '10.64.32.104',
- '10.64.32.105',
- '10.64.32.106',
- '10.64.32.107',
- '91.198.174.45',
- '91.198.174.46',
- '91.198.174.47',
- '91.198.174.57',
- '2620:0:862:1:A6BA:DBFF:FE30:CFB3',
- '91.198.174.58',
- '2620:0:862:1:A6BA:DBFF:FE38:FFDA',
- '208.80.152.16',
- '208.80.152.17',
- '208.80.152.18',
- '208.80.152.19',
- '91.198.174.102',
- '91.198.174.103',
- '91.198.174.104',
- '91.198.174.105',
- '91.198.174.106',
- '91.198.174.107',
- '91.198.174.81',
- '2620:0:862:1:26B6:FDFF:FEF5:B2D4',
- '91.198.174.82',
- '2620:0:862:1:26B6:FDFF:FEF5:ABB4',
- '10.20.0.113',
- '2620:0:862:102:26B6:FDFF:FEF5:AD9C',
- '10.20.0.114',
- '2620:0:862:102:26B6:FDFF:FEF5:7C38',
- ),
- array(
- '0.0.0.0' => false,
- '255.255.255.255' => false,
- '10.64.0.122' => false,
- '10.64.0.123' => true,
- '10.64.0.124' => true,
- '10.64.0.129' => true,
- '10.64.0.130' => false,
- '91.198.174.81' => true,
- '91.198.174.80' => false,
- '0::0' => false,
- 'ffff:ffff:ffff:ffff:FFFF:FFFF:FFFF:FFFF' => false,
- '2001:db8::1234' => false,
- '2620:0:862:1:26b6:fdff:fef5:abb3' => false,
- '2620:0:862:1:26b6:fdff:fef5:abb4' => true,
- '2620:0:862:1:26b6:fdff:fef5:abb5' => false,
- ),
- ),
- array(
- 'new_cidr_set',
- array(
- '208.80.154.0/26',
- '2620:0:861:1::/64',
- '208.80.154.128/26',
- '2620:0:861:2::/64',
- '208.80.154.64/26',
- '2620:0:861:3::/64',
- '208.80.155.96/27',
- '2620:0:861:4::/64',
- '10.64.0.0/22',
- '2620:0:861:101::/64',
- '10.64.16.0/22',
- '2620:0:861:102::/64',
- '10.64.32.0/22',
- '2620:0:861:103::/64',
- '10.64.48.0/22',
- '2620:0:861:107::/64',
- '91.198.174.0/25',
- '2620:0:862:1::/64',
- '10.20.0.0/24',
- '2620:0:862:102::/64',
- '10.128.0.0/24',
- '2620:0:863:101::/64',
- '10.2.4.26',
- ),
- array(
- '0.0.0.0' => false,
- '255.255.255.255' => false,
- '10.2.4.25' => false,
- '10.2.4.26' => true,
- '10.2.4.27' => false,
- '10.20.0.255' => true,
- '10.128.0.0' => true,
- '10.64.17.55' => true,
- '10.64.20.0' => false,
- '10.64.27.207' => false,
- '10.64.31.255' => false,
- '0::0' => false,
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' => false,
- '2001:DB8::1' => false,
- '2620:0:861:106::45' => false,
- '2620:0:862:103::' => false,
- '2620:0:862:102:10:20:0:113' => true,
- ),
- ),
- array(
- 'empty_set',
- array(),
- array(
- '0.0.0.0' => false,
- '255.255.255.255' => false,
- '10.2.4.25' => false,
- '10.2.4.26' => false,
- '10.2.4.27' => false,
- '10.20.0.255' => false,
- '10.128.0.0' => false,
- '10.64.17.55' => false,
- '10.64.20.0' => false,
- '10.64.27.207' => false,
- '10.64.31.255' => false,
- '0::0' => false,
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' => false,
- '2001:DB8::1' => false,
- '2620:0:861:106::45' => false,
- '2620:0:862:103::' => false,
- '2620:0:862:102:10:20:0:113' => false,
- ),
- ),
- array(
- 'edge_cases',
- array(
- '0.0.0.0',
- '255.255.255.255',
- '::',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff',
- '10.10.10.10/25', // host bits intentional
- ),
- array(
- '0.0.0.0' => true,
- '255.255.255.255' => true,
- '10.2.4.25' => false,
- '10.2.4.26' => false,
- '10.2.4.27' => false,
- '10.20.0.255' => false,
- '10.128.0.0' => false,
- '10.64.17.55' => false,
- '10.64.20.0' => false,
- '10.64.27.207' => false,
- '10.64.31.255' => false,
- '0::0' => true,
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' => true,
- '2001:DB8::1' => false,
- '2620:0:861:106::45' => false,
- '2620:0:862:103::' => false,
- '2620:0:862:102:10:20:0:113' => false,
- '10.10.9.255' => false,
- '10.10.10.0' => true,
- '10.10.10.1' => true,
- '10.10.10.10' => true,
- '10.10.10.126' => true,
- '10.10.10.127' => true,
- '10.10.10.128' => false,
- '10.10.10.177' => false,
- '10.10.10.255' => false,
- '10.10.11.0' => false,
- ),
- ),
- array(
- 'exercise_optimizer',
- array(
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fffe:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fffd:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fffc:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fffb:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fffa:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff9:8000/113',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff9:0/113',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff8:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff7:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff6:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff5:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff4:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff3:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff2:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff1:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff0:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffef:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffee:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffec:0/111',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffeb:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffea:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe9:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe8:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe7:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe6:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe5:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe4:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe3:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe2:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe1:0/112',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffe0:0/110',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffc0:0/107',
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffa0:0/107',
- ),
- array(
- '0.0.0.0' => false,
- '255.255.255.255' => false,
- '::' => false,
- 'ffff:ffff:ffff:ffff:ffff:ffff:ff9f:ffff' => false,
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffa0:0' => true,
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffc0:1234' => true,
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffed:ffff' => true,
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff4:4444' => true,
- 'ffff:ffff:ffff:ffff:ffff:ffff:fff9:8080' => true,
- 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' => true,
- ),
- ),
- );
- }
-
- /**
- * Validates IPSet loading and matching code
- *
- * @covers IPSet
- * @dataProvider provideIPSets
- */
- public function testIPSet( $desc, array $cfg, array $tests ) {
- $ipset = new IPSet( $cfg );
- foreach ( $tests as $ip => $expected ) {
- $result = $ipset->match( $ip );
- $this->assertEquals( $expected, $result, "Incorrect match() result for $ip in dataset $desc" );
- }
- }
-}
<?php
/**
* @author Matthias Mullie <mmullie@wikimedia.org>
+ * @group BagOStuff
*/
class BagOStuffTest extends MediaWikiTestCase {
/** @var BagOStuff */
$value3 = $this->cache->getScopedLock( $key, 0 );
$this->assertType( 'ScopedCallback', $value3, 'Lock returned callback after release' );
+ unset( $value3 );
+
+ $value1 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
+ $value2 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
+
+ $this->assertType( 'ScopedCallback', $value1, 'First reentrant call returned lock' );
+ $this->assertType( 'ScopedCallback', $value1, 'Second reentrant call returned lock' );
}
}
'tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js',
'tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js',
'tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js',
+ 'tests/qunit/suites/resources/mediawiki/mediawiki.experiments.test.js',
),
'dependencies' => array(
'jquery.accessKeyLabel',
'mediawiki.language',
'mediawiki.cldr',
'mediawiki.cookie',
+ 'mediawiki.experiments',
'test.mediawiki.qunit.testrunner',
),
)
--- /dev/null
+( function ( mw ) {
+
+ var getBucket = mw.experiments.getBucket;
+
+ function createExperiment() {
+ return {
+ name: 'experiment',
+ enabled: true,
+ buckets: {
+ control: 0.25,
+ A: 0.25,
+ B: 0.25,
+ C: 0.25
+ }
+ };
+ }
+
+ QUnit.module( 'mediawiki.experiments' );
+
+ QUnit.test( 'getBucket( experiment, token )', 4, function ( assert ) {
+ var experiment = createExperiment(),
+ token = '123457890';
+
+ assert.equal(
+ getBucket( experiment, token ),
+ getBucket( experiment, token ),
+ 'It returns the same bucket for the same experiment-token pair.'
+ );
+
+ // --------
+ experiment = createExperiment();
+ experiment.buckets = {
+ A: 0.314159265359
+ };
+
+ assert.equal(
+ 'A',
+ getBucket( experiment, token ),
+ 'It returns the bucket if only one is defined.'
+ );
+
+ // --------
+ experiment = createExperiment();
+ experiment.enabled = false;
+
+ assert.equal(
+ 'control',
+ getBucket( experiment, token ),
+ 'It returns "control" if the experiment is disabled.'
+ );
+
+ // --------
+ experiment = createExperiment();
+ experiment.buckets = {};
+
+ assert.equal(
+ 'control',
+ getBucket( experiment, token ),
+ 'It returns "control" if the experiment doesn\'t have any buckets.'
+ );
+ } );
+
+}( mediaWiki ) );
wfThumbErrorText( 404, "The source file '$fileName' does not exist." );
return;
} elseif ( $img->getPath() === false ) {
- wfThumbErrorText( 500, "The source file '$fileName' is not locally accessible." );
+ wfThumbErrorText( 400, "The source file '$fileName' is not locally accessible." );
return;
}
$user = RequestContext::getMain()->getUser();
if ( !wfThumbIsStandard( $img, $params ) && $user->pingLimiter( 'renderfile-nonstandard' ) ) {
- wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() );
+ wfThumbError( 429, wfMessage( 'actionthrottledtext' )->parse() );
return;
} elseif ( $user->pingLimiter( 'renderfile' ) ) {
- wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() );
+ wfThumbError( 429, wfMessage( 'actionthrottledtext' )->parse() );
return;
}
$errorCode = 500;
if ( !$thumb ) {
$errorMsg = $errorMsg ?: $msg->rawParams( 'File::transform() returned false' )->escaped();
+ if ( $errorMsg instanceof MessageSpecifier && $errorMsg->getKey() === 'thumbnail_image-failure-limit' ) {
+ $errorCode = 429;
+ }
} elseif ( $thumb->isError() ) {
$errorMsg = $thumb->getHtmlMsg();
} elseif ( !$thumb->hasFile() ) {
* @return void
*/
function wfThumbErrorText( $status, $msgText ) {
- return wfThumbError( $status, htmlspecialchars( $msgText ) );
+ wfThumbError( $status, htmlspecialchars( $msgText ) );
}
/**
header( 'Cache-Control: no-cache' );
header( 'Content-Type: text/html; charset=utf-8' );
- if ( $status == 400 ) {
- HttpStatus::header( 400 );
- } elseif ( $status == 404 ) {
- HttpStatus::header( 404 );
+ if ( $status == 400 || $status == 404 || $status == 429 ) {
+ HttpStatus::header( $status );
} elseif ( $status == 403 ) {
HttpStatus::header( 403 );
header( 'Vary: Cookie' );
dépôts / lhc / web / wiklou.git / commitdiff
