#
language: php
-php:
- - hhvm
- - 5.3
-
-env:
- - dbtype=mysql
- - dbtype=postgres
-
-# TODO: Travis CI's hhvm does not support PostgreSQL at the moment.
matrix:
- exclude:
- - php: hhvm
- env: dbtype=postgres
+ fast_finish: true
+ include:
+ - env: dbtype=mysql
+ php: 5.3
+ - env: dbtype=postgres
+ php: 5.3
+ - env: dbtype=mysql
+ php: hhvm
+ - env: dbtype=mysql
+ php: 7
services:
- mysql
a lengthy deprecation period.
* The ScopedPHPTimeout class was removed.
* Removed maintenance script fixSlaveDesync.php.
+* Watchlist tokens, SpecialResetTokens, and User::getTokenFromOption()
+ are deprecated. Applications using those can work via the OAuth
+ extension instead. New tokens types should not be added.
== Compatibility ==
"php": ">=5.3.3",
"psr/log": "1.0.0",
"wikimedia/assert": "0.2.2",
- "wikimedia/cdb": "1.0.1",
+ "wikimedia/cdb": "1.3.0",
"wikimedia/composer-merge-plugin": "1.2.1",
"wikimedia/ip-set": "1.0.1",
"wikimedia/utfnormal": "1.0.3",
}
/**
- * Handle PHP errors issued inside a hook. Catch errors that have to do with
- * a function expecting a reference, and let all others pass through.
- *
- * This REALLY should be protected... but it's public for compatibility
+ * Handle PHP errors issued inside a hook. Catch errors that have to do
+ * with a function expecting a reference, and pass all others through to
+ * MWExceptionHandler::handleError() for default processing.
*
* @since 1.18
*
* @param int $errno Error number (unused)
* @param string $errstr Error message
* @throws MWHookException If the error has to do with the function signature
- * @return bool Always returns false
+ * @return bool
*/
public static function hookErrorHandler( $errno, $errstr ) {
if ( strpos( $errstr, 'expected to be a reference, value given' ) !== false ) {
throw new MWHookException( $errstr, $errno );
}
- return false;
+
+ // Delegate unhandled errors to the default MW handler
+ return call_user_func_array(
+ 'MWExceptionHandler::handleError', func_get_args()
+ );
}
}
return 'tcp://' . $parsedUrl['host'] . ':' . $parsedUrl['port'];
}
+ /**
+ * Returns an array with a 'capath' or 'cafile' key that is suitable to be merged into the 'ssl' sub-array of a
+ * stream context options array. Uses the 'caInfo' option of the class if it is provided, otherwise uses the system
+ * default CA bundle if PHP supports that, or searches a few standard locations.
+ * @return array
+ * @throws DomainException
+ */
+ protected function getCertOptions() {
+ $certOptions = array();
+ $certLocations = array();
+ if ( $this->caInfo ) {
+ $certLocations = array( 'manual' => $this->caInfo );
+ } elseif ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
+ // Default locations, based on
+ // https://www.happyassassin.net/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
+ // PHP 5.5 and older doesn't have any defaults, so we try to guess ourselves. PHP 5.6+ gets the CA location
+ // from OpenSSL as long as it is not set manually, so we should leave capath/cafile empty there.
+ $certLocations = array_filter( array(
+ getenv( 'SSL_CERT_DIR' ),
+ getenv( 'SSL_CERT_PATH' ),
+ '/etc/pki/tls/certs/ca-bundle.crt', # Fedora et al
+ '/etc/ssl/certs', # Debian et al
+ '/etc/pki/tls/certs/ca-bundle.trust.crt',
+ '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
+ '/System/Library/OpenSSL', # OSX
+ ) );
+ }
+
+ foreach( $certLocations as $key => $cert ) {
+ if ( is_dir( $cert ) ) {
+ $certOptions['capath'] = $cert;
+ break;
+ } elseif ( is_file( $cert ) ) {
+ $certOptions['cafile'] = $cert;
+ break;
+ } elseif ( $key === 'manual' ) {
+ // fail more loudly if a cert path was manually configured and it is not valid
+ throw new DomainException( "Invalid CA info passed: $cert" );
+ }
+ }
+
+ return $certOptions;
+ }
+
public function execute() {
parent::execute();
}
}
- if ( is_dir( $this->caInfo ) ) {
- $options['ssl']['capath'] = $this->caInfo;
- } elseif ( is_file( $this->caInfo ) ) {
- $options['ssl']['cafile'] = $this->caInfo;
- } elseif ( $this->caInfo ) {
- throw new MWException( "Invalid CA info passed: {$this->caInfo}" );
- }
+ $options['ssl'] += $this->getCertOptions();
$context = stream_context_create( $options );
/** @var string Inline CSS styles. Use addInlineStyle() sparingly */
protected $mInlineStyles = '';
- /** @todo Unused? */
- private $mLinkColours;
-
/**
* @var string Used by skin template.
* Example: $tpl->set( 'displaytitle', $out->mPageLinkTitle );
* Add an HTTP header that will influence on the cache
*
* @param string $header Header name
- * @param array|null $option
- * @todo FIXME: Document the $option parameter; it appears to be for
- * X-Vary-Options but what format is acceptable?
+ * @param string[]|null $option Options for X-Vary-Options. Possible options are:
+ * - "string-contains=$XXX" varies on whether the header value as a string
+ * contains $XXX as a substring.
+ * - "list-contains=$XXX" varies on whether the header value as a
+ * comma-separated list contains $XXX as one of the list items.
*/
public function addVaryHeader( $header, $option = null ) {
if ( !array_key_exists( $header, $this->mVaryHeader ) ) {
*/
public function setInternalPassword( $str ) {
$this->setToken();
+ $this->setOption( 'watchlisttoken', false );
$passwordFactory = self::getPasswordFactory();
$this->mPassword = $passwordFactory->newFromPlaintext( $str );
* @return string|bool User's current value for the option, or false if this option is disabled.
* @see resetTokenFromOption()
* @see getOption()
+ * @deprecated 1.26 Applications should use the OAuth extension
*/
public function getTokenFromOption( $oname ) {
global $wgHiddenPrefs;
- if ( in_array( $oname, $wgHiddenPrefs ) ) {
+
+ $id = $this->getId();
+ if ( !$id || in_array( $oname, $wgHiddenPrefs ) ) {
return false;
}
$token = $this->getOption( $oname );
if ( !$token ) {
- $token = $this->resetTokenFromOption( $oname );
- if ( !wfReadOnly() ) {
- $this->saveSettings();
- }
+ // Default to a value based on the user token to avoid space
+ // wasted on storing tokens for all users. When this option
+ // is set manually by the user, only then is it stored.
+ $token = hash_hmac( 'sha1', "$oname:$id", $this->getToken() );
}
+
return $token;
}
'9只' => '9隻',
'9余' => '9餘',
'·范' => '·范',
-'’s ' => '’s',
+'’s' => '’s',
'、面点' => '、麵點',
'。个中' => '。箇中',
'〇周后' => '〇周後',
'不好干预' => '不好干預',
'不嫌母丑' => '不嫌母醜',
'不寒而栗' => '不寒而慄',
-'不干事' => '不干事',
-'不干他' => '不干他',
-'不干休' => '不干休',
-'不干你' => '不干你',
-'不干她' => '不干她',
-'不干它' => '不干它',
-'不干我' => '不干我',
-'不干扰' => '不干擾',
-'不干擾' => '不干擾',
-'不干涉' => '不干涉',
-'不干牠' => '不干牠',
-'不干犯' => '不干犯',
-'不干預' => '不干預',
-'不干预' => '不干預',
-'不干' => '不幹',
'不吊' => '不弔',
'不卷' => '不捲',
'不采' => '不採',
'佛罗棱萨' => '佛羅稜薩',
'佛钟' => '佛鐘',
'作品里' => '作品裡',
-'作奸犯科' => '作姦犯科',
'作准' => '作準',
'你夸' => '你誇',
'佣金' => '佣金',
'千钧一发' => '千鈞一髮',
'千只' => '千隻',
'千余' => '千餘',
+'升高后' => '升高後',
'半制品' => '半制品',
'半只可' => '半只可',
'半只够' => '半只夠',
'呼吁' => '呼籲',
'命中注定' => '命中注定',
'和奸' => '和姦',
+'和制汉' => '和製漢',
'咎征' => '咎徵',
'咕咕钟' => '咕咕鐘',
'咪表' => '咪錶',
'墓志' => '墓誌',
'增辟' => '增闢',
'墨子里' => '墨子里',
+'墨斗' => '墨斗',
'墨沈沈' => '墨沈沈',
'墨沈' => '墨瀋',
'垦辟' => '墾闢',
+'压制出' => '壓製出',
+'压制机' => '壓製機',
'壮游' => '壯遊',
'壮面' => '壯麵',
'壹郁' => '壹鬱',
'采薇' => '採薇',
'采薪' => '採薪',
'采药' => '採藥',
+'采血' => '採血',
'采行' => '採行',
'采补' => '採補',
'采访' => '採訪',
'提子干' => '提子乾',
'提心吊胆' => '提心弔膽',
'提摩太后书' => '提摩太後書',
+'提高后' => '提高後',
'插于' => '插於',
'换签' => '換籤',
'换只' => '換隻',
'历始' => '曆始',
'历室' => '曆室',
'历尾' => '曆尾',
-'历数' => 'æ\9b\86æ\95¸',
+'历数书' => 'æ\9b\86æ\95¸æ\9b¸',
'历日' => '曆日',
'历书' => '曆書',
'历本' => '曆本',
'望后石' => '望后石',
'朝乾夕惕' => '朝乾夕惕',
'朝钟' => '朝鐘',
+'朝鲜于' => '朝鮮於',
'朦胧' => '朦朧',
'蒙胧' => '朦朧',
'木偶戏扎' => '木偶戲紮',
'洗发' => '洗髮',
'洛钟东应' => '洛鐘東應',
'洞里' => '洞裡',
+'洞里萨' => '洞里薩',
+'洞里薩' => '洞里薩',
'泄欲' => '洩慾',
'洪范' => '洪範',
'洪谷子' => '洪谷子',
'渠冲' => '渠衝',
'测不准' => '測不準',
'港制' => '港製',
-'游牧民族' => '游牧民族',
'游离' => '游離',
'浑朴' => '渾樸',
'浑个' => '渾箇',
'癸丑' => '癸丑',
'发干' => '發乾',
'发呆' => '發獃',
-'发蒙' => '發矇',
'发签' => '發籤',
'发松' => '發鬆',
'发面' => '發麵',
'谷草' => '穀草',
'谷贵饿农' => '穀貴餓農',
'谷贱伤农' => '穀賤傷農',
-'谷道' => '穀道',
'谷雨' => '穀雨',
'谷类' => '穀類',
'谷食' => '穀食',
'胜肽' => '胜肽',
'胜键' => '胜鍵',
'胡云' => '胡云',
+'胡子婴' => '胡子嬰',
'胡子昂' => '胡子昂',
'胡杰' => '胡杰',
'胡朴安' => '胡樸安',
'体范' => '體範',
'体系' => '體系',
'高几' => '高几',
+'高后' => '高后',
'高干扰' => '高干擾',
'高干预' => '高干預',
'高干' => '高幹',
'魔表' => '魔錶',
'鱼干' => '魚乾',
'鱼松' => '魚鬆',
-'鮮于樞' => '鮮于樞',
-'鲜于枢' => '鮮于樞',
+'鮮于' => '鮮于',
+'鲜于' => '鮮于',
'鲸须' => '鯨鬚',
'鳥栖' => '鳥栖',
'鸟栖市' => '鳥栖市',
'黃杰' => '黃杰',
'黄杰' => '黃杰',
'黄历史' => '黃歷史',
+'黄白术' => '黃白術',
'黃詩杰' => '黃詩杰',
'黄诗杰' => '黃詩杰',
'黄金表' => '黃金表',
'掌上壓' => '伏地挺身',
'伯明翰' => '伯明罕',
'服务器' => '伺服器',
-'字節' => '位元組',
-'字节' => '位元組',
'佛罗伦萨' => '佛羅倫斯',
'操作系统' => '作業系統',
'系数' => '係數',
'戒烟' => '戒菸',
'戒煙' => '戒菸',
'戴克里先' => '戴克里先',
+'打印度' => '打印度',
'抽烟' => '抽菸',
'抽煙' => '抽菸',
'拉普兰' => '拉布蘭',
'搜索引擎' => '搜尋引擎',
'摩根士丹利' => '摩根史坦利',
'台球' => '撞球',
-'攻打印' => '攻打印',
+'攻打' => '攻打',
'数字技术' => '數位技術',
'數碼技術' => '數位技術',
'数字照相机' => '數位照相機',
'撒切尔' => '柴契爾',
'格林納達' => '格瑞那達',
'格林纳达' => '格瑞那達',
+'台式电脑' => '桌上型電腦',
'乒乓' => '桌球',
'乒乓球' => '桌球',
'杆弟' => '桿弟',
'弗吉尼亚' => '維吉尼亞',
'佛得角' => '維德角',
'维特根斯坦' => '維根斯坦',
+'網絡遊戲' => '網路遊戲',
+'网络游戏' => '網路遊戲',
'互联网' => '網際網路',
'互联网络' => '網際網路',
'互聯網' => '網際網路',
'链接' => '連結',
'連結他' => '連結他',
'进制' => '進位',
-'算子' => '運算元',
'达·芬奇' => '達·文西',
'达芬奇' => '達文西',
'溫納圖萬' => '那杜',
'扛著錄' => '扛著錄',
'找不著' => '找不着',
'找得著' => '找得着',
+'承宣布政' => '承宣布政',
'抓著' => '抓着',
'抓著作' => '抓著作',
'抓著名' => '抓著名',
'葛萊美獎' => '格林美獎',
'格鲁吉亚' => '格魯吉亞',
'框里' => '框裏',
+'台式电脑' => '桌上型電腦',
'台球' => '桌球',
'撞球' => '桌球',
'梅鐸' => '梅鐸',
'遇著述' => '遇著述',
'遇著錄' => '遇著錄',
'遍布' => '遍佈',
+'遍佈著' => '遍佈着',
+'遍布著' => '遍佈着',
'過著' => '過着',
'达·芬奇' => '達·文西',
'达芬奇' => '達文西',
'叫著稱' => '叫著称',
'叫著者' => '叫著者',
'叫著述' => '叫著述',
+'桌上型電腦' => '台式电脑',
'撞球' => '台球',
'台帳' => '台账',
'叱吒' => '叱咤',
'遇著稱' => '遇著称',
'遇著者' => '遇著者',
'遇著述' => '遇著述',
+'遍佈著' => '遍布着',
+'遍布著' => '遍布着',
'部份' => '部分',
'配合著' => '配合着',
'配合著名' => '配合著名',
'鋪著稱' => '铺著称',
'鋪著者' => '铺著者',
'鋪著述' => '铺著述',
+'鏈結' => '链接',
'銷帳' => '销账',
'鉲' => '锎',
'鎝' => '锝',
$result = $this->getResult();
$pageSet = $this->getPageSet();
- $titles = $pageSet->getTitles();
// This module operates in two modes:
// 'user': List deleted revs by a certain user
protected function getCurrentUserInfo() {
$user = $this->getUser();
- $result = $this->getResult();
$vals = array();
$vals['id'] = intval( $user->getId() );
$vals['name'] = $user->getName();
"Meno25",
"أحمد المحمودي",
"Khaled",
- "Fatz"
+ "Fatz",
+ "Hiba Alshawi"
]
},
"apihelp-main-param-format": "صيغة الخرج.",
"apihelp-edit-param-watch": "أضف الصفحة إلى لائحة مراقبة المستعمل الحالي",
"apihelp-emailuser-description": "مراسلة المستخدم",
"apihelp-patrol-example-rcid": "ابحث عن تغيير جديد",
+ "apihelp-query+imageinfo-paramvalue-prop-userid": "إضافة هوية المستخدم الذي قام بتحميل كل إصدار ملف.",
"apihelp-query+prefixsearch-param-offset": "عدد النتائج المراد تخطيها."
}
"apihelp-query+logevents-paramvalue-prop-details": "Lists additional details about the log event.",
"apihelp-query+logevents-paramvalue-prop-tags": "Lists tags for the log event.",
"apihelp-query+logevents-param-type": "Filter log entries to only this type.",
- "apihelp-query+logevents-param-action": "Filter log actions to only this action. Overrides <var>$1type</var>. Wildcard actions like <kbd>action/*</kbd> allows to specify any string for the asterisk.",
+ "apihelp-query+logevents-param-action": "Filter log actions to only this action. Overrides <var>$1type</var>. In the list of possible values, values with the asterisk wildcard such as <kbd>action/*</kbd> can have different strings after the slash (/).",
"apihelp-query+logevents-param-start": "The timestamp to start enumerating from.",
"apihelp-query+logevents-param-end": "The timestamp to end enumerating.",
"apihelp-query+logevents-param-user": "Filter entries to those made by the given user.",
"apihelp-query+logevents-paramvalue-prop-details": "הוספת פרטים נוספים על האירוע.",
"apihelp-query+logevents-paramvalue-prop-tags": "רשימת התגים של האירוע.",
"apihelp-query+logevents-param-type": "סינון עיולי יומן רק לסוג הזה.",
- "apihelp-query+logevents-param-action": "ס×\99× ×\95×\9f פע×\95×\9c×\95ת ×\99×\95×\9e×\9f רק ×\9cפע×\95×\9c×\94 ×\94×\96×\90ת. ×\93×\95רס ×\90ת <var>$1type</var>. פע×\95×\9c×\95ת ×¢×\9d ת×\95Ö¾×\9b×\95×\9c×\99×\9d ×\9b×\92×\95×\9f <kbd>action/*</kbd> ×\9e×\90פשר×\95ת ×\9cתת ×\9b×\9c ×\9e×\97ר×\95×\96ת ×\91×\9eק×\95×\9d ×\94×\9b×\95×\9b×\91×\99ת.",
+ "apihelp-query+logevents-param-action": "ס×\99× ×\95×\9f פע×\95×\9c×\95ת ×\99×\95×\9e×\9f רק ×\9cפע×\95×\9c×\94 ×\94×\96×\90ת. ×\91רש×\99×\9eת ×\94ער×\9b×\99×\9d ×\94×\90פשר×\99×\99×\9d, ער×\9b×\99×\9d ×¢×\9d ת×\95Ö¾×\9b×\9c ×\9b×\95×\9b×\91×\99ת ×\9b×\92×\95×\9f <kbd>action/*</kbd> ×\99×\9b×\95×\9c×\99×\9d ×\9c×\94×\99×\95ת ×\9e×\97ר×\95×\96×\95ת ש×\95× ×\95ת ×\90×\97ר×\99 ×\94ק×\95 ×\94× ×\98×\95×\99 (/).",
"apihelp-query+logevents-param-start": "מאיזה חותם־זמן להתחיל למנות.",
"apihelp-query+logevents-param-end": "באיזה חותם זמן להפסיק לרשום.",
"apihelp-query+logevents-param-user": "לסנן את העיולים שעשה המשתמש הנתון.",
--- /dev/null
+{
+ "@metadata": {
+ "authors": [
+ "Rahuldeshmukh101"
+ ]
+ },
+ "apihelp-main-param-action": "कोणति कारवाई करायचि",
+ "apihelp-main-param-curtimestamp": "निकालात आताच्या वेळेचि नोन्द घ्या",
+ "apihelp-block-description": "सदस्यास ब्यान करा",
+ "apihelp-block-param-user": "सदस्याचे नाव, अंक पत्त्ता अथवा अंकपत्यांनचि मालिका प्रतिबांधित करा"
+}
namespace MediaWiki\Logger;
use DateTimeZone;
+use Exception;
use MWDebug;
use MWExceptionHandler;
use Psr\Log\AbstractLogger;
}
// Append stacktrace of exception if available
- if ( $wgLogExceptionBacktrace &&
- isset( $context['exception'] ) &&
- $context['exception'] instanceof Exception
- ) {
- $text .= MWExceptionHandler::getRedactedTraceAsString(
- $context['exception']
- ) . "\n";
+ if ( $wgLogExceptionBacktrace && isset( $context['exception'] ) ) {
+ $e = $context['exception'];
+ $backtrace = false;
+
+ if ( $e instanceof Exception ) {
+ $backtrace = MWExceptionHandler::getRedactedTrace( $e );
+
+ } elseif ( is_array( $e ) && isset( $e['trace'] ) ) {
+ // Exception has already been unpacked as structured data
+ $backtrace = $e['trace'];
+ }
+
+ if ( $backtrace ) {
+ $text .= MWExceptionHandler::prettyPrintTrace( $backtrace ) .
+ "\n";
+ }
}
return self::interpolate( $text, $context );
return $item->format( 'c' );
}
- if ( $item instanceof \Exception ) {
+ if ( $item instanceof Exception ) {
return '[Exception ' . get_class( $item ) . '( ' .
$item->getFile() . ':' . $item->getLine() . ') ' .
$item->getMessage() . ']';
/**
* Formats incoming records into a one-line string.
*
+ * An 'exeception' in the log record's context will be treated specially.
+ * It will be output for an '%exception%' placeholder in the format and
+ * excluded from '%context%' output if the '%exception%' placeholder is
+ * present.
+ *
* Exceptions that are logged with this formatter will optional have their
- * stack traces appended. If that is done,
- * MWExceptionHandler::getRedactedTraceAsString() will be used to redact the
- * trace information.
+ * stack traces appended. If that is done, MWExceptionHandler::redactedTrace()
+ * will be used to redact the trace information.
*
* @since 1.26
* @author Bryan Davis <bd808@wikimedia.org>
}
+ /**
+ * {@inheritdoc}
+ */
+ public function format( array $record ) {
+ // Drop the 'private' flag from the context
+ unset( $record['context']['private'] );
+
+ // Handle exceptions specially: pretty format and remove from context
+ // Will be output for a '%exception%' placeholder in format
+ $prettyException = '';
+ if ( isset( $record['context']['exception'] ) &&
+ strpos( $this->format, '%exception%' ) !== false
+ ) {
+ $e = $record['context']['exception'];
+ unset( $record['context']['exception'] );
+
+ if ( $e instanceof Exception ) {
+ $prettyException = $this->normalizeException( $e );
+ } elseif ( is_array( $e ) ) {
+ $prettyException = $this->normalizeExceptionArray( $e );
+ } else {
+ $prettyException = $this->stringify( $e );
+ }
+ }
+
+ $output = parent::format( $record );
+
+ if ( strpos( $output, '%exception%' ) !== false ) {
+ $output = str_replace( '%exception%', $prettyException, $output );
+ }
+ return $output;
+ }
+
+
/**
* Convert an Exception to a string.
*
* @return string
*/
protected function normalizeException( Exception $e ) {
- $str = '[Exception ' . get_class( $e ) . '] (' .
- $e->getFile() . ':' . $e->getLine() . ') ' .
- $e->getMessage();
+ return $this->normalizeExceptionArray( $this->exceptionAsArray( $e ) );
+ }
+
+
+ /**
+ * Convert an exception to an array of structured data.
+ *
+ * @param Exception $e
+ * @return array
+ */
+ protected function exceptionAsArray( Exception $e ) {
+ $out = array(
+ 'class' => get_class( $e ),
+ 'message' => $e->getMessage(),
+ 'code' => $e->getCode(),
+ 'file' => $e->getFile(),
+ 'line' => $e->getLine(),
+ 'trace' => MWExceptionHandler::redactTrace( $e->getTrace() ),
+ );
$prev = $e->getPrevious();
- while ( $prev ) {
- $str .= ', [Exception ' . get_class( $prev ) . '] (' .
- $prev->getFile() . ':' . $prev->getLine() . ') ' .
- $prev->getMessage();
- $prev = $prev->getPrevious();
+ if ( $prev ) {
+ $out['previous'] = $this->exceptionAsArray( $prev );
}
- if ( $this->includeStacktraces ) {
- $str .= "\n[stacktrace]\n" .
- MWExceptionHandler::getRedactedTraceAsString( $e ) .
- "\n";
+ return $out;
+ }
+
+
+ /**
+ * Convert an array of Exception data to a string.
+ *
+ * @param array $e
+ * @return string
+ */
+ protected function normalizeExceptionArray( array $e ) {
+ $defaults = array(
+ 'class' => 'Unknown',
+ 'file' => 'unknown',
+ 'line' => null,
+ 'message' => 'unknown',
+ 'trace' => array(),
+ );
+ $e = array_merge( $defaults, $e );
+
+ $str = "\n[Exception {$e['class']}] (" .
+ "{$e['file']}:{$e['line']}) {$e['message']}";
+
+ if ( $this->includeStacktraces && $e['trace'] ) {
+ $str .= "\n" .
+ MWExceptionHandler::prettyPrintTrace( $e['trace'], ' ' );
}
+ if ( isset( $e['previous'] ) ) {
+ $prev = $e['previous'];
+ while ( $prev ) {
+ $prev = array_merge( $defaults, $prev );
+ $str .= "\nCaused by: [Exception {$prev['class']}] (" .
+ "{$prev['file']}:{$prev['line']}) {$prev['message']}";
+
+ if ( $this->includeStacktraces && $prev['trace'] ) {
+ $str .= "\n" .
+ MWExceptionHandler::prettyPrintTrace(
+ $prev['trace'], ' '
+ );
+ }
+
+ $prev = isset( $prev['previous'] ) ? $prev['previous'] : null;
+ }
+ }
return $str;
}
}
*/
class MWExceptionHandler {
+ /**
+ * @var string $reservedMemory
+ */
protected static $reservedMemory;
+ /**
+ * @var array $fatalErrorTypes
+ */
protected static $fatalErrorTypes = array(
E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR,
/* HHVM's FATAL_ERROR level */ 16777217,
);
+ /**
+ * @var bool $handledFatalCallback
+ */
+ protected static $handledFatalCallback = false;
/**
* Install handlers with PHP.
*/
public static function installHandler() {
- set_exception_handler( array( 'MWExceptionHandler', 'handleException' ) );
- set_error_handler( array( 'MWExceptionHandler', 'handleError' ) );
+ set_exception_handler( 'MWExceptionHandler::handleException' );
+ set_error_handler( 'MWExceptionHandler::handleError' );
// Reserve 16k of memory so we can report OOM fatals
self::$reservedMemory = str_repeat( ' ', 16384 );
- register_shutdown_function(
- array( 'MWExceptionHandler', 'handleFatalError' )
- );
+ register_shutdown_function( 'MWExceptionHandler::handleFatalError' );
}
/**
}
/**
+ * Handler for set_error_handler() callback notifications.
+ *
+ * Receive a callback from the interpreter for a raised error, create an
+ * ErrorException, and log the exception to the 'error' logging
+ * channel(s). If the raised error is a fatal error type (only under HHVM)
+ * delegate to handleFatalError() instead.
+ *
* @since 1.25
+ *
* @param int $level Error level raised
* @param string $message
* @param string $file
* @param int $line
+ *
+ * @see logError()
*/
- public static function handleError( $level, $message, $file = null, $line = null ) {
- // Map error constant to error name (reverse-engineer PHP error reporting)
- $channel = 'error';
+ public static function handleError(
+ $level, $message, $file = null, $line = null
+ ) {
+ if ( in_array( $level, self::$fatalErrorTypes ) ) {
+ return call_user_func_array(
+ 'MWExceptionHandler::handleFatalError', func_get_args()
+ );
+ }
+
+ // Map error constant to error name (reverse-engineer PHP error
+ // reporting)
switch ( $level ) {
- case E_ERROR:
- case E_CORE_ERROR:
- case E_COMPILE_ERROR:
- case E_USER_ERROR:
case E_RECOVERABLE_ERROR:
- case E_PARSE:
$levelName = 'Error';
- $channel = 'fatal';
break;
case E_WARNING:
case E_CORE_WARNING:
case E_USER_DEPRECATED:
$levelName = 'Deprecated';
break;
- case /* HHVM's FATAL_ERROR */ 16777217:
- $levelName = 'Fatal';
- $channel = 'fatal';
- break;
default:
$levelName = 'Unknown error';
break;
}
$e = new ErrorException( "PHP $levelName: $message", 0, $level, $file, $line );
- self::logError( $e, $channel );
+ self::logError( $e, 'error' );
// This handler is for logging only. Return false will instruct PHP
// to continue regular handling.
/**
- * Look for a fatal error as the cause of the request termination and log
- * as an exception.
+ * Dual purpose callback used as both a set_error_handler() callback and
+ * a registered shutdown function. Receive a callback from the interpreter
+ * for a raised error or system shutdown, check for a fatal error, and log
+ * to the 'fatal' logging channel.
*
* Special handling is included for missing class errors as they may
* indicate that the user needs to install 3rd-party libraries via
* Composer or other means.
*
* @since 1.25
+ *
+ * @param int $level Error level raised
+ * @param string $message Error message
+ * @param string $file File that error was raised in
+ * @param int $line Line number error was raised at
+ * @param array $context Active symbol table point of error
+ * @param array $trace Backtrace at point of error (undocumented HHVM
+ * feature)
+ * @return bool Always returns false
*/
- public static function handleFatalError() {
+ public static function handleFatalError(
+ $level = null, $message = null, $file = null, $line = null,
+ $context = null, $trace = null
+ ) {
+ // Free reserved memory so that we have space to process OOM
+ // errors
self::$reservedMemory = null;
- $lastError = error_get_last();
- if ( $lastError &&
- isset( $lastError['type'] ) &&
- in_array( $lastError['type'], self::$fatalErrorTypes )
- ) {
- $msg = "Fatal Error: {$lastError['message']}";
- // HHVM: Class undefined: foo
- // PHP5: Class 'foo' not found
- if ( preg_match( "/Class (undefined: \w+|'\w+' not found)/",
- $lastError['message']
- ) ) {
- // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
- $msg = <<<TXT
+ if ( $level === null ) {
+ // Called as a shutdown handler, get data from error_get_last()
+ if ( static::$handledFatalCallback ) {
+ // Already called once (probably as an error handler callback
+ // under HHVM) so don't log again.
+ return false;
+ }
+
+ $lastError = error_get_last();
+ if ( $lastError !== null ) {
+ $level = $lastError['type'];
+ $message = $lastError['message'];
+ $file = $lastError['file'];
+ $line = $lastError['line'];
+ } else {
+ $level = 0;
+ $message = '';
+ }
+ }
+
+ if ( !in_array( $level, self::$fatalErrorTypes ) ) {
+ // Only interested in fatal errors, others should have been
+ // handled by MWExceptionHandler::handleError
+ return false;
+ }
+
+ $msg = "[{exception_id}] PHP Fatal Error: {$message}";
+
+ // Look at message to see if this is a class not found failure
+ // HHVM: Class undefined: foo
+ // PHP5: Class 'foo' not found
+ if ( preg_match( "/Class (undefined: \w+|'\w+' not found)/", $msg ) ) {
+ // @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
+ $msg = <<<TXT
{$msg}
MediaWiki or an installed extension requires this class but it is not embedded directly in MediaWiki's git repository and must be installed separately by the end user.
Please see <a href="https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries">mediawiki.org</a> for help on installing the required components.
TXT;
- // @codingStandardsIgnoreEnd
- }
- $e = new ErrorException( $msg, 0, $lastError['type'] );
- self::logError( $e, 'fatal' );
+ // @codingStandardsIgnoreEnd
}
+
+ // We can't just create an exception and log it as it is likely that
+ // the interpreter has unwound the stack already. If that is true the
+ // stacktrace we would get would be functionally empty. If however we
+ // have been called as an error handler callback *and* HHVM is in use
+ // we will have been provided with a useful stacktrace that we can
+ // log.
+ $trace = $trace ?: debug_backtrace();
+ $logger = LoggerFactory::getInstance( 'fatal' );
+ $logger->error( $msg, array(
+ 'exception' => array(
+ 'class' => 'ErrorException',
+ 'message' => "PHP Fatal Error: {$message}",
+ 'code' => $level,
+ 'file' => $file,
+ 'line' => $line,
+ 'trace' => static::redactTrace( $trace ),
+ ),
+ 'exception_id' => wfRandomString( 8 ),
+ ) );
+
+ // Remember call so we don't double process via HHVM's fatal
+ // notifications and the shutdown hook behavior
+ static::$handledFatalCallback = true;
+ return false;
}
/**
*
* @param Exception $e
* @return string
+ * @see prettyPrintTrace()
*/
public static function getRedactedTraceAsString( Exception $e ) {
- return self::prettyPrintRedactedTrace(
- self::getRedactedTrace( $e )
- );
+ return self::prettyPrintTrace( self::getRedactedTrace( $e ) );
}
/**
- * Generate a string representation of a structured stack trace generated
- * by getRedactedTrace().
+ * Generate a string representation of a stacktrace.
*
* @param array $trace
+ * @param string $pad Constant padding to add to each line of trace
* @return string
* @since 1.26
*/
- public static function prettyPrintRedactedTrace( array $trace ) {
+ public static function prettyPrintTrace( array $trace, $pad = '' ) {
$text = '';
foreach ( $trace as $level => $frame ) {
if ( isset( $frame['file'] ) && isset( $frame['line'] ) ) {
- $text .= "#{$level} {$frame['file']}({$frame['line']}): ";
+ $text .= "{$pad}#{$level} {$frame['file']}({$frame['line']}): ";
} else {
- // 'file' and 'line' are unset for calls via call_user_func (bug 55634)
- // This matches behaviour of Exception::getTraceAsString to instead
- // display "[internal function]".
- $text .= "#{$level} [internal function]: ";
+ // 'file' and 'line' are unset for calls via call_user_func
+ // (bug 55634) This matches behaviour of
+ // Exception::getTraceAsString to instead display "[internal
+ // function]".
+ $text .= "{$pad}#{$level} [internal function]: ";
}
if ( isset( $frame['class'] ) ) {
}
$level = $level + 1;
- $text .= "#{$level} {main}";
+ $text .= "{$pad}#{$level} {main}";
return $text;
}
* @return array
*/
public static function getRedactedTrace( Exception $e ) {
+ return static::redactTrace( $e->getTrace() );
+ }
+
+ /**
+ * Redact a stacktrace generated by Exception::getTrace(),
+ * debug_backtrace() or similar means. Replaces each element in each
+ * frame's argument array with the name of its class (if the element is an
+ * object) or its type (if the element is a PHP primitive).
+ *
+ * @since 1.26
+ * @param array $trace Stacktrace
+ * @return array Stacktrace with arugment values converted to data types
+ */
+ public static function redactTrace( array $trace ) {
return array_map( function ( $frame ) {
if ( isset( $frame['args'] ) ) {
$frame['args'] = array_map( function ( $arg ) {
}, $frame['args'] );
}
return $frame;
- }, $e->getTrace() );
+ }, $trace );
}
/**
public static function getLogContext( Exception $e ) {
return array(
'exception' => $e,
+ 'exception_id' => static::getLogId( $e ),
);
}
*/
protected static function logError( ErrorException $e, $channel ) {
// The set_error_handler callback is independent from error_reporting.
- // Filter out unwanted errors manually (e.g. when MediaWiki\suppressWarnings is active).
+ // Filter out unwanted errors manually (e.g. when
+ // MediaWiki\suppressWarnings is active).
$suppressed = ( error_reporting() & $e->getSeverity() ) === 0;
if ( !$suppressed ) {
$logger = LoggerFactory::getInstance( $channel );
"Nemo bis",
"Ricordisamoa",
"Fpugliajno",
- "The Polish"
+ "The Polish",
+ "Sannita"
]
},
- "config-desc": "Il programma di installazione per MediaWiki",
+ "config-desc": "Programma di installazione per MediaWiki",
"config-title": "Installazione di MediaWiki $1",
"config-information": "Informazioni",
"config-localsettings-upgrade": "È stato rilevato un file <code>LocalSettings.php</code>.\nPer aggiornare questa installazione, si prega di inserire il valore di <code>$wgUpgradeKey</code> nella casella qui sotto.\nLo potete trovare in <code>LocalSettings.php</code>.",
"Marcos dias de oliveira",
"Fasouzafreitas",
"TheEduGobi",
- "Dianakc"
+ "Dianakc",
+ "Walesson"
]
},
"config-desc": "O instalador do MediaWiki",
"config-unicode-using-intl": "Usando a [http://pecl.php.net/intl extensão intl PECL] para a normalização Unicode.",
"config-unicode-pure-php-warning": "<strong>Aviso</strong>: A [http://pecl.php.net/intl extensão intl PECL] não está disponível para efetuar a normalização Unicode, abortando e passando para a lenta implementação de PHP puro.\nSe o seu site tem um alto volume de tráfego, informe-se sobre a [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations normalização Unicode].",
"config-unicode-update-warning": "<strong>Aviso:</strong> A versão instalada do wrapper de normalização Unicode usa uma versão mais antiga da biblioteca do [//www.site.icu-project.org/projeto ICU].\nVocê deve [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations atualizar] se você tem quaisquer preocupações com o uso do Unicode.",
- "config-no-db": "Não foi possível encontrar um driver de banco de dados adequado! É necessário instalar um driver de banco de dados para o PHP.\nSão suportados os seguintes tipos de bancos de dados: $1.\n\nSe você mesmo tiver compilado o PHP, reconfigure-o com um cliente de banco de dados ativado usando, por exemplo <code>./configure --with-mysqli</code>.\nSe você instalou o PHP a partir de um pacote do Debian ou do Ubuntu, então será também necessário instalar, por exemplo, o pacote <code>php5-mysql</code>.",
+ "config-no-db": "Não foi possível localizar um driver de banco de dados apropriado! Você precisa instalar um driver de banco de dados para PHP. O banco de dados seguinte {{PLURAL: $ 2 | | tipo é tipos são}} suportado: $ 1. Se você compilou o PHP mesmo, reconfigurá-lo com um cliente de banco de dados ativada, por exemplo, usando <code> ./ configure --with-mysqli </ code>. Se você instalou o PHP a partir de um pacote Debian ou Ubuntu, então você também precisa instalar, por exemplo, o <code> php5-mysql </ code> pacote.",
"config-outdated-sqlite": "<strong>Aviso:</strong> você tem o SQLite versão $1, que é menor do que a versão mínima necessária $2. O SQLite não estará disponível.",
"config-no-fts3": "<strong>Aviso</strong> O SQLite foi compilado sem o [//sqlite.org/fts3.html módulo FTS3], as funcionalidades de pesquisa não estarão disponíveis nesta instalação.",
"config-register-globals-error": "<strong>Erro: a opção <code>[http://php.net/register_globals register_globals]</code> do PHP está ativada.\nA mesma deve ser desativada para continuar a instalação.</strong>\nVeja [https://www.mediawiki.org/wiki/register_globals https://www.mediawiki.org/wiki/register_globals] para obter ajuda com isto.",
"config-magic-quotes-sybase": "<strong>Erro fatal: A opção [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase] está ativada!</strong>\nEsta opção corrompe os dados de entrada de forma imprevisível.\nVocê não pode instalar ou utilizar o MediaWiki a menos que esta opção seja desativada.",
"config-mbstring": "<strong>Erro fatal: A opção [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload] está ativada!</strong>\nEsta opção causa erros e pode corromper os dados de forma imprevisível.\nVocê não pode instalar ou utilizar o MediaWiki a menos que esta opção seja desativada.",
"config-safe-mode": "<strong>Aviso:</strong> O [http://www.php.net/features.safe-mode safe mode] do PHP está ativado.\nEste modo pode causar problemas, especialmente no upload de arquivos e no suporte a <code>math</code>.",
- "config-xml-bad": "O módulo XML do PHP está ausente.\nO MediaWiki necessita de funções deste módulo e não funcionará com esta configuração.\nSe está utilizando o Mandrake, instale o pacote php-xml.",
+ "config-xml-bad": "Módulo XML do PHP está faltando. MediaWiki requer funções deste módulo e não vai funcionar nesta configuração. Pode ser necessário instalar o pacote RPM php-xml.",
"config-pcre-old": "<strong>Erro fatal:</strong> É necessário o PCRE $1 ou versão posterior.\nO binário do seu PHP foi vinculado com o PCRE $2.\n[https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE Mais informações].",
"config-pcre-no-utf8": "<strong>Erro fatal:</strong> O módulo PCRE do PHP parece ser compilado sem suporte a PCRE_UTF8.\nO MediaWiki requer suporte a UTF-8 para funcionar corretamente.",
"config-memory-raised": "A configuração <code>memory_limit</code> do PHP era $1; foi aumentada para $2.",
"config-db-install-account": "Conta de usuário para instalação",
"config-db-username": "Nome de usuário do banco de dados:",
"config-db-password": "Senha do banco de dados:",
- "config-db-password-empty": "Por favor digite uma senha para o novo usuário do banco de dados: $1. Embora seja possível criar usuários sem senha, isto não é seguro.",
- "config-db-username-empty": "É necessário entrar um valor para \"{{int:config-db-username}}\".",
"config-db-install-username": "Digite o nome de usuário que será utilizado para conectar com o banco de dados durante o processo de instalação.\nEste não é a conta de usuário do MediaWiki; este é o nome de usuário para sua base de dados.",
"config-db-install-password": "Digite a senha que será utilizada para conectar com o banco de dados durante o processo de instalação.\nEsta não é a senha de usuário da conta do MediaWiki; esta será a senha para seu banco de dados.",
"config-db-install-help": "Digite o nome de usuário e a senha que serão utilizados para conectar com o banco de dados durante o processo de instalação.",
* Let users reset tokens like the watchlist token.
*
* @ingroup SpecialPage
+ * @deprecated 1.26
*/
class SpecialResetTokens extends FormSpecialPage {
private $tokensList;
"yourpassword": "الباسوورد:",
"userlogin-yourpassword": "الباسورد:",
"yourpasswordagain": "اكتب الباسورد تاني:",
+ "createacct-yourpasswordagain": "أكد كلمه السر",
"remembermypassword": " (لمدة $1 {{PLURAL:$1|يوم|يوم}})خليك فاكر دخولى على الكمبيوتر دا",
"yourdomainname": "النطاق بتاعك:",
"externaldberror": "يا إما فى حاجة غلط فى الدخول على قاعدة البيانات الخارجية أو انت مش مسموح لك تعمل تحديث لحسابك الخارجي.",
"file-nohires": "مافيش ريزوليوشن اعلى متوفر.",
"svg-long-desc": "ملف SVG، اساسا $1 × $2 بكسل، حجم الملف: $3",
"show-big-image": "الصوره الاصليه",
+ "show-big-image-other": "{{PLURAL:$2||البعد التانى|البعدان التانيين|الأبعاد التانيه}}: $1.",
"show-big-image-size": "$1 × $2 بكسل",
"file-info-gif-looped": "ملفوف",
"file-info-gif-frames": "$1 {{PLURAL:$1|برواز|براويز}}",
"logentry-delete-delete": "{{GENDER:$2|مسح|مسحت}} $1 صفحة $3",
"revdelete-restricted": "طبق التعليمات على السيسوبات",
"revdelete-unrestricted": "شيل الضوابط من على السيسوبات",
+ "logentry-newusers-create": "تم فتح حساب {{GENDER:$2|اليوزر|اليوزره}} $1",
"logentry-upload-upload": " {{GENDER:$2|رفع|اترفعت}} $1 $3",
"rightsnone": "(فاضى)",
"revdelete-summary": "ملخص التعديل",
"tag-filter-submit": "Фільтар",
"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|1=Тэг|Тэгі}}]]: $2)",
"tags-title": "Меткі",
- "tags-intro": "На гэтай старонцы знаходзіцца сьпіс тэгаў, якімі праграмнае забесьпячэньне можа пазначыць рэдагаваньне, і іх значэньне.",
+ "tags-intro": "На гэтай старонцы знаходзіцца сьпіс метак, якімі праграмнае забесьпячэньне можа пазначыць рэдагаваньне, і іх значэньне.",
"tags-tag": "Назва тэга",
"tags-display-header": "Новыя запісы ў сьпісе зьменаў",
"tags-description-header": "Поўнае апісаньне значэньня",
"tags-apply-not-allowed-one": "Метка «$1» ня можа быць прызначаная ўручную.",
"tags-apply-not-allowed-multi": "{{PLURAL:$2|Наступную метку|Наступныя меткі}} нельга дадаваць уручную: $1",
"tags-update-no-permission": "Вы ня маеце права на дадаваньне ці выдаленьне метак зьменаў для асобных вэрсіяў ці запісаў журналаў.",
+ "tags-update-add-not-allowed-one": "Метка «$1» ня можа быць дададзеная ўручную.",
"tags-edit-title": "Рэдагаваньне метак",
"tags-edit-manage-link": "Кіраваньне меткамі",
"tags-edit-revision-selected": "{{PLURAL:$1|1=Абраная вэрсія|Абраныя вэрсіі}} [[:$2]]:",
"loginreqpagetext": "अरु पाना हेद्द तमले $1 गद्दु पडन्छ ।",
"accmailtitle": "पासवर्ड पठाइयो",
"newarticle": "(नयाँ)",
- "newarticletext": "तमलà¥\87 à¤\90लसमà¥\8dम नà¤à¤¯à¤¾à¤\95ा पानाà¤\95à¥\8b लिà¤\82à¤\99à¥\8dà¤\95 पहिलà¥\8dयाà¤\89नà¥\81 à¤à¤¯à¤¾à¤\95à¥\8b à¤\9b।\nयà¥\8b पानà¥\8b बनà¥\8cनाà¤\96à¥\80 तलà¥\8dतिरà¤\95à¥\8b à¤\95à¥\8bषà¥\8dठमा à¤\9fाà¤\87प à¤\97रिदिय ।(à¤\94र à¤\9cाणà¥\8dणाà¤\96à¥\80लà¥\87à¤\96ा [$1 help page] हà¥\87रिदिय )।\nताखाइ सुधिसार आइपुग्या हौ भण्या, ब्राउजरको '''back''' बटन थिचिहाल ।",
+ "newarticletext": "तमलà¥\87 à¤\85हिलसमà¥\8dम नà¤à¤¯à¤¾à¤\95ा पानाà¤\95à¥\8b लिà¤\82à¤\99à¥\8dà¤\95 पहिलà¥\8dयायाà¤\95ा à¤\9bà¥\8c ।\nयà¥\8b पानà¥\8b बनà¥\8cनाà¤\96à¥\80 तलà¥\8dतिरà¤\95à¥\8b à¤\95à¥\8bषà¥\8dठमà¥\80 à¤\9fाà¤\87प à¤\97रि । (à¤\94र à¤\9cाणà¥\8dणाà¤\96à¥\80लà¥\87à¤\96ा [$1 help page] हà¥\87र )।\nताखाइ सुधिसार आइपुग्या हौ भण्या, ब्राउजरको '''back''' बटन थिचिहाल ।",
"anontalkpagetext": "----''यो कुरडी पानो अज्ञात प्रयोगकर्ताको हो जनले अहिलसम्म खाता बनायाकै छैन, अथवा जनले यै पानाको उपयोग गर्दैन।\nयस कारण हामीले उनलाई उनरो आइ पी (IP) ठेगानाले चिन्न सकन्छौ। \nयस्तो आइ पी (IP) ठेगाना धेरै प्रयोगकर्तानको साझा हुनसकन्छ ।\nयदि तमी अज्ञात प्रयोगकर्ता हौ र तमलाई अचाहिँदो टिप्पणी भयाको अनुभव गद्दा छौ भण्या भविष्यमी अन्य अज्ञात प्रयोगकर्तासँगको भ्रमबाट बाँच्न कृपया [[Special:UserLogin/signup|खाता खोल]] अथवा [[Special:UserLogin|प्रवेश गर]] ''",
"noarticletext": "यै लेखमी अहिल क्यै पन पाठ नाइथी ।\nतमले और पृष्ठमी\n[[Special:Search/{{PAGENAME}}|यस पृष्ठको शीर्षककी लेखा खोज]] गद्द सकन्छौ ।\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} पाना सम्बन्धित ढड्डामी खोज],\nवा [{{fullurl:{{FULLPAGENAME}}|action=edit}} यै पानालाई सम्पादन गद्या]</span>.",
"noarticletext-nopermission": "यै लेखमी अहिल केइ पन पाठ नाइथी ।\nतमले और पानामी\n[[Special:Search/{{PAGENAME}}|यै पानाको शीर्षककी लेखा खोज]] गद्द सकन्छौ ।\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} पाना सम्बन्धित ढड्डामी खोज्न],\nवा [{{fullurl:{{FULLPAGENAME}}|action=edit}} यै पानालाई सम्पादन गद्द] सकन्छौ</span>.",
"timezoneregion-australia": "अष्ट्रेलिया",
"timezoneregion-indian": "हिन्द महासागर",
"prefs-files": "फाइलहरू",
+ "prefs-help-signature": "कुरडी पानाका टिप्पणीहरू \"<nowiki>~~~~</nowiki>\" द्वारा दस्तखत गरिनुपडन्छ ,त्यो पछि तमरो दस्तखत र समयरेखामी रुपान्तरित हुनेछ ।",
"badsiglength": "तमरो दस्तखत मैथै लामो छ।\nयो $1 {{PLURAL:$1|अक्षर|अक्षरहरू}} भन्दा लामो हुनु हुँदैन ।",
"prefs-help-realname": "वास्तविक नाम ऐच्छिक हो ।\nतमीले खुलायौ भण्या तमरो कामको श्रेय दिनको लेखा यैको प्रयोग गरिन्या छ ।",
"prefs-help-prefershttps": "यो रोजाई तमरो अर्को लग इन बठे लागु हुन्याछ ।",
"tooltip-t-permalink": "पृष्ठको यो पुनरावलोकनकि लेखा स्थाई लिङ्क",
"tooltip-ca-nstab-main": "सामाग्री पानो हेरिदिय",
"tooltip-ca-nstab-user": "प्रयोगकर्ता पानो हेरिदिय",
- "tooltip-ca-nstab-special": "यो खास पानो हो , तमलाईँ आफै सम्पादन गद्द सकन्छौ",
+ "tooltip-ca-nstab-special": "यो खास पानो हो ,तमलाईँ आफै सम्पादन गद्द सकन्छौ",
"tooltip-ca-nstab-project": "आयोजना पानो हेरिदिय",
"tooltip-ca-nstab-image": "चित्र पानो हेर",
"tooltip-ca-nstab-template": "टेम्प्लेट(नमूना) हेरिदिय",
"booksources-text": "A continuación aparece unha lista de ligazóns cara a outros sitios web que venden libros novos e usados, neles tamén pode obter máis información sobre as obras que está a buscar:",
"booksources-invalid-isbn": "O ISBN inserido parece non ser válido; comprobe que non haxa erros ao copialo da fonte orixinal.",
"specialloguserlabel": "Executante:",
- "speciallogtitlelabel": "Obxectivo (título ou usuario):",
+ "speciallogtitlelabel": "Obxectivo (título ou {{ns:user}}:nome de usuario):",
"log": "Rexistros",
"all-logs-page": "Todos os rexistros públicos",
"alllogstext": "Vista combinada de todos os rexistros dipoñibles en {{SITENAME}}.\nPode precisar máis a vista seleccionando o tipo de rexistro, o nome do usuario ou o título da páxina afectada.",
"tooltip-ca-nstab-main": "Ver o contido da páxina",
"tooltip-ca-nstab-user": "Ver a páxina {{GENDER:{{BASEPAGENAME}}|do usuario|da usuaria}}",
"tooltip-ca-nstab-media": "Ver a páxina con contido multimedia",
- "tooltip-ca-nstab-special": "Esta é unha páxina especial, polo que non a pode editar",
+ "tooltip-ca-nstab-special": "Esta é unha páxina especial, e non pode editarse",
"tooltip-ca-nstab-project": "Ver a páxina do proxecto",
"tooltip-ca-nstab-image": "Ver a páxina do ficheiro",
"tooltip-ca-nstab-mediawiki": "Ver a mensaxe do sistema",
"Ahdan",
"Macofe",
"Totosunarto",
- "Mirws"
+ "Mirws",
+ "Ilham"
]
},
"tog-underline": "Garis bawahi pranala:",
"booksources-text": "Di bawah ini adalah daftar pranala ke situs lain yang menjual buku baru dan bekas, dan mungkin juga mempunyai informasi lebih lanjut mengenai buku yang sedang Anda cari:",
"booksources-invalid-isbn": "ISBN yang diberikan tampaknya tidak valid; periksa kesalahan penyalinan dari sumber asli.",
"specialloguserlabel": "Pengguna:",
- "speciallogtitlelabel": "Target (judul atau pengguna):",
+ "speciallogtitlelabel": "Target (judul atau{{ns:pengguna}}:nama pengguna untuk pengguna)",
"log": "Catatan (Log)",
"all-logs-page": "Semua log publik",
"alllogstext": "Gabungan tampilan semua log yang tersedia di {{SITENAME}}.\nAnda dapat melakukan pembatasan tampilan dengan memilih jenis log, nama pengguna (sensitif kapitalisasi), atau judul halaman (juga sensitif kapitalisasi).",
"tooltip-ca-nstab-main": "Lihat halaman isi",
"tooltip-ca-nstab-user": "Lihat halaman pengguna",
"tooltip-ca-nstab-media": "Lihat halaman media",
- "tooltip-ca-nstab-special": "Ini adalah halaman istimewa yang tidak dapat disunting.",
+ "tooltip-ca-nstab-special": "Ini adalah halaman istimewa, dan tidak dapat disunting.",
"tooltip-ca-nstab-project": "Lihat halaman proyek",
"tooltip-ca-nstab-image": "Lihat halaman berkas",
"tooltip-ca-nstab-mediawiki": "Lihat pesan sistem",
"tooltip-ca-nstab-main": "Vedi la voce",
"tooltip-ca-nstab-user": "Vedi la pagina utente",
"tooltip-ca-nstab-media": "Vedi la pagina del file multimediale",
- "tooltip-ca-nstab-special": "Questa è una pagina speciale, non può essere modificata",
+ "tooltip-ca-nstab-special": "Questa è una pagina speciale e non può essere modificata",
"tooltip-ca-nstab-project": "Vedi la pagina di servizio",
"tooltip-ca-nstab-image": "Vedi la pagina del file",
"tooltip-ca-nstab-mediawiki": "Vedi il messaggio di sistema",
"pool-timeout": "ताळ्यासाठी वाट पाहण्याची वेळ संपली",
"pool-queuefull": "सर्व्हरवर ताण आहे.",
"pool-errorunknown": "अपरिचित त्रुटी",
+ "poolcounter-usage-error": "वापर करतांना त्रूटी $1",
"aboutsite": "{{SITENAME}}बद्दल",
"aboutpage": "Project:माहितीपृष्ठ",
"copyright": "येथील मजकूर $1च्या अंतर्गत उपलब्ध आहे जोपर्यंत इतर नोंदी केलेल्या नाहीत.",
"hidetoc": "लपवा",
"collapsible-collapse": "निपात करा",
"collapsible-expand": "विस्तार",
+ "confirmable-confirm": " {{GENDER:$1|तिम्हाला}} खात्रिआहे का ?",
"confirmable-yes": "होय",
"confirmable-no": "नाही",
"thisisdeleted": "$1चे अवलोकन किंवा पुनर्स्थापन करायचे ?",
"filerenameerror": "\"$1\" संचिकेचे \"$2\" असे नामांतर करता आले नाही.",
"filedeleteerror": "\"$1\" संचिका वगळता आली नाही.",
"directorycreateerror": "\"$1\" कार्यधारीका (डिरेक्टरी) तयार केली जाऊ शकली नाही.",
+ "directoryreadonlyerror": " \"$1\" हा कोश फक्त वाचण्या साठि आहे.",
+ "directorynotreadableerror": " \"$1\" ह्या कोशाला वाचता आणी लिहिता येते.",
"filenotfound": "\"$1\" ही संचिका सापडत नाही.",
"unexpected": "अनपेक्षित मूल्य: \"$1\"=\"$2\"",
"formerror": "त्रुटी: आवेदन सादर करता आले नाही.",
"no-null-revision": "\"$1\" या पानाची नविन रिक्त आवृत्ती निर्मिता आली नाही.",
"badtitle": "खराब शीर्षक",
"badtitletext": "आपण विनंती केलेले पानाचे शीर्षक अयोग्य, रिकामे अथवा चुकिने जोडलेले आंतर-भाषिय किंवा आंतर-विकि शीर्षक आहे. त्यात,शीर्षकास अयोग्य अशी एक किंवा अधिक चिन्हे आहेत.",
+ "title-invalid-empty": "आपण विनंति केलेले पान हे रिकामे आहे किंवा त्यास केवळ नामविश्वाचे नाव दिलेले आहे.",
+ "title-invalid-utf8": "आपण विनंति केलेले पानाच्या नवात अवैध यु टि ऐफ अक्षरे आहेत",
+ "title-invalid-interwiki": "आपण विनंति केलेले पाना मध्ये आन्तर विकि दुवे आहेत जे षिर्शकात वपरण्यास मनाइ आहे",
+ "title-invalid-talk-namespace": "आपण विनंति केलेले पान उपलब्ध नसलेल्या चर्च्या पानास संबोधित करते",
"perfcached": "खालील माहिती सयीमधील (कॅशे) असल्यामुळे ती अद्ययावत् नाही.जास्तीतजास्त {{PLURAL:$1|एक प्रतिफळ |$1 प्रतिफळे }} सयीमध्ये असतात.",
"perfcachedts": "खालील माहिती सयीमधील (कॅशे) आहे व ती $1 पर्यंत अद्ययावत् आहे. जास्तीतजास्त {{PLURAL:$4|एक प्रतिफळ |$4 प्रतिफळे}} सयीमध्ये असतात.",
"querypage-no-updates": "सध्या या पानाकरिता नवी अद्यतने अनुपलब्ध केली आहेत.आत्ताच येथील विदा तरोताजा होणार नाही.",
"toolbox": "Strumiente",
"userpage": "Vere a paggena utente",
"projectpage": "Vere a paggena 'e servizio",
- "imagepage": "Vere a paggena ddo file",
+ "imagepage": "Vere a paggena d' 'o file",
"mediawikipage": "Vere 'a mmasciata",
"templatepage": "Vere 'o template",
"viewhelppage": "Vere 'a paggena 'e ajùto",
"bold_tip": "Grassetto",
"italic_sample": "Corsivo",
"italic_tip": "Corsivo",
- "link_sample": "Titulo ddo cullegamente",
+ "link_sample": "Titulo d' 'o cullegamento",
"link_tip": "Jonte nterne",
- "extlink_sample": "http://www.example.com titulo ddo cullegamente",
+ "extlink_sample": "http://www.example.com titulo d' 'o cullegamento",
"extlink_tip": "Link esterno (arricuordate 'o prefisso http:// )",
"headline_sample": "Testate",
"headline_tip": "Testate 'e 2° livello",
"whatlinkshere-hideredirs": "$1 redirects",
"whatlinkshere-hidetrans": "$1 'nclusione",
"whatlinkshere-hidelinks": "$1 jonte",
- "whatlinkshere-hideimages": "$1 links ddo file",
+ "whatlinkshere-hideimages": "$1 links d' 'o file",
"whatlinkshere-filters": "Filtre",
"autoblockid": "Autoblocco #$1",
"block": "Blocca l'utente",
"tooltip-n-mainpage-description": "Visita a paggena prencepale",
"tooltip-n-portal": "Descrizione d' 'o prugietto, che po' ffa, addò truvà 'e ccose",
"tooltip-n-currentevents": "Ascìa 'e nfurmaziune ncopp' 'e fatte succiesse mò mò",
- "tooltip-n-recentchanges": "Ennece dde urdeme cagnamiénte ddo sito",
+ "tooltip-n-recentchanges": "Ennece dde urdeme cagnamiénte d' 'o sito",
"tooltip-n-randompage": "Na paggena qualsiase",
"tooltip-n-help": "Paggena 'e ajùto",
"tooltip-t-whatlinkshere": "'Na lista 'e tutte e paggene ca song cullegate a chista",
"actionthrottledtext": "For å beskytte mot spam, kan du ikke utføre denne handlingen for mange ganger i løpet av et kort tidssrom, og du har overskredet denne grensen. Prøv igjen om noen minutter.",
"protectedpagetext": "Denne siden har blitt låst for endringer.",
"viewsourcetext": "Du kan se og kopiere kilden til denne siden:",
- "viewyourtext": "Du kan se og kopiere kilden til '''dine endringer''' på denne siden:",
+ "viewyourtext": "Du kan se og kopiere kilden til <strong>dine endringer</strong> på denne siden.",
"protectedinterface": "Denne siden kontrollerer brukergrensesnittekst for programvaren, og er låst for å hindre misbruk.",
"editinginterface": "<strong>Advarsel:</strong> Du redigerer en side som brukes til å kontrollere grensesnittekst for programvaren.\nEndringer av denne siden vil påvirke hvordan grensesnittet vil se ut for andre brukere på denne wikien.",
"translateinterface": "For å legge til eller endre oversettelser for alle wikier bruk [//translatewiki.net/ translatewiki.net], MediaWikis lokaliseringsprosjekt.",
- "cascadeprotected": "Denne siden er låst for redigering fordi den inkluderes på følgende sider som har dypbeskyttelse slått på:<!--{{PLURAL:$1}}-->\n$2",
+ "cascadeprotected": "Denne siden er låst for redigering fordi den inkluderes på følgende {{PLURAL:$1|side som har|sider som har}} som har dypbeskyttelse slått på:\n$2",
"namespaceprotected": "Du har ikke tillatelse til å redigere sider i navnerommet '''$1'''.",
"customcssprotected": "Du har ikke tillatelse til å redigere denne CSS-siden fordi den inneholder en annen brukers personlige innstillinger.",
"customjsprotected": "Du har ikke tillatelse til å redigere denne JavaScript-siden fordi den inneholder en annen brukers personlige innstillinger.",
"createacct-benefit-body2": "{{PLURAL:$1|side|sider}}",
"createacct-benefit-body3": "{{PLURAL:$1|aktiv bidragsyter|aktive bidragsytere}}",
"badretype": "Passordene samsvarte ikke.",
+ "usernameinprogress": "Opprettelsesprosessen for dette brukernavnet er igang.\nVennligst vent.",
"userexists": "Brukernavnet er allerede i bruk.\nVelg et annet brukernavn.",
"loginerror": "Innloggingsfeil",
"createacct-error": "Feil med kontoppretting",
"readonlywarning": "'''ADVARSEL: Databasen er låst på grunn av vedlikehold,\nså du kan ikke lagre dine endringer akkurat nå. Det kan være en god idé å\nkopiere teksten din til en tekstfil, så du kan lagre den til senere.'''\n\nSystemadministratoren som låste databasen oppga følgende årsak: $1",
"protectedpagewarning": "'''Advarsel: Denne siden har blitt låst slik at kun brukere med administratorrettigheter kan redigere den.'''\nDet siste loggelementet er oppgitt under som referanse:",
"semiprotectedpagewarning": "'''Merk:''' Denne siden har blitt låst slik at kun registrerte brukere kan endre den.\nDet siste loggelementet er oppgitt under som referanse:",
- "cascadeprotectedwarning": "'''Advarsel:''' Denne siden har blitt låst slik at kun brukere med administratorrettigheter kan redigere den, fordi den inkluderes på følgende dypbeskyttede {{PLURAL:$1|sider}}:",
+ "cascadeprotectedwarning": "<strong>Advarsel:</strong> Denne siden har blitt låst slik at kun brukere med administratorrettigheter kan redigere den, fordi den inkluderes på følgende dypbeskyttede {{PLURAL:$1|side|sider}}:",
"titleprotectedwarning": "'''Advarsel: Denne siden har blitt låst slik at [[Special:ListGroupRights|bestemte rettigheter]] kreves for å opprette den.'''\nTil orientering vises den siste loggoppføringen under:",
"templatesused": "{{PLURAL:$1|Mal|Maler}} som brukes på denne siden:",
"templatesusedpreview": "{{PLURAL:$1|Mal|Maler}} brukt i denne forhåndsvisningen:",
"search-category": "(kategori $1)",
"search-file-match": "(matcher filinnhold)",
"search-suggest": "Mente du: $1",
+ "search-rewritten": "Viser resultatet for $1. Søk i stedet for $2.",
"search-interwiki-caption": "Søsterprosjekter",
"search-interwiki-default": "Resultater fra $1:",
"search-interwiki-more": "(mer)",
"searchrelated": "relatert",
"searchall": "alle",
"showingresults": "Nedenfor vises opptil {{PLURAL:$1|'''ett''' resultat|'''$1''' resultater}} fra og med nummer <b>$2</b>.",
- "showingresultsinrange": "Nedenfor vises opptil {{PLURAL:$1|<strong>1</strong> resultat|<strong>$1</strong> resulter}} fra og med nummer <strong>$2</strong> til og med nummer <strong>$3</strong>.",
+ "showingresultsinrange": "Nedenfor vises opptil {{PLURAL:$1|<strong>1</strong> resultat|<strong>$1</strong> resultater}} fra og med nummer <strong>$2</strong> til og med nummer <strong>$3</strong>.",
"search-showingresults": "Resultat <strong>{{PLURAL:$4|$1|$1–$2}}</strong> av <strong>$3</strong>",
"search-nonefound": "Ingen resultater passet til søket.",
"powersearch-legend": "Avansert søk",
"rows": "Rader:",
"columns": "Kolonner",
"searchresultshead": "Søk",
- "stub-threshold": "Grense for <span class=\"mw-stub-example\">stubblenkeformatering</span>:",
+ "stub-threshold": "Grense for stubblenkeformatering ($1):",
+ "stub-threshold-sample-link": "eksempel",
"stub-threshold-disabled": "Deaktivert",
"recentchangesdays": "Antall dager som skal vises i siste endringer:",
"recentchangesdays-max": "Maks $1 {{PLURAL:$1|dag|dager}}",
"yourvariant": "लेखको भाषा संस्करण:",
"prefs-help-variant": "तपाईंको मनपरेको संस्करण वा हिज्जे यस विकि भित्र सामग्री पृष्ठहरू प्रदर्शित गर्नका निमित्त।",
"yournick": "नयाँ हस्ताक्षर:",
- "prefs-help-signature": "वारà¥\8dतालाप पà¥\83षà¥\8dठà¤\95ा à¤\9fिपà¥\8dपणà¥\80हरà¥\81 \"<nowiki>~~~~</nowiki>\" द्वारा दस्तखत गरिनुपर्छ ,जुन पछि तपाईँको दस्तखत र समयरेखामा रुपान्तरित हुनेछ ।",
+ "prefs-help-signature": "वारà¥\8dतालाप पà¥\83षà¥\8dठà¤\95ा à¤\9fिपà¥\8dपणà¥\80हरà¥\82 \"<nowiki>~~~~</nowiki>\" द्वारा दस्तखत गरिनुपर्छ ,जुन पछि तपाईँको दस्तखत र समयरेखामा रुपान्तरित हुनेछ ।",
"badsig": "अमान्य कच्चा दस्तखत।\nHTML ट्यागहरु जाँच्नुहोस् ।",
"badsiglength": "तपाईंको दस्तखत धेरै लामो छ।\nयो $1 {{PLURAL:$1|अक्षर|अक्षरहरू}} भन्दा लामो हुनु हुँदैन ।",
"yourgender": "कसरी वताउन चाहनुहुन्छ ?",
"Macofe",
"TheEduGobi",
"Araceletorres",
- "L"
+ "L",
+ "Walesson"
]
},
"tog-underline": "Sublinhar links:",
"protectedinterface": "Esta página fornece texto de interface ao software deste wiki, se encontrando protegida para prevenir abusos.\n\nPara adicionar ou alterar traduções em todos os wikis, utilize o [//translatewiki.net/ translatewiki.net], projeto de traduções do MediaWiki.",
"editinginterface": "'''Aviso:''' Você se encontra prestes a editar uma página que é utilizada para fornecer texto de interface ao software.\nAlterações nesta página irão afetar a aparência da interface de usuário para outros usuários deste wiki.\nPara alterar ou adicionar traduções, considere utilizar a [//translatewiki.net/wiki/Main_Page?setlang=pt-br translatewiki.net], um projeto destinado para a tradução do MediaWiki.",
"translateinterface": "Para adicionar ou modificar traduções para todas as wikis, por favor use [//translatewiki.net/ translatewiki.net], o projeto de localização do MediaWiki.",
- "cascadeprotected": "Esta página foi protegida contra edições por estar incluída {{PLURAL:$1|na página listada|nas páginas listadas}} a seguir, ({{PLURAL:$1|página essa que está protegida|páginas essas que estão protegidas}} com a opção de \"proteção progressiva\" ativada):\n$2",
+ "cascadeprotected": "Esta página foi protegida contra edições porque é transcluída na seguinte {{PLURAL: $1, | página, que é | páginas, que estão protegidas}} com a \"cascata\" opção ativada: $2",
"namespaceprotected": "Você não possui permissão para editar páginas no espaço nominal '''$1'''.",
"customcssprotected": "Você não tem permissão para editar esta página CSS, porque ele contém configurações pessoais de outro usuário.",
"customjsprotected": "Você não tem permissão para editar esta página de JavaScript, porque ele contém configurações pessoais de outro usuário.",
"createacct-benefit-body2": "{{PLURAL:$1|página|páginas}}",
"createacct-benefit-body3": "{{PLURAL:$1|contribuidor|contribuidores}} recentes",
"badretype": "As senhas que você digitou não são iguais.",
+ "usernameinprogress": "Uma criação da conta para este nome de usuário já está em andamento. Por favor, aguarde.",
"userexists": "O nome de usuário fornecido já está em uso.\nEscolha um nome diferente.",
"loginerror": "Erro de autenticação",
"createacct-error": "Erro ao criar a conta",
"yourdiff": "Diferenças",
"copyrightwarning": "Por favor, note que todas as suas contribuições em {{SITENAME}} são consideradas como lançadas nos termos da licença $2 (veja $1 para detalhes). Se não deseja que o seu texto seja inexoravelmente editado e redistribuído de tal forma, não o envie.<br />\nVocê está, ao mesmo tempo, garantindo-nos que isto é algo escrito por você mesmo ou algo copiado de uma fonte de textos em domínio público ou similarmente de teor livre.\n'''NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS AUTORAIS SEM A DEVIDA PERMISSÃO!'''",
"copyrightwarning2": "Por favor, note que todas as suas contribuições em {{SITENAME}} podem ser editadas, alteradas ou removidas por outros contribuidores. Se você não deseja que o seu texto seja inexoravelmente editado, não o envie.<br />\nVocê está, ao mesmo tempo, a garantir-nos que isto é algo escrito por si, ou algo copiado de alguma fonte de textos em domínio público ou similarmente de teor livre (veja $1 para detalhes).\n'''NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS DE AUTOR SEM A DEVIDA PERMISSÃO!'''",
+ "editpage-cannot-use-custom-model": "O modelo de conteúdo desta página não pode ser alterado.",
"longpageerror": "'''Erro: O texto que submeteu ocupa {{PLURAL:$1|um kilobyte|$1 kilobytes}}, que excede o máximo de {{PLURAL:$2|um kilobyte|$2 kilobytes}}.'''\nA página não pode ser salva.",
"readonlywarning": "'''Aviso: O banco de dados foi bloqueado para manutenção, por isso você não poderá salvar a sua edição neste momento.'''\nTalvez você queira copiar o seu texto num editor externo e guardá-lo, para posterior envio.\n\nQuem bloqueou o banco de dados forneceu a seguinte explicação: $1",
"protectedpagewarning": "'''Atenção: Esta página foi protegida para que apenas usuários com privilégios de administrador possam editá-la.'''\nA última entrada no histórico é fornecida abaixo como referência:",
"semiprotectedpagewarning": "'''Nota:''' Esta página foi protegida, sendo que apenas usuários registrados poderão editá-la.\nA última entrada no histórico é fornecida abaixo para referência:",
- "cascadeprotectedwarning": "'''Atenção:''' Esta página se encontra protegida; apenas {{int:group-sysop}} podem editá-la, uma vez que se encontra incluída {{PLURAL:$1|na seguinte página protegida|nas seguintes páginas protegidas}} com a \"proteção progressiva\":",
+ "cascadeprotectedwarning": "<strong> Aviso: </ strong> Esta página foi protegida para que somente os usuários com privilégios de administrador pode editá-lo porque ele é transcluída na seguinte protegido por cascata {{PLURAL: $1 | página | páginas}}:",
"titleprotectedwarning": "'''Atenção: esta página foi protegida; [[Special:ListGroupRights|privilégios específicos]] são necessários para criá-la.'''\nA última entrada no histórico é fornecida abaixo como referência:",
"templatesused": "{{PLURAL:$1|Predefinição usada|Predefinições usadas}} nesta página:",
"templatesusedpreview": "{{PLURAL:$1|Predefinição usada|Predefinições usadas}} nesta previsão:",
"content-model-css": "CSS",
"content-json-empty-object": "Objeto vazio",
"content-json-empty-array": "Array vazia",
+ "duplicate-args-warning": "<strong> Aviso: </ strong> [[:$1]] está chamando [[:$2]] com mais de um valor para o parâmetro \"$3\". Será utilizado apenas o último valor fornecido.",
"duplicate-args-category": "Páginas que utilizam argumentos duplicados ao chamar predefinições",
"duplicate-args-category-desc": "A pagina contem modelos que usam argumentos duplicados, como <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> ou <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
"expensive-parserfunction-warning": "Aviso: Esta página contém muitas chamadas a funções do analisador \"parser\".\n\nDeveria ter menos de $2 {{PLURAL:$2|chamada|chamadas}}. Neste momento {{PLURAL:$1|há $1 chamada|existem $1 chamadas}}.",
"search-category": "(categoria $1)",
"search-file-match": "(coincide com o conteúdo do arquivo)",
"search-suggest": "Você quis dizer: $1?",
+ "search-rewritten": "Mostrando resultados por $1. Pesquisar em vez de $2.",
"search-interwiki-caption": "Projetos irmãos",
"search-interwiki-default": "Resultados de $1:",
"search-interwiki-more": "(mais)",
"rows": "Linhas:",
"columns": "Colunas:",
"searchresultshead": "Pesquisar",
- "stub-threshold": "Links para páginas de conteúdo aparecerão <a href=\"#\" class=\"stub\">desta forma</a> se elas possuírem menos de (bytes):",
+ "stub-threshold": "Limiar para a formatação ligação stub (US $1):",
+ "stub-threshold-sample-link": "amostra",
"stub-threshold-disabled": "Desabilitado",
"recentchangesdays": "Dias a apresentar nas mudanças recentes:",
"recentchangesdays-max": "(máximo: $1 {{PLURAL:$1|dia|dias}})",
"newpageletter": "N",
"boteditletter": "b",
"number_of_watching_users_pageview": "[{{PLURAL:$1|$1 usuário|$1 usuários}} vigiando]",
- "rc_categories": "Limite para categorias (separar com \"|\")",
- "rc_categories_any": "Qualquer",
+ "rc_categories": "Limite para categorias (separar com \"|\"):",
+ "rc_categories_any": "Qualquer dos escolhidos",
"rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} após alterações",
"newsectionsummary": "/* $1 */ nova seção",
"rc-enhanced-expand": "Exibir detalhes",
"uploaddisabledtext": "O envio de arquivos encontra-se desativado.",
"php-uploaddisabledtext": "O envio de arquivos via PHP está desativado.\nVerifique a configuração file_uploads.",
"uploadscripted": "Este arquivo contém HTML ou código que pode ser erroneamente interpretado por um navegador web.",
+ "upload-scripted-pi-callback": "Não é possível fazer upload de um arquivo que contém a instrução de processamento XML-estilo.",
+ "uploaded-script-svg": "Elemento encontrado programável \"$1\" no arquivo SVG carregado.",
+ "uploaded-hostile-svg": "Encontrado CSS inseguro no elemento de estilo do arquivo SVG carregado.",
+ "uploaded-event-handler-on-svg": "Configuração de manipulador de eventos atribui <code> $1 = \"$2\" </ code> não é permitido em arquivos SVG.",
"uploadscriptednamespace": "Este aruivo SVG contém um espaço nominal probido \"$1\"",
"uploadinvalidxml": "O XML no arquivo enviado não pôde ser analisado.",
"uploadvirus": "O arquivo contém vírus!\nDetalhes: $1",
"upload-too-many-redirects": "A URL contém redirecionamentos demais",
"upload-http-error": "Ocorreu um erro HTTP: $1",
"upload-copy-upload-invalid-domain": "Não é possível realizar envios remotos neste domínio.",
+ "upload-dialog-button-cancel": "Cancelar",
+ "upload-dialog-button-done": "Feito",
+ "upload-dialog-button-save": "Salvar",
+ "upload-dialog-button-upload": "Enviar",
+ "upload-dialog-label-select-file": "Selecionar arquivo",
+ "upload-dialog-label-infoform-title": "Detalhes",
+ "upload-dialog-label-infoform-name": "Nome",
+ "upload-dialog-label-infoform-description": "Descrição",
+ "upload-dialog-label-usage-title": "uso",
+ "upload-dialog-label-usage-filename": "Nome do arquivo",
"backend-fail-stream": "Não foi possível transmitir o arquivo $1.",
"backend-fail-backup": "Não foi possível fazer backup do arquivo $1 .",
"backend-fail-notexists": "O arquivo $1 não existe.",
"unusedimages": "Arquivos não utilizados",
"wantedcategories": "Categorias pedidas",
"wantedpages": "Páginas pedidas",
- "wantedpages-summary": "Lista de páginas não-existentes com mais links para elas, excluindo páginas que apenas têm redirecionamentos para elas. Para obter uma lista de páginas inexistentes com redirecionamentos para elas, veja [[{{#special: Brokenredirects}}]].",
+ "wantedpages-summary": "Lista de páginas não-existentes com mais links para eles, excluindo páginas que apenas têm redirecionamentos links para eles. Para obter uma lista de páginas não-existentes que têm redirecionamentos links para eles, veja [[{{#special: Brokenredirects}} | lista de redirecionamentos quebrados]].",
"wantedpages-badtitle": "Título inválido no conjunto de resultados: $1",
"wantedfiles": "Arquivos pedidos",
"wantedfiletext-cat": "Os seguintes arquivos são usados, mas não existem. Arquivos de repositórios externos podem acabar sendo listados apesar de existirem. Esses falsos positivos aparecerão <del>riscados</del>. As páginas que incluem arquivos inexistentes são listadas em [[:$1]].",
"booksources-text": "É exibida a seguir uma listagem de links para outros sites que vendem livros novos e usados e que possam possuir informações adicionais sobre os livros que você está pesquisando:",
"booksources-invalid-isbn": "O número ISBN fornecido não parece ser válido; verifique se houve erros ao copiar da fonte original.",
"specialloguserlabel": "Executor:",
- "speciallogtitlelabel": "Destino (título ou usuário):",
+ "speciallogtitlelabel": "Alvo (título ou {{ns: user}}: nome de usuário para usuário):",
"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).",
"rollback-success": "Foram revertidas as edições de $1, com o conteúdo passando a estar como na última edição de $2.",
"sessionfailure-title": "Erro de sessão",
"sessionfailure": "Foram detetados problemas com a sua sessão;\nEsta ação foi cancelada como medida de proteção contra a intercepção de sessões.\nExperimente usar o botão \"Voltar\" e atualizar a página de onde veio e tente novamente.",
+ "changecontentmodel": "Mudar modelo de conteúdo de uma página",
+ "changecontentmodel-legend": "Mudar modelo de conteúdo",
"changecontentmodel-title-label": "Título da página",
"changecontentmodel-reason-label": "Motivo:",
"logentry-contentmodel-change-revertlink": "reverter",
"special-characters-title-emdash": "travessão",
"special-characters-title-minus": "sinal de menos",
"mw-widgets-dateinput-placeholder-day": "AAAA-MM-DD",
- "mw-widgets-dateinput-placeholder-month": "AAAA-MM"
+ "mw-widgets-dateinput-placeholder-month": "AAAA-MM",
+ "mw-widgets-titleinput-description-redirect": "Direto para $1"
}
"group-autoconfirmed-member": "{{GENDER:$1|аутоматски потврђен корисник|аутоматски потврђена корисница}}",
"group-bot-member": "{{GENDER:$1|бот}}",
"group-sysop-member": "{{GENDER:$1|администратор|администраторка|администратор}}",
- "group-bureaucrat-member": "{{GENDER:$1|бирократа|бирократкиња|бирократа}}",
+ "group-bureaucrat-member": "{{GENDER:$1|бирократа}}",
"group-suppress-member": "{{GENDER:$1|ревизор|ревизорка}}",
"grouppage-user": "{{ns:project}}:Корисници",
"grouppage-autoconfirmed": "{{ns:project}}:Аутоматски потврђени корисници",
"group-autoconfirmed-member": "{{GENDER:$1|automatski potvrđen korisnik|automatski potvrđena korisnica}}",
"group-bot-member": "{{GENDER:$1|bot}}",
"group-sysop-member": "{{GENDER:$1|administrator|administratorka}}",
- "group-bureaucrat-member": "{{GENDER:$1|birokrata|birokratkinja}}",
+ "group-bureaucrat-member": "{{GENDER:$1|birokrata}}",
"group-suppress-member": "{{GENDER:$1|revizor|revizorka}}",
"grouppage-user": "{{ns:project}}:Korisnici",
"grouppage-autoconfirmed": "{{ns:project}}:Automatski potvrđeni korisnici",
"pageinfo-category-subcats": "Ihap han mga ubos-kaarangay",
"pageinfo-category-files": "Ihap han mga paypay",
"markaspatrolleddiff": "Igmarka komo ginpatrolya na",
- "markaspatrolledtext": "Markaha ini nga pakli komo ginpatrolya na",
+ "markaspatrolledtext": "Markaha ini nga pakli nga napatrolyahan na",
"markedaspatrolled": "Igmarka komo ginpatrolya na",
"markedaspatrollederror": "Diri nakakamarka komo ginpatrolya na",
"patrol-log-page": "Talaan han pagpatrolya",
"sp-contributions-blocklog": "封鎖記錄",
"sp-contributions-userrights": "使用者權限管理",
"sp-contributions-username": "IP位址或使用者名稱：",
- "whatlinkshere-title": "鏈接到$1的頁面",
"blockip": "封鎖使用者",
"ipadressorusername": "IP地址或使用者名:",
"ipbreason-dropdown": "*一般的封鎖理由\n** 屢次增加不實資料\n** 刪除頁面內容\n** 外部連結廣告\n** 在頁面中增加無意義文字\n** 無禮的行為、攻擊／騷擾別人\n** 濫用多個帳號\n** 不能接受的使用者名",
seattlewireless|http://seattlewireless.net/$1|0|
senseislibrary|http://senseis.xmp.net/?$1|0|
shoutwiki|http://www.shoutwiki.com/wiki/$1|0|http://www.shoutwiki.com/w/api.php
-sourceforge|http://sourceforge.net/$1|0|
sourcewatch|http://www.sourcewatch.org/index.php?title=$1|0|http://www.sourcewatch.org/api.php
squeak|http://wiki.squeak.org/squeak/$1|0|
tejo|http://www.tejo.org/vikio/$1|0|
('seattlewireless','http://seattlewireless.net/$1',0,''),
('senseislibrary','http://senseis.xmp.net/?$1',0,''),
('shoutwiki','http://www.shoutwiki.com/wiki/$1',0,'http://www.shoutwiki.com/w/api.php'),
-('sourceforge','http://sourceforge.net/$1',0,''),
('sourcewatch','http://www.sourcewatch.org/index.php?title=$1',0,'http://www.sourcewatch.org/api.php'),
('squeak','http://wiki.squeak.org/squeak/$1',0,''),
('tejo','http://www.tejo.org/vikio/$1',0,''),
分佈著 分布着
散布著 散布着
散佈著 散布着
+遍佈著 遍布着
+遍布著 遍布着
三十六著 三十六着
走為上著 走为上着
記憶體 内存
數位照相機 数码照相机
單眼相機 单反相机
單鏡反光機 单反相机
+桌上型電腦 台式电脑
韌體 固件
唯讀 只读
作業系統 操作系统
結他 吉他
了結他 了结他
連結他 连结他
+鏈結 链接
已開發國家 发达国家
太空飛行員 宇航员
太空衣 宇航服
分布 分佈
分布于 分佈於
宣布 宣佈
+承宣布政 承宣布政
公布 公佈
摆布 擺佈
擺布 擺佈
分佈著 分佈着
散布著 散佈着
散佈著 散佈着
+遍佈著 遍佈着
+遍布著 遍佈着
三十六著 三十六着
走為上著 走為上着
鬧著 鬧着
数字照相机 数碼照相機
單眼相機 單鏡反光機
单反相机 單鏡反光機
+台式电脑 桌上型電腦
形上學 形而上學
吉尼斯世界纪录 健力士世界紀錄
吉他 結他
磁盘 磁碟
磁道 磁軌
端口 埠
-算子 運算元
芯片 晶片
译码 解碼
软驱 軟碟機
数据库 資料庫
打印机 印表機
打印機 印表機
-字节 位元組
-字節 位元組
打印 列印
-攻打印 攻打印
+攻打 攻打 #分詞用
+打印度 打印度
硬件 硬體
二极管 二極體
二極管 二極體
数码照相机 數位照相機
數碼照相機 數位照相機
单反相机 單眼相機
+台式电脑 桌上型電腦
形而上學 形上學
形而上学 形上學
当且仅当 若且唯若
數碼訊號 數位訊號
移动网络 行動網路
流動網絡 行動網路
+网络游戏 網路遊戲
+網絡遊戲 網路遊戲
咪高峰 麥克風
電單車 機車
搜索引擎 搜尋引擎
“ 「
‘ 『
’ 』
-’s ’s
+’s ’s
手塚治虫 手塚治虫
無言不仇 無言不讎
視如寇仇 視如寇讎
乾象曆 乾象曆
乾象历 乾象曆
不好干預 不好干預
-不干預 不干預
-不干擾 不干擾
-不干牠 不干牠
范文瀾 范文瀾
機械系 機械系
頂多 頂多
員山庄 員山庄
昵称 暱稱
單于 單于
-鮮于樞 鮮于樞
+鮮于 鮮于
賦范 賦范
茅于軾 茅于軾
陳有后 陳有后
水里高級商工 水里高級商工
水里鳳林 水里鳳林
水里濁水溪 水里濁水溪
+洞里薩 洞里薩
划不來 划不來
划來划去 划來划去
划動 划動
採區
採運
採風
+採血
官地為寀
寮寀
蔘綏
不占算
不好干涉
不好干預
-不干預
-不干涉
-不干休
-不干犯
-不干擾
-不干你
-不干我
-不干他
-不干她
-不干它
-不干事
不斗膽
不每只
不采聲
好斗篷
好斗膽
好斗蓬
+墨斗
小几
尸利
尸祿
這裡
中文裡
洞裡
+洞里薩
界裡
眼睛裡
百科裡
有只用
葉叶琹
胡子昂
+胡子嬰
包括
特别致
分别致
舞后
甄后
郭后
+高后
+升高後
+提高後
0年 # 協助分詞
1年
2年
于再清
茅于軾
張樂于張徐
-鮮于樞
+鮮于
+朝鮮於
于寶軒
于震
於震前
羅馬曆
羅馬歷史
羅馬歷代
+曆數書
你誇
誇你
誇我
蒸製
烹製
醃製
+和製漢
+壓製機
+壓製出
體徵
綜合徵
价川
腌臢
風颳
颳大風
+黃白術
于是
于七
于今
+曆數
+發矇
+不幹
+作姦犯科
+游牧民族
+穀道
$.globalEval( script );
markModuleReady();
}
+ } else {
+ // Module without script
+ markModuleReady();
}
} );
} catch ( e ) {
throw new Error( 'module already implemented: ' + module );
}
// Attach components
- registry[ module ].script = script || [];
- registry[ module ].style = style || {};
- registry[ module ].messages = messages || {};
- registry[ module ].templates = templates || {};
+ registry[ module ].script = script || null;
+ registry[ module ].style = style || null;
+ registry[ module ].messages = messages || null;
+ registry[ module ].templates = templates || null;
// The module may already have been marked as erroneous
if ( $.inArray( registry[ module ].state, [ 'error', 'missing' ] ) === -1 ) {
registry[ module ].state = 'loaded';
}
}
- // subscribe to error streams
+ // Subscribe to error streams
mw.trackSubscribe( 'resourceloader.exception', log );
mw.trackSubscribe( 'resourceloader.assert', log );
+ /**
+ * Fired when all modules associated with the page have finished loading.
+ *
+ * @event resourceloader_loadEnd
+ * @member mw.hook
+ */
+ $( function () {
+ var loading = $.grep( mw.loader.getModuleNames(), function ( module ) {
+ return mw.loader.getState( module ) === 'loading';
+ } );
+ // In order to use jQuery.when (which stops early if one of the promises got rejected)
+ // cast any loading failures into successes. We only need a callback, not the module.
+ loading = $.map( loading, function ( module ) {
+ return mw.loader.using( module ).then( null, function () {
+ return $.Deferred().resolve();
+ } );
+ } );
+ $.when.apply( $, loading ).then( function () {
+ performance.mark( 'mwLoadEnd' );
+ mw.hook( 'resourceloader.loadEnd' ).fire();
+ } );
+ } );
+
// Attach to window and globally alias
window.mw = window.mediaWiki = mw;
}( jQuery ) );
</tbody></table>
!!end
+!! test
+Tables: Digest broken attributes on table and tr tag
+!! options
+parsoid=wt2html
+!! wikitext
+{| || |} ++
+|- || || ++ --
+|- > [
+|}
+!! html
+<table>
+<tbody>
+<tr></tr>
+<tr></tr>
+</tbody></table>
+!! end
+
!! test
Strip unsupported table tags
!! options
bar</p>
!! end
-## Edge case bug in Parsoid
+## Edge case bugs in Parsoid from T93580
!! test
-T93580: Templated <ref> inside images
+T93580: 1. Templated <ref> inside block images
!! wikitext
[[File:Foobar.jpg|thumb|Caption with templated ref: {{echo|<ref>foo</ref>}}]]
<ol class="mw-references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
!! end
+!! test
+T93580: 2. <ref> inside inline images
+!! wikitext
+[[File:Foobar.jpg|Undisplayed caption in inline image with ref: <ref>foo</ref>]]
+
+<references />
+!! html/parsoid
+<p><span class="mw-default-size" typeof="mw:Image" data-parsoid='{"optList":[{"ck":"caption","ak":"Undisplayed caption in inline image with ref: <ref>foo</ref>"}]}' data-mw='{"caption":"Undisplayed caption in inline image with ref: <span about=\"#mwt2\" class=\"mw-ref\" id=\"cite_ref-1\" rel=\"dc:references\" typeof=\"mw:Extension/ref\" data-parsoid=\"{&quot;dsr&quot;:[64,78,5,6]}\" data-mw=\"{&quot;name&quot;:&quot;ref&quot;,&quot;body&quot;:{&quot;id&quot;:&quot;mw-reference-text-cite_note-1&quot;},&quot;attrs&quot;:{}}\"><a href=\"#cite_note-1\" style=\"counter-reset: mw-Ref 1;\"><span class=\"mw-reflink-text\">[1]</span></a></span><meta typeof=\"mw:Extension/ref/Marker\" about=\"#mwt2\" data-parsoid=\"{&quot;group&quot;:&quot;&quot;,&quot;name&quot;:&quot;&quot;,&quot;content&quot;:&quot;foo&quot;,&quot;hasRefInRef&quot;:false,&quot;dsr&quot;:[64,78,5,6],&quot;tmp&quot;:{}}\" data-mw=\"{}\">"}'><a href="./File:Foobar.jpg" data-parsoid='{"a":{"href":"./File:Foobar.jpg"},"sa":{}}'><img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="220" width="1941" data-parsoid='{"a":{"resource":"./File:Foobar.jpg","height":"220","width":"1941"},"sa":{"resource":"File:Foobar.jpg"}}'/></a></span></p>
+
+<ol class="mw-references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
+!! end
+
+!! test
+T93580: 3. Templated <ref> inside inline images
+!! wikitext
+[[File:Foobar.jpg|Undisplayed caption in inline image with ref: {{echo|<ref>{{echo|foo}}</ref>}}]]
+
+<references />
+!! html/parsoid
+<p><span class="mw-default-size" typeof="mw:Image" data-parsoid='{"optList":[{"ck":"caption","ak":"Undisplayed caption in inline image with ref: {{echo|<ref>{{echo|foo}}</ref>}}"}]}' data-mw='{"caption":"Undisplayed caption in inline image with ref: <span about=\"#mwt2\" class=\"mw-ref\" id=\"cite_ref-1\" rel=\"dc:references\" typeof=\"mw:Transclusion mw:Extension/ref\" data-parsoid=\"{&quot;dsr&quot;:[64,96,null,null],&quot;pi&quot;:[[{&quot;k&quot;:&quot;1&quot;,&quot;spc&quot;:[&quot;&quot;,&quot;&quot;,&quot;&quot;,&quot;&quot;]}]]}\" data-mw=\"{&quot;parts&quot;:[{&quot;template&quot;:{&quot;target&quot;:{&quot;wt&quot;:&quot;echo&quot;,&quot;href&quot;:&quot;./Template:Echo&quot;},&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;<ref>{{echo|foo}}</ref>&quot;}},&quot;i&quot;:0}}]}\"><a href=\"#cite_note-1\" style=\"counter-reset: mw-Ref 1;\"><span class=\"mw-reflink-text\">[1]</span></a></span><meta typeof=\"mw:Transclusion mw:Extension/ref/Marker\" about=\"#mwt2\" data-parsoid=\"{&quot;group&quot;:&quot;&quot;,&quot;name&quot;:&quot;&quot;,&quot;content&quot;:&quot;foo&quot;,&quot;hasRefInRef&quot;:false,&quot;dsr&quot;:[64,96,null,null],&quot;pi&quot;:[[{&quot;k&quot;:&quot;1&quot;,&quot;spc&quot;:[&quot;&quot;,&quot;&quot;,&quot;&quot;,&quot;&quot;]}]],&quot;tmp&quot;:{}}\" data-mw=\"{&quot;parts&quot;:[{&quot;template&quot;:{&quot;target&quot;:{&quot;wt&quot;:&quot;echo&quot;,&quot;href&quot;:&quot;./Template:Echo&quot;},&quot;params&quot;:{&quot;1&quot;:{&quot;wt&quot;:&quot;<ref>{{echo|foo}}</ref>&quot;}},&quot;i&quot;:0}}]}\">"}'><a href="./File:Foobar.jpg" data-parsoid='{"a":{"href":"./File:Foobar.jpg"},"sa":{}}'><img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="220" width="1941" data-parsoid='{"a":{"resource":"./File:Foobar.jpg","height":"220","width":"1941"},"sa":{"resource":"File:Foobar.jpg"}}'/></a></span></p>
+
+<ol class="mw-references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
+!! end
+
###
### Subpages
###
!! test
Headings: 0. Unnested
!! options
-parsoid
+parsoid=html2wt
+!! html/parsoid
+<p>=foo=</p>
+
+<p> =foo=
+<!--cmt-->
+=foo=</p>
+
+<p>=foo<i>a</i>=</p>
!! wikitext
<nowiki>=foo=</nowiki>
-<nowiki> =foo= </nowiki>
+<nowiki> </nowiki>=foo=
<!--cmt-->
<nowiki>=foo=</nowiki>
=foo''a''<nowiki>=</nowiki>
-!! html
-<p><span typeof="mw:Nowiki">=foo=</span></p>
-
-<p><span typeof="mw:Nowiki"> =foo= </span>
-<!--cmt-->
-<span typeof="mw:Nowiki">=foo=</span></p>
-
-<p>=foo<i>a</i><span typeof="mw:Nowiki">=</span></p>
!!end
# New headings and existing headings are handled differently
!! test
Headings: 3. Nested inside html with wikitext split by html tags
!! options
-parsoid=html2wt,wt2wt
-!! wikitext
-= ='''bold'''<nowiki>foo=</nowiki> =
+parsoid=html2wt
!! html/parsoid
<h1>=<b>bold</b>foo=</h1>
+!! wikitext
+= ='''bold'''<nowiki>foo=</nowiki> =
!!end
!! test
Headings: 4a. No escaping needed (testing just h1 and h2)
+!! options
+parsoid=html2wt
+!! html/parsoid
+<h1>=foo</h1>
+<h1>foo=</h1>
+<h1> =foo= </h1>
+<h1>=foo= bar</h1>
+<h2>=foo</h2>
+<h2>foo=</h2>
+<h1>=</h1>
+<h1><i>=</i>foo=</h1>
!! wikitext
= =foo =
= = =
= ''=''foo= =
-!! html/parsoid
-<h1>=foo</h1>
-<h1>foo=</h1>
-<h1> =foo= </h1>
-<h1>=foo= bar</h1>
-<h2>=foo</h2>
-<h2>foo=</h2>
-<h1>=</h1>
-<h1><i>=</i>foo=</h1>
!!end
!! test
!! test
Headings: 5. Empty headings
+!! options
+parsoid=html2wt
+!! html/parsoid
+<h1 data-parsoid='{}'></h1>
+
+<h2 data-parsoid='{}'></h2>
+
+<h3 data-parsoid='{}'></h3>
+
+<h4 data-parsoid='{}'></h4>
+
+<h5 data-parsoid='{}'></h5>
+
+<h6 data-parsoid='{}'></h6>
!! wikitext
=<nowiki/>=
=====<nowiki/>=====
======<nowiki/>======
-!! html/parsoid
-<h1 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"<nowiki/>"}'/></h1>
-
-<h2 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"<nowiki/>"}'/></h2>
-
-<h3 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"<nowiki/>"}'/></h3>
-
-<h4 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"<nowiki/>"}'/></h4>
-
-<h5 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"<nowiki/>"}'/></h5>
-
-<h6 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"<nowiki/>"}'/></h6>
!!end
!! test
Headings: 6a. Heading chars in SOL context (with trailing spaces)
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>=a=</p>
+
+<p>=a=</p>
+
+<p>=a=</p>
!! wikitext
<nowiki>=a=</nowiki>
<nowiki>=a=</nowiki>
<nowiki>=a=</nowiki>
-
-<nowiki>=a=</nowiki>
-!! html/php
-<p>=a=
-</p><p>=a=
-</p><p>=a=
-</p><p>=a=
-</p>
-!! html/parsoid
-<p><span typeof="mw:Nowiki">=a=</span></p>
-
-<p><span typeof="mw:Nowiki">=a=</span></p>
-
-<p><span typeof="mw:Nowiki">=a=</span></p>
-
-<p><span typeof="mw:Nowiki">=a=</span></p>
!!end
!! test
Headings: 6b. Heading chars in SOL context (with trailing newlines)
-!! wikitext
-<nowiki>=a=
-b</nowiki>
-
-<nowiki>=a=
-b</nowiki>
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>=a=
+b</p>
-<nowiki>=a=
-b</nowiki>
+<p>=a=
+b</p>
-<nowiki>=a=
-b</nowiki>
-!! html/php
-<p>=a=
-b
-</p><p>=a=
-b
-</p><p>=a=
-b
-</p><p>=a=
+<p>=a=
+b</p>
+!! wikitext
+<nowiki>=a=</nowiki>
b
-</p>
-!! html/parsoid
-<p><span typeof="mw:Nowiki">=a=
-b</span></p>
-<p><span typeof="mw:Nowiki">=a=
-b</span></p>
-
-<p><span typeof="mw:Nowiki">=a=
-b</span></p>
+<nowiki>=a=</nowiki>
+b
-<p><span typeof="mw:Nowiki">=a=
-b</span></p>
+<nowiki>=a=</nowiki>
+b
!!end
!! test
Headings: 6c. Heading chars in SOL context (leading newline break)
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>a
+=b=</p>
!! wikitext
a
<nowiki>=b=</nowiki>
-!! html/php
-<p>a
-=b=
-</p>
-!! html/parsoid
-<p>a
-<span typeof="mw:Nowiki">=b=</span>
!!end
!! test
Headings: 6d. Heading chars in SOL context (with interspersed comments)
+!! options
+parsoid=html2wt
+!! html/parsoid
+<!--c0--><p>=a=</p>
+
+<!--c1--><p>=a=</p> <!--c2--> <!--c3-->
!! wikitext
<!--c0--><nowiki>=a=</nowiki>
<!--c1--><nowiki>=a=</nowiki> <!--c2--> <!--c3-->
-!! html/php
-<p>=a=
-</p><p>=a=
-</p>
-!! html/parsoid
-<!--c0--><p><span typeof="mw:Nowiki">=a=</span></p>
-
-<!--c1--><p><span typeof="mw:Nowiki">=a=</span></p> <!--c2--> <!--c3-->
!!end
!! test
!! test
Lists: 0. Outside nests
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>*foo</p>
+
+<p>#foo</p>
+
+<p>;Foo:bar</p>
!! wikitext
<nowiki>*</nowiki>foo
<nowiki>#</nowiki>foo
-<nowiki>;Foo:</nowiki>bar
-!! html/php
-<p>*foo
-</p><p>#foo
-</p><p>;Foo:bar
-</p>
-!! html/parsoid
-<p><span typeof="mw:Nowiki">*</span>foo</p>
-
-<p><span typeof="mw:Nowiki">#</span>foo</p>
-
-<p><span typeof="mw:Nowiki">;Foo:</span>bar</p>
+<nowiki>;</nowiki>Foo<nowiki>:</nowiki>bar
!!end
!! test
Lists: 1. Nested inside html
+!! options
+parsoid=html2wt
+!! html/parsoid
+<ul><li>*foo</li></ul>
+<ul><li>#foo</li></ul>
+<ul><li>:foo</li></ul>
+<ul><li>;foo</li></ul>
+<ol><li>*foo</li></ol>
+<ol><li>#foo</li></ol>
+<ol><li>:foo</li></ol>
+<ol><li>;foo</li></ol>
+
!! wikitext
*<nowiki>*foo</nowiki>
#<nowiki>:foo</nowiki>
#<nowiki>;foo</nowiki>
-!! html
-<ul><li>*foo</li></ul>
-<ul><li>#foo</li></ul>
-<ul><li>:foo</li></ul>
-<ul><li>;foo</li></ul>
-<ol><li>*foo</li></ol>
-<ol><li>#foo</li></ol>
-<ol><li>:foo</li></ol>
-<ol><li>;foo</li></ol>
-
!!end
!! test
Lists: 2. Inside definition lists
+!! options
+parsoid=html2wt
+!! html/parsoid
+<dl><dt>;foo</dt></dl>
+<dl><dt>:foo</dt></dl>
+<dl><dt>:foo</dt>
+<dd>bar</dd></dl>
+<dl><dd>:foo</dd></dl>
+
!! wikitext
;<nowiki>;foo</nowiki>
:bar
:<nowiki>:foo</nowiki>
-!! html
-<dl><dt>;foo</dt></dl>
-<dl><dt>:foo</dt></dl>
-<dl><dt>:foo</dt>
-<dd>bar</dd></dl>
-<dl><dd>:foo</dd></dl>
-
!!end
!! test
Lists: 3. Only bullets at start of text should be escaped
+!! options
+parsoid=html2wt
+!! html/parsoid
+<ul><li>*foo*bar</li></ul>
+<ul><li>*foo<i>it</i>*bar</li></ul>
+
!! wikitext
*<nowiki>*foo*bar</nowiki>
*<nowiki>*foo</nowiki>''it''*bar
-!! html
-<ul><li>*foo*bar</li></ul>
-<ul><li>*foo<i>it</i>*bar</li></ul>
-
!!end
!! test
Lists: 4. No escapes needed
!! options
-parsoid
-!! wikitext
-*foo*bar
-
-*''foo''*bar
-
-*[[Foo]]: bar
-
-*[[Foo]]*bar
-!! html
+parsoid=html2wt
+!! html/parsoid
<ul>
<li>foo*bar
</li>
<li><a rel="mw:WikiLink" href="Foo" title="Foo">Foo</a>*bar
</li>
</ul>
+!! wikitext
+*foo*bar
+
+*''foo''*bar
+
+*[[Foo]]: bar
+
+*[[Foo]]*bar
!!end
!! test
Lists: 5. No unnecessary escapes
+!! options
+parsoid=html2wt
+!! html/parsoid
+<ul><li> bar <span>[[foo]]</span></li></ul>
+<ul><li> =bar <span>[[foo]]</span></li></ul>
+<ul><li> [[bar <span>[[foo]]</span></li></ul>
+<ul><li> ]]bar <span>[[foo]]</span></li></ul>
+<ul><li> =bar <span>foo]]</span>=</li></ul>
+<ul><li> <s></s>: a</li></ul>
+<ul><li> <i>* foo</i></li></ul>
+
!! wikitext
* bar <span><nowiki>[[foo]]</nowiki></span>
* <s></s>: a
* ''* foo''
-!! html
-<ul><li> bar <span>[[foo]]</span></li></ul>
-<ul><li> =bar <span>[[foo]]</span></li></ul>
-<ul><li> [[bar <span>[[foo]]</span></li></ul>
-<ul><li> ]]bar <span>[[foo]]</span></li></ul>
-<ul><li> =bar <span>foo]]</span>=</li></ul>
-<ul><li> <s></s>: a</li></ul>
-<ul><li> <i>* foo</i></li></ul>
-
!!end
!! test
!! test
Lists: 7. Escape bullets in a multi-line context
-!! wikitext
-a
-<nowiki>*</nowiki>b
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
<p>a
*b
</p>
+!! wikitext
+a
+<nowiki>*</nowiki>b
!!end
!! test
!! test
HRs: 1. Single line
+!! options
+parsoid=html2wt
+!! html/parsoid
+<hr />----
+<hr />=foo=
+<hr />*foo
!! wikitext
----<nowiki>----</nowiki>
----=foo=
----*foo
-!! html+tidy
-<hr />
-<p>----</p>
-<hr />
-<p>=foo=</p>
-<hr />
-<p>*foo</p>
!! end
#### --------------- Tables ---------------
!! test
Tables: 1a. Simple example
-!! wikitext
-<nowiki>{|
-|}</nowiki>
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
<p>{|
|}
</p>
+!! wikitext
+<nowiki>{|
+|}</nowiki>
!! end
!! test
Tables: 1b. No escaping needed
-!! wikitext
-!foo
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
<p>!foo
</p>
+!! wikitext
+!foo
!! end
!! test
Tables: 1c. No escaping needed
-!! wikitext
-|foo
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
<p>|foo
</p>
+!! wikitext
+|foo
!! end
!! test
Tables: 1d. No escaping needed
-!! wikitext
-|}foo
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
<p>|}foo
</p>
+!! wikitext
+|}foo
!! end
!! test
!! test
Tables: 2c. Nested in td -- no escaping needed
-!! wikitext
-{|
-
-|foo!!bar
-|}
+!! options
+parsoid=html2wt
!! html/*
<table>
<td>foo!!bar
</td></tr></table>
-!! end
-
-!! test
-Tables: 3a. Nested in th
!! wikitext
{|
-!foo!bar
+|foo!!bar
|}
+!! end
+
+!! test
+Tables: 3a. Nested in th
+!! options
+parsoid=html2wt
!! html/*
<table>
<th>foo!bar
</th></tr></table>
+!! wikitext
+{|
+
+!foo!bar
+|}
!! end
!! test
!! test
Tables: 4c. No escaping needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<table><tbody>
+<tr><td>foo-bar</td><td>foo+bar</td></tr>
+<tr><td><i>foo</i>-bar</td><td><i>foo</i>+bar</td></tr>
+<tr><td>foo
+<p>bar|baz
++bar
+-bar</p></td></tr>
+<tr><td>x
+<div>a|b</div></td>
+</tbody></table>
!! wikitext
{|
|foo-bar
<div>a|b</div>
</td></tr></table>
-!! html/parsoid
-<table><tbody>
-<tr><td>foo-bar</td><td>foo+bar</td></tr>
-<tr><td><i>foo</i>-bar</td><td><i>foo</i>+bar</td></tr>
-<tr><td>foo
-<p>bar|baz
-+bar
--bar</p></td></tr>
-<tr><td>x
-<div>a|b</div></td>
-</tbody></table>
!! end
!! test
Tables: 4d. No escaping needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<table>
+<tbody><tr><td><a rel="mw:WikiLink" href="./Foo" title="Foo">Foo</a>-bar</td>
+<td data-parsoid='{"startTagSrc":"|","attrSepSrc":"|"}'>+1</td>
+<td data-parsoid='{"startTagSrc":"|","attrSepSrc":"|"}'>-2</td></tr>
+</tbody></table>
!! wikitext
{|
|[[Foo]]-bar
<td>-2
</td></tr></table>
-!! html/parsoid
-<table>
-<tbody><tr><td><a rel="mw:WikiLink" href="./Foo" title="Foo">Foo</a>-bar</td>
-<td data-parsoid='{"startTagSrc":"|","attrSepSrc":"|"}'>+1</td>
-<td data-parsoid='{"startTagSrc":"|","attrSepSrc":"|"}'>-2</td></tr>
-</tbody></table>
-!! end
-
-!! test
-Tables: Digest broken attributes on table and tr tag
-!! options
-parsoid=wt2html
-!! wikitext
-{| || |} ++
-|- || || ++ --
-|- > [
-|}
-!! html
-<table>
-<tbody>
-<tr></tr>
-<tr></tr>
-</tbody></table>
!! end
!! test
!! test
Unclosed xmlish element in table line shouldn't eat end delimiters
+!! options
+parsoid=html2wt
+!! html/parsoid
+<table>
+<tbody><tr><td> <foo</td>
+<td> bar></td></tr>
+</tbody></table>
!! wikitext
{|
| <foo
<td> bar>
</td></tr></table>
-!! html/parsoid
-<table>
-<tbody><tr><td> <foo</td>
-<td> bar></td></tr>
-</tbody></table>
!! end
#### --------------- Links ----------------
#### --------------------------------------
!! test
Links 1. WikiLinks: No escapes needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p><a rel="mw:WikiLink" href="Foo" title="Foo">Foo<i>boo</i></a>
+<a rel="mw:WikiLink" href="Foo" title="Foo">[Foobar]</a>
+<a rel="mw:WikiLink" href="Foo" title="Foo">x [Foobar] x</a></p>
!! wikitext
[[Foo|Foo''boo'']]
[[Foo|[Foobar]]]
<a href="/wiki/Foo" title="Foo">[Foobar]</a>
<a href="/wiki/Foo" title="Foo">x [Foobar] x</a>
</p>
-!! html/parsoid
-<p><a rel="mw:WikiLink" href="Foo" title="Foo">Foo<i>boo</i></a>
-<a rel="mw:WikiLink" href="Foo" title="Foo">[Foobar]</a>
-<a rel="mw:WikiLink" href="Foo" title="Foo">x [Foobar] x</a></p>
!! end
!! test
!! test
Links 3. WikiLinks: No escapes needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p><a rel="mw:WikiLink" href="Foo">[Foobar</a>
+<a rel="mw:WikiLink" href="Foo" title="Foo">foo|bar</a></p>
!! wikitext
[[Foo|[Foobar]]
[[Foo|foo|bar]]
<p><a href="/wiki/Foo" title="Foo">[Foobar</a>
<a href="/wiki/Foo" title="Foo">foo|bar</a>
</p>
-!! html/parsoid
-<p><a rel="mw:WikiLink" href="Foo">[Foobar</a>
-<a rel="mw:WikiLink" href="Foo" title="Foo">foo|bar</a></p>
!! end
!! test
!! test
Links 5. ExtLinks: No escapes needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p><a rel="mw:ExtLink" href="http://google.com">[google</a></p>
!! wikitext
[http://google.com [google]
!! html/php
<p><a rel="nofollow" class="external text" href="http://google.com">[google</a>
</p>
-!! html/parsoid
-<p><a rel="mw:ExtLink" href="http://google.com">[google</a></p>
!! end
!! test
Links 6. Add <nowiki/>s between text-nodes and url-links when required (bug 64300)
+!! options
+parsoid=html2wt
!! html/parsoid
<p>x<a rel="mw:ExtLink" href="http://example.com" data-parsoid='{"stx":"url"}'>http://example.com</a>y
<a rel="mw:ExtLink" href="http://example.com" data-parsoid='{"stx":"url"}'>http://example.com</a>?x
!! test
Links 7a. Don't add spurious <nowiki/>s between text-nodes and url-links (bug 64300)
+!! options
+parsoid=html2wt
!! html/parsoid
<p>x
<a rel="mw:ExtLink" href="http://example.com" data-parsoid='{"stx":"url"}'>http://example.com</a>
!! test
Links 7b. Don't add spurious <nowiki/>s between text-nodes and url-links (bug 64300)
+!! options
+parsoid=html2wt
!! html/parsoid
<p><a rel="mw:ExtLink" href="http://example.com" data-parsoid='{"stx":"url"}'>http://example.com</a>.,;:!?\
-<a rel="mw:ExtLink" href="http://example.com">http://example.com</a>:</p>
!! test
Links 8. Add <nowiki/>s between text-nodes and RFC-links when required (bug 64300)
+!! options
+parsoid=html2wt
!! html/parsoid
<p><a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>RFC 123</a>4
<a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>RFC 123</a>y
!! test
Links 9. Don't add spurious <nowiki/>s between text-nodes and RFC-links (bug 64300)
+!! options
+parsoid=html2wt
!! html/parsoid
<p><a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>RFC 123</a>?foo
<a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>RFC 123</a>&foo
!! test
Links 10. Add <nowiki/>s between text-nodes and PMID-links when required (bug 64300)
+!! options
+parsoid=html2wt
!! html/parsoid
<p><a href="//www.ncbi.nlm.nih.gov/pubmed/123?dopt=Abstract" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>PMID 123</a>4
<a href="//www.ncbi.nlm.nih.gov/pubmed/123?dopt=Abstract" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>PMID 123</a>y
!! test
Links 11. Don't add spurious <nowiki/>s between text-nodes and PMID-links (bug 64300)
+!! options
+parsoid=html2wt
!! html/parsoid
<p><a href="//www.ncbi.nlm.nih.gov/pubmed/123?dopt=Abstract" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>PMID 123</a>?foo
<a href="//www.ncbi.nlm.nih.gov/pubmed/123?dopt=Abstract" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>PMID 123</a>&foo
!! test
Links 12. Add <nowiki/>s between text-nodes and ISBN-links when required (bug 64300)
+!! options
+parsoid=html2wt
!! html/parsoid
<p><a href="./Special:BookSources/1234567890" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>1
<a href="./Special:BookSources/1234567890" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>x
!! test
Links 13. Don't add spurious <nowiki/>s between text-nodes and ISBN-links (bug 64300)
+!! options
+parsoid=html2wt
!! html/parsoid
<p>-<a href="./Special:BookSources/1234567890" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>'s
!! wikitext
Links 15. Link trails can't become link prefixes.
!! options
language=is
+parsoid=html2wt
+!! html/parsoid
+<p><a rel="mw:WikiLink" href="Söfnuður" title="Söfnuður" data-parsoid='{"stx":"simple","tail":"-"}'>Söfnuður-</a><a rel="mw:WikiLink" href="00" title="00">00</a></p>
!! wikitext
[[Söfnuður]]-[[00]]
!! html/php
<p><a href="/wiki/S%C3%B6fnu%C3%B0ur" title="Söfnuður">Söfnuður-</a><a href="/wiki/00" title="00">00</a>
</p>
-!! html/parsoid
-<p><a rel="mw:WikiLink" href="Söfnuður" title="Söfnuður" data-parsoid='{"stx":"simple","tail":"-"}'>Söfnuður-</a><a rel="mw:WikiLink" href="00" title="00">00</a></p>
!! end
#### --------------- Quotes ---------------
!! test
1a. Quotes inside <b> and <i>
!! options
-parsoid=html2wt,wt2wt
-!! wikitext
-''<nowiki/>'foo'''
-''<nowiki>''foo''</nowiki>''
-''<nowiki>'''foo'''</nowiki>''
-''foo''<nowiki/>'s
-'''<nowiki/>'foo''''
-'''<nowiki>''foo''</nowiki>'''
-'''<nowiki>'''foo'''</nowiki>'''
-'''foo'<nowiki/>''bar'<nowiki/>''baz'''
-'''foo'''<nowiki/>'s
-'''foo''
-''foo''<nowiki/>'
-''foo'''<nowiki/>'
-'''foo''<nowiki/>'
-''''foo'''
-'''foo'''<nowiki/>'
-''''foo'''<nowiki/>'
-''fools'<span> errand</span>''
-''<span>fool</span>'s errand''
-'<nowiki/>''foo'' bar '''baz''
-a|!*#-:;+-~[]{}b'''x''
+parsoid=html2wt
!! html/*
<p><i>'foo'</i>
<i>''foo''</i>
'<i>foo</i> bar '<i>baz</i>
a|!*#-:;+-~[]{}b'<i>x</i>
</p>
+!! wikitext
+''<nowiki/>'foo'''
+''<nowiki>''foo''</nowiki>''
+''<nowiki>'''foo'''</nowiki>''
+''foo''<nowiki/>'s
+'''<nowiki/>'foo''''
+'''<nowiki>''foo''</nowiki>'''
+'''<nowiki>'''foo'''</nowiki>'''
+'''foo'<nowiki/>''bar'<nowiki/>''baz'''
+'''foo'''<nowiki/>'s
+'''foo''
+''foo''<nowiki/>'
+''foo'''<nowiki/>'
+'''foo''<nowiki/>'
+''''foo'''
+'''foo'''<nowiki/>'
+''''foo'''<nowiki/>'
+''fools'<span> errand</span>''
+''<span>fool</span>'s errand''
+'<nowiki/>''foo'' bar '''baz''
+a|!*#-:;+-~[]{}b'''x''
!! end
!! test
1b. Quotes inside <b> and <i> with other tags on same line
!! options
-parsoid=html2wt,wt2wt
-!! wikitext
-'''a'' foo ''[[bar]]''
-''a''' foo ''[[bar]]''
-''a''' foo '''{{echo|[[bar]]}}'''
-[[foo]] x'''[[bar]]''
-'''foo'' <ref>test</ref>
-'''foo'' <div title="name">test</div>
-'''foo'' and <br> bar
-<references />
-!! html
+parsoid=html2wt
+!! html/parsoid
'<i>a</i> foo <i><a rel="mw:WikiLink" href="Bar" title="Bar">bar</a></i>
<i>a'</i> foo <i><a rel="mw:WikiLink" href="Bar" title="Bar">bar</a></i>
<i>a'</i> foo <b><a rel="mw:WikiLink" href="Bar" title="Bar" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"[[bar]]"}},"i":0}}]}'>bar</a></b>
<ol class="mw-references" typeof="mw:Extension/references" about="#mwt5" data-mw='{"name":"references","attrs":{}}'>
<li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">test</span></li>
</ol>
+!! wikitext
+'''a'' foo ''[[bar]]''
+''a''' foo ''[[bar]]''
+''a''' foo '''{{echo|[[bar]]}}'''
+[[foo]] x'''[[bar]]''
+'''foo'' <ref>test</ref>
+'''foo'' <div title="name">test</div>
+'''foo'' and <br> bar
+<references />
!! end
!! test
2. Link fragments separated by <i> and <b> tags
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>[[<i>foo</i>hello]]</p>
+<p>[[<b>foo</b>hello]]</p>
!! wikitext
[[''foo''<nowiki>hello]]</nowiki>
[['''foo'''<nowiki>hello]]</nowiki>
-!! html
-<p>[[<i>foo</i>hello]]
-</p><p>[[<b>foo</b>hello]]
-</p>
!! end
# FIXME: Escaping one or both of [[ and ]] is also acceptable --
# this is one of the shortcomings of this format
!! test
3. Link fragments inside <i> and <b>
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p><i>[[foo</i>]]</p>
+<p><b>[[foo</b>]]</p>
!! wikitext
''[[foo''<nowiki>]]</nowiki>
'''[[foo'''<nowiki>]]</nowiki>
-!! html
-<p><i>[[foo</i>]]
-</p><p><b>[[foo</b>]]
-</p>
!! end
!! test
4. No escaping needed
-!! wikitext
-'<span>''bar''</span>'
-'<span>'''bar'''</span>'
-'a:b'foo
-!! html
+!! options
+options=html2wt
+!! html/parsoid
<p>'<span><i>bar</i></span>'
'<span><b>bar</b></span>'
'a:b'foo
</p>
+!! wikitext
+'<span>''bar''</span>'
+'<span>'''bar'''</span>'
+'a:b'foo
!! end
#### ----------- Paragraphs ---------------
!! test
1. No unnecessary escapes
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>bar <span>[[foo]]</span>
+</p><p>=bar <span>[[foo]]</span>
+</p><p>[[bar <span>[[foo]]</span>
+</p><p>]]bar <span>[[foo]]</span>
+</p><p>=bar <span>foo]]</span>=
+</p>
!! wikitext
bar <span><nowiki>[[foo]]</nowiki></span>
]]bar <span><nowiki>[[foo]]</nowiki></span>
=bar <span>foo]]</span><nowiki>=</nowiki>
-!! html
-<p>bar <span>[[foo]]</span>
-</p><p>=bar <span>[[foo]]</span>
-</p><p>[[bar <span>[[foo]]</span>
-</p><p>]]bar <span>[[foo]]</span>
-</p><p>=bar <span>foo]]</span>=
-</p>
!!end
#### ----------------------- PRE --------------------------
!! test
1. Leading whitespace in SOL context should be escaped
!! options
-parsoid=html2wt,wt2wt
-!! html/php
-<p> a
-</p><p> a
-</p><p> a(tab)
-</p><p> a
- a
-</p><p>a
- b
-</p><p>a
- b
-</p><p>a
- b
-</p>
+parsoid=html2wt
!! html/parsoid
<p> a</p>
a
b
+!! html/php
+<p> a
+</p><p> a
+</p><p> a(tab)
+</p><p> a
+ a
+</p><p>a
+ b
+</p><p>a
+ b
+</p><p>a
+ b
+</p>
!! end
!! test
2. Leading whitespace in non-indent-pre contexts should not be escaped
!! options
-parsoid
-!! wikitext
-foo <ref>''a''
- b</ref>
-<references />
-!! html
+parsoid=htm2wt
+!! html/parsoid
<p>foo <span about="#mwt2" class="mw-ref" id="cite_ref-1" rel="dc:references" typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a href="#cite_note-1"><span class="mw-reflink-text">[1]</span></a></span></p>
<ol class="mw-references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'>
<li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text"><i data-parsoid='{"dsr":[9,14,2,2]}'>a</i>
b</span></li>
</ol>
+!! wikitext
+foo <ref>''a''
+ b</ref>
+<references />
!! end
!! test
3. Leading whitespace in indent-pre suppressing contexts should not be escaped
!! options
-parsoid
-!! wikitext
+parsoid=html2wt
+!! html/parsoid
<blockquote>
+<p>
a
<span>b</span>
- c
+ c</p>
</blockquote>
-!! html
+!! wikitext
<blockquote>
-<p>
a
<span>b</span>
- c</p>
+ c
</blockquote>
!! end
!! test
4. Leading whitespace in indent-pre suppressing contexts should not be escaped
!! options
-parsoid
-!! wikitext
- [[File:Foobar.jpg|thumb|caption]]
+options=html2wt
!! html/parsoid
<figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption>caption</figcaption></figure>
+!! wikitext
+ [[File:Foobar.jpg|thumb|caption]]
!! end
!! test
!!test
T95794: nowiki escaping should account for leading space at start-of-line in an indent-pre block
!! options
-parsoid
-!! wikitext
- * foo
- * bar
-!! html
+parsoid=html2wt
+!! html/parsoid
<pre>
* foo
* bar
</pre>
+!! wikitext
+ * foo
+ * bar
!! end
#### --------------- Behavior Switches --------------------
# We use indent-pre as an indirect way to test for sol-transparent behavior.
!! test
Behavior switches should be SOL-transparent
-!! wikitext
- __TOC__
-
- <!-- this one's bogus -->
- __TOO__
-
- __TOC__ foo
-
-__TOC__ bar
+!! options
+parsoid=html2wt
!! html/parsoid
<meta property="mw:PageProp/toc" />
<pre data-parsoid='{}'><meta property="mw:PageProp/toc" data-parsoid='{"src":"__TOC__","magicSrc":"__TOC__"}'/> foo</pre>
<meta property="mw:PageProp/toc" data-parsoid='{"src":"__TOC__","magicSrc":"__TOC__"}'/><pre data-parsoid='{}'>bar</pre>
+!! wikitext
+ __TOC__
+
+ <!-- this one's bogus -->
+ __TOO__
+
+ __TOC__ foo
+
+__TOC__ bar
!! end
#### --------------- HTML tags ---------------
!! test
1. a tags
!! options
-parsoid
+parsoid=html2wt
+!! html/parsoid
+<a href="http://google.com">google</a>
!! wikitext
<a href="http://google.com">google</a>
-!! html
-<a href="http://google.com">google</a>
!! end
!! test
2. other tags
-!! wikitext
-* <nowiki><div>foo</div></nowiki>
-* <nowiki><div style="color:red">foo</div></nowiki>
-* <nowiki><td></nowiki>
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
<ul><li> <div>foo</div></li>
<li> <div style="color:red">foo</div></li>
<li> <td></li></ul>
+!! wikitext
+* <nowiki><div>foo</div></nowiki>
+* <nowiki><div style="color:red">foo</div></nowiki>
+* <nowiki><td></nowiki>
!! end
!! test
3. multi-line html tag
-!! wikitext
-<nowiki><div
->foo</div
-></nowiki>
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
<p><div
>foo</div
>
</p>
+!! wikitext
+<nowiki><div
+>foo</div
+></nowiki>
!! end
!! test
4. extension tags
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p><ref>foo</ref>
+</p><p><ref>bar
+</p><p>baz</ref>
+</p>
!! wikitext
<nowiki><ref>foo</ref></nowiki>
<nowiki><ref>bar</nowiki>
baz<nowiki></ref></nowiki>
-!! html
-<p><ref>foo</ref>
-</p><p><ref>bar
-</p><p>baz</ref>
-</p>
!! end
#### --------------- Others ---------------
!! test
Escaping nowikis
-!! wikitext
-<nowiki>foo</nowiki>
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
<p><nowiki>foo</nowiki>
</p>
+!! wikitext
+<nowiki>foo</nowiki>
!! end
## The quote-char in the input is necessary for triggering the bug
!! test
(Bug 52035) Nowiki-escaping should not get tripped by " :" in text
!! options
-parsoid=wt2wt,html2wt
+parsoid=html2wt
+!! html/parsoid
+<p>foo's bar :</p>
!! wikitext
foo's bar :
-!! html
-<p>foo's bar :</p>
!! end
+#----------- End of wikitext escaping tests --------------
+
!! test
Tag-like HTML structures are passed through as text
)
);
$out = $fixture->normalizeException( $boom );
- $this->assertContains( '[Exception InvalidArgumentException]', $out );
- $this->assertContains( ', [Exception LengthException]', $out );
- $this->assertContains( ', [Exception LogicException]', $out );
- $this->assertNotContains( '[stacktrace]', $out );
+ $this->assertContains( "\n[Exception InvalidArgumentException]", $out );
+ $this->assertContains( "\nCaused by: [Exception LengthException]", $out );
+ $this->assertContains( "\nCaused by: [Exception LogicException]", $out );
+ $this->assertNotContains( "\n #0", $out );
}
/**
)
);
$out = $fixture->normalizeException( $boom );
- $this->assertContains( '[Exception InvalidArgumentException', $out );
- $this->assertContains( ', [Exception LengthException]', $out );
- $this->assertContains( ', [Exception LogicException]', $out );
- $this->assertContains( '[stacktrace]', $out );
+ $this->assertContains( "\n[Exception InvalidArgumentException]", $out );
+ $this->assertContains( "\nCaused by: [Exception LengthException]", $out );
+ $this->assertContains( "\nCaused by: [Exception LogicException]", $out );
+ $this->assertContains( "\n #0", $out );
}
}
dépôts / lhc / web / wiklou.git / commitdiff