Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187934
Change subject: Update Wikibase: Fixes for SpecialNewEntity and the anon edit
warning
......................................................................
Update Wikibase: Fixes for SpecialNewEntity and the anon edit warning
Change-Id: I7375b852d0a7f62693a6945fac9795581e374864
---
M composer.json
M composer.lock
M extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
M extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
6 files changed, 121 insertions(+), 106 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/34/187934/1
diff --git a/composer.json b/composer.json
index ec04fd6..ae04755 100644
--- a/composer.json
+++ b/composer.json
@@ -5,10 +5,6 @@
"repositories": [
{
"type": "vcs",
- "url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";
- },
- {
- "type": "vcs",
"url": "https://github.com/wmde/Wikidata.org.git";
},
{
diff --git a/composer.lock b/composer.lock
index 0389f79..42d4980 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "hash": "78aee201521d06be4f9ae0419cc000cf",
+ "hash": "b94985817934164f21c4fc0e2f178be0",
"packages": [
{
"name": "composer/installers",
@@ -1233,8 +1233,14 @@
"version": "dev-wmf/1.25wmf16",
"source": {
"type": "git",
- "url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "b524cfa4bc0c7df27bbbae36f233bd7c4af4d4a9"
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "fdecc8befeb84bb66094c619eaccdad77cf55858"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fdecc8befeb84bb66094c619eaccdad77cf55858";,
+ "reference": "fdecc8befeb84bb66094c619eaccdad77cf55858",
+ "shasum": ""
},
"require": {
"data-values/common": "~0.2.0",
@@ -1282,6 +1288,7 @@
"Wikibase\\Repo\\View\\": "repo/includes/View"
}
},
+ "notification-url": "https://packagist.org/downloads/";,
"license": [
"GPL-2.0+"
],
@@ -1299,11 +1306,7 @@
"wikibaserepo",
"wikidata"
],
- "support": {
- "issues": "https://bugzilla.wikimedia.org/";,
- "irc": "irc://irc.freenode.net/wikidata"
- },
- "time": "2015-01-23 13:06:12"
+ "time": "2015-01-31 22:50:24"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
b/extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
index d8254df..dbb9e77 100644
--- a/extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
+++ b/extensions/Wikibase/repo/includes/specials/SpecialNewEntity.php
@@ -41,6 +41,11 @@
protected $description = null;
/**
+ * @var Language
+ */
+ private $contentLanguage = null;
+
+ /**
* @var SummaryFormatter
*/
protected $summaryFormatter;
@@ -92,6 +97,8 @@
$out = $this->getOutput();
+ $uiLanguageCode = $this->getLanguage()->getCode();
+
if ( $this->getRequest()->wasPosted()
&& $this->getUser()->matchEditToken(
$this->getRequest()->getVal( 'token' ) ) ) {
@@ -102,7 +109,7 @@
if ( $status->isGood() ) {
$summary = new Summary( 'wbeditentity',
'create' );
- $summary->setLanguage(
$this->getLanguage()->getCode() );
+ $summary->setLanguage( $uiLanguageCode
);
$summary->addAutoSummaryArgs(
$this->label, $this->description );
$status = $this->saveEntity(
@@ -148,6 +155,7 @@
protected function prepareArguments() {
$this->label = $this->getRequest()->getVal( 'label', isset(
$this->parts[0] ) ? $this->parts[0] : '' );
$this->description = $this->getRequest()->getVal(
'description', isset( $this->parts[1] ) ? $this->parts[1] : '' );
+ $this->contentLanguage = Language::factory(
$this->getRequest()->getVal( 'lang', $this->getLanguage()->getCode() ) );
return true;
}
@@ -182,12 +190,12 @@
* @return Status
*/
protected function modifyEntity( Entity &$entity ) {
- $lang = $this->getLanguage()->getCode();
+ $contentLanguageCode = $this->contentLanguage->getCode();
if ( $this->label !== '' ) {
- $entity->setLabel( $lang, $this->label );
+ $entity->setLabel( $contentLanguageCode, $this->label );
}
if ( $this->description !== '' ) {
- $entity->setDescription( $lang, $this->description );
+ $entity->setDescription( $contentLanguageCode,
$this->description );
}
return \Status::newGood();
}
@@ -201,7 +209,12 @@
*/
protected function additionalFormElements() {
global $wgLang;
- return Html::element(
+ return
+ Html::hidden(
+ 'lang',
+ $this->contentLanguage->getCode()
+ )
+ . Html::element(
'label',
array(
'for' => 'wb-newentity-label',
@@ -217,11 +230,11 @@
'id' => 'wb-newentity-label',
'size' => 12,
'class' => 'wb-input',
- 'lang' => $wgLang->getCode(),
- 'dir' => $wgLang->getDir(),
+ 'lang' => $this->contentLanguage->getCode(),
+ 'dir' => $this->contentLanguage->getDir(),
'placeholder' => $this->msg(
'wikibase-label-edit-placeholder-language-aware',
- Language::fetchLanguageName(
$wgLang->getCode() )
+ Language::fetchLanguageName(
$this->contentLanguage->getCode() )
)->text(),
)
)
@@ -242,11 +255,11 @@
'id' => 'wb-newentity-description',
'size' => 36,
'class' => 'wb-input',
- 'lang' => $wgLang->getCode(),
- 'dir' => $wgLang->getDir(),
+ 'lang' => $this->contentLanguage->getCode(),
+ 'dir' => $this->contentLanguage->getDir(),
'placeholder' => $this->msg(
'wikibase-description-edit-placeholder-language-aware',
- Language::fetchLanguageName(
$wgLang->getCode() )
+ Language::fetchLanguageName(
$this->contentLanguage->getCode() )
)->text(),
)
)
diff --git a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
index fd8d932..4d59013 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
@@ -125,7 +125,7 @@
throw new Error( 'View for entity type ' +
entity.getType() + ' does not exist' );
}
- $entityview[entity.getType() + 'view']( {
+ $entityview[view]( {
value: entity,
languages: getUserLanguages(),
entityChangersFactory: entityChangersFactory,
@@ -148,10 +148,10 @@
mw.msg( 'pagetitle', label !== '' ? label :
mw.config.get( 'wgTitle' ) )
);
} )
- .on( 'entityviewafterstartediting', function() {
+ .on( view + 'afterstartediting', function() {
triggerAnonymousEditWarning( entity.getType() );
} )
- .on( 'entityviewafterstopediting', function( event, dropValue )
{
+ .on( view + 'afterstopediting', function( event, dropValue ) {
updateWatchLink( dropValue );
} );
}
diff --git a/vendor/composer/autoload_files.php
b/vendor/composer/autoload_files.php
index 51e312c..25187cc 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -22,6 +22,6 @@
$baseDir . '/extensions/ValueView/ValueView.php',
$vendorDir . '/data-values/data-types/DataTypes.php',
$vendorDir . '/data-values/validators/Validators.php',
- $baseDir . '/extensions/Wikibase/Wikibase.composer.php',
$baseDir . '/extensions/WikimediaBadges/WikimediaBadges.php',
+ $baseDir . '/extensions/Wikibase/Wikibase.composer.php',
);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index f67891d..fbc7f0a 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1107,85 +1107,6 @@
]
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.25wmf16",
- "version_normalized": "dev-wmf/1.25wmf16",
- "source": {
- "type": "git",
- "url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "b524cfa4bc0c7df27bbbae36f233bd7c4af4d4a9"
- },
- "require": {
- "data-values/common": "~0.2.0",
- "data-values/data-types": "~0.4.0",
- "data-values/data-values": "~1.0.0",
- "data-values/geo": "~1.0",
- "data-values/interfaces": "~0.1.4",
- "data-values/javascript": "~0.6.0",
- "data-values/number": "~0.4.0",
- "data-values/serialization": "~1.0",
- "data-values/time": "~0.6.0",
- "data-values/validators": "~0.1.0",
- "data-values/value-view": "~0.11.0",
- "diff/diff": "~1.0",
- "php": ">=5.3.2",
- "wikibase/data-model": "~2.5",
- "wikibase/data-model-javascript": "~1.0",
- "wikibase/data-model-serialization": "~1.2",
- "wikibase/easyrdf_lite": "~0.8.1",
- "wikibase/internal-serialization": "~1.3",
- "wikibase/javascript-api": "~1.0",
- "wikibase/serialization-javascript": "~2.0"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.23"
- },
- "time": "2015-01-13 10:02:43",
- "type": "mediawiki-extension",
- "installation-source": "source",
- "autoload": {
- "files": [
- "Wikibase.composer.php"
- ],
- "classmap": [
- "client/includes/",
- "client/WikibaseClient.hooks.php",
- "client/tests/phpunit/",
- "lib/includes/",
- "lib/WikibaseLib.hooks.php",
- "lib/tests/phpunit/",
- "repo/includes/",
- "repo/maintenance/",
- "repo/tests/phpunit/",
- "repo/Wikibase.hooks.php"
- ],
- "psr-4": {
- "Wikibase\\Repo\\View\\": "repo/includes/View"
- }
- },
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "The Wikidata team"
- }
- ],
- "description": "Structured data repository for MediaWiki",
- "homepage": "http://wikiba.se";,
- "keywords": [
- "wikibase",
- "wikibaseclient",
- "wikibaselib",
- "wikibaserepo",
- "wikidata"
- ],
- "support": {
- "issues": "https://bugzilla.wikimedia.org/";,
- "irc": "irc://irc.freenode.net/wikidata"
- }
- },
- {
"name": "wikibase/wikimedia-badges",
"version": "dev-master",
"version_normalized": "9999999-dev",
@@ -1397,5 +1318,87 @@
"wikibase",
"wikidata"
]
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.25wmf16",
+ "version_normalized": "dev-wmf/1.25wmf16",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "fdecc8befeb84bb66094c619eaccdad77cf55858"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fdecc8befeb84bb66094c619eaccdad77cf55858";,
+ "reference": "fdecc8befeb84bb66094c619eaccdad77cf55858",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/common": "~0.2.0",
+ "data-values/data-types": "~0.4.0",
+ "data-values/data-values": "~1.0.0",
+ "data-values/geo": "~1.0",
+ "data-values/interfaces": "~0.1.4",
+ "data-values/javascript": "~0.6.0",
+ "data-values/number": "~0.4.0",
+ "data-values/serialization": "~1.0",
+ "data-values/time": "~0.6.0",
+ "data-values/validators": "~0.1.0",
+ "data-values/value-view": "~0.11.0",
+ "diff/diff": "~1.0",
+ "php": ">=5.3.2",
+ "wikibase/data-model": "~2.5",
+ "wikibase/data-model-javascript": "~1.0",
+ "wikibase/data-model-serialization": "~1.2",
+ "wikibase/easyrdf_lite": "~0.8.1",
+ "wikibase/internal-serialization": "~1.3",
+ "wikibase/javascript-api": "~1.0",
+ "wikibase/serialization-javascript": "~2.0"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.23"
+ },
+ "time": "2015-01-31 22:50:24",
+ "type": "mediawiki-extension",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "Wikibase.composer.php"
+ ],
+ "classmap": [
+ "client/includes/",
+ "client/WikibaseClient.hooks.php",
+ "client/tests/phpunit/",
+ "lib/includes/",
+ "lib/WikibaseLib.hooks.php",
+ "lib/tests/phpunit/",
+ "repo/includes/",
+ "repo/maintenance/",
+ "repo/tests/phpunit/",
+ "repo/Wikibase.hooks.php"
+ ],
+ "psr-4": {
+ "Wikibase\\Repo\\View\\": "repo/includes/View"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "The Wikidata team"
+ }
+ ],
+ "description": "Structured data repository for MediaWiki",
+ "homepage": "http://wikiba.se";,
+ "keywords": [
+ "wikibase",
+ "wikibaseclient",
+ "wikibaselib",
+ "wikibaserepo",
+ "wikidata"
+ ]
}
]
--
To view, visit https://gerrit.wikimedia.org/r/187934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7375b852d0a7f62693a6945fac9795581e374864
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf16
Gerrit-Owner: Hoo man <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
