Thiemo Mättig (WMDE) has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/329596 )
Change subject: Update composer.json to use DataTypes 1.0.0 ...................................................................... Update composer.json to use DataTypes 1.0.0 This requires a 1.0.0 release of the DataTypes component, including these two patches: https://github.com/wmde/DataTypes/pull/63 https://github.com/wmde/DataTypes/pull/62 Change-Id: Id95bdc6f12014f6b50c103debb3257b6907008e6 --- M composer.json M repo/includes/DataTypeSelector.php M view/src/PropertyView.php 3 files changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/96/329596/1 diff --git a/composer.json b/composer.json index ff6f467..ac18ca5 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "data-values/number": "~0.8.2", "data-values/time": "~0.8.4", "data-values/validators": "~0.1.0", - "data-values/data-types": "~0.5.0", + "data-values/data-types": "~1.0", "data-values/serialization": "~1.1", "data-values/javascript": "~0.8.3", "data-values/value-view": "~0.18.0", diff --git a/repo/includes/DataTypeSelector.php b/repo/includes/DataTypeSelector.php index 920f646..1028346 100644 --- a/repo/includes/DataTypeSelector.php +++ b/repo/includes/DataTypeSelector.php @@ -61,7 +61,8 @@ $byId = []; foreach ( $this->dataTypes as $dataType ) { - $label = $dataType->getLabel( $this->languageCode ); + $label = wfMessage( $dataType->getMessageKey() )->inLanguage( $this->languageCode ) + ->text(); $id = $dataType->getId(); $byLabel[$label] = $id; diff --git a/view/src/PropertyView.php b/view/src/PropertyView.php index 3802453..6a83c75 100644 --- a/view/src/PropertyView.php +++ b/view/src/PropertyView.php @@ -99,19 +99,17 @@ * @return string HTML */ private function getHtmlForDataType( $propertyType ) { - $html = $this->templateFactory->render( 'wb-section-heading', htmlspecialchars( $this->textProvider->get( 'wikibase-propertypage-datatype' ) ), 'datatype', 'wikibase-propertypage-datatype' ); - $dataTypeLabelHtml = ''; try { $dataType = $this->dataTypeFactory->getType( $propertyType ); - $dataTypeLabelHtml = htmlspecialchars( $dataType->getLabel( $this->languageCode ) ); + $dataTypeLabelHtml = htmlspecialchars( $this->textProvider->get( $dataType->getMessageKey() ) ); } catch ( OutOfBoundsException $ex ) { - $dataTypeLabelHtml .= '<span class="error">' . + $dataTypeLabelHtml = '<span class="error">' . htmlspecialchars( $this->textProvider->get( 'wikibase-propertypage-bad-datatype', [ $propertyType ] ) ) . '</span>'; } -- To view, visit https://gerrit.wikimedia.org/r/329596 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id95bdc6f12014f6b50c103debb3257b6907008e6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
