Tpt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/85413
Change subject: Merge branch 'gerrit/master' into pagePagesRefactoring
......................................................................
Merge branch 'gerrit/master' into pagePagesRefactoring
Change-Id: I07fe43e477f46b24fce3f87601727bacc22056bb
---
M ProofreadPage.body.php
M ProofreadPage.i18n.php
2 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage
refs/changes/13/85413/1
diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php
index f576415..01de00d 100644
--- a/ProofreadPage.body.php
+++ b/ProofreadPage.body.php
@@ -480,23 +480,11 @@
return true;
}
-<<<<<<< HEAD (2d37f8 Added the zoom library jquery-panzoom.)
//redirections
if ( $text !== null ) {
$rt = Title::newFromRedirectArray( $text );
if ( $rt ) {
return true;
-=======
- $username = $wgUser->getName();
- $page_regexp =
"/^<noinclude>(.*?)<\/noinclude>(.*?)<noinclude>(.*?)<\/noinclude>$/s";
- if( !preg_match( $page_regexp, $text, $m ) ) {
- self::loadIndex( $title );
- if ( $title->prpIndexPage !== null ) {
- list( $header, $footer, $css, $editWidth ) =
$title->prpIndexPage->getIndexDataForPage( $title );
- } else {
- $header = '';
- $footer = '';
->>>>>>> BRANCH (718314 Localisation updates from http://translatewiki.net.)
}
}
diff --git a/ProofreadPage.i18n.php b/ProofreadPage.i18n.php
index 690ecc5..524573b 100644
--- a/ProofreadPage.i18n.php
+++ b/ProofreadPage.i18n.php
@@ -89,11 +89,8 @@
'proofreadpage-indexoai-eprint-content-text' => 'Metadata of books
managed by ProofreadPage.',
'proofreadpage-indexoai-error-schemanotfound' => 'Schema not found',
'proofreadpage-indexoai-error-schemanotfound-text' => 'The $1 schema
have not been found.',
-<<<<<<< HEAD (2d37f8 Added the zoom library jquery-panzoom.)
'proofreadpage-toggle-headerfooter' => 'Toggle this area',
-=======
'proofreadpage-disambiguationspage' => 'Template:disambig',
->>>>>>> BRANCH (718314 Localisation updates from http://translatewiki.net.)
);
/** Message documentation (Message documentation)
@@ -194,14 +191,11 @@
'proofreadpage-indexoai-error-schemanotfound' => 'Title of the error
when a requested XML Schema does not exist.',
'proofreadpage-indexoai-error-schemanotfound-text' => 'Text of the
error when a requested XML schema does not exist. Parameters:
* $1 is name of the schema.',
-<<<<<<< HEAD (2d37f8 Added the zoom library jquery-panzoom.)
'proofreadpage-toggle-headerfooter' => 'Toggle the visibility of
header/footer input area',
-=======
'proofreadpage-disambiguationspage' => 'This message is the name of the
template used for marking disambiguation pages. It is used to find all pages
which link to disambiguation pages.
{{doc-important|Don\'t translate the "Template:" part!}}
{{Identical|Template:disambig}}',
->>>>>>> BRANCH (718314 Localisation updates from http://translatewiki.net.)
);
/** Achinese (Acèh)
--
To view, visit https://gerrit.wikimedia.org/r/85413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07fe43e477f46b24fce3f87601727bacc22056bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: pagePagesRefactoring
Gerrit-Owner: Tpt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
