Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113799
Change subject: Don't display Babel-0 languages the user doesn't understand
......................................................................
Don't display Babel-0 languages the user doesn't understand
Related to (but not a fix for) bug 61446.
Bug 61446
Change-Id: I3f628d7134b393152d1ccb36a691a5eafee38e91
---
M repo/includes/UserLanguageLookup.php
M repo/resources/wikibase.ui.initTermBox.js
2 files changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/99/113799/1
diff --git a/repo/includes/UserLanguageLookup.php
b/repo/includes/UserLanguageLookup.php
index 3978b4b..5645770 100644
--- a/repo/includes/UserLanguageLookup.php
+++ b/repo/includes/UserLanguageLookup.php
@@ -39,9 +39,12 @@
// if the Babel extension is installed, grab the languages from
the user's babel box
if ( class_exists( 'Babel' ) && ( !$user->isAnon() ) ) {
- $languages = array_merge( $languages,
\Babel::getUserLanguages( $user ) );
+ $minLevel = 1;
+ $languages = array_merge( $languages,
\Babel::getUserLanguages( $user, $minLevel ) );
}
+ // TODO: There needs to be a way to distinguish between users
with and without a Babel box,
+ // see wikibase.ui.initTermBox.js.
$languages = array_diff( $languages, $skip );
$languages = array_unique( $languages );
diff --git a/repo/resources/wikibase.ui.initTermBox.js
b/repo/resources/wikibase.ui.initTermBox.js
index 0093a3f..1bf51d6 100644
--- a/repo/resources/wikibase.ui.initTermBox.js
+++ b/repo/resources/wikibase.ui.initTermBox.js
@@ -14,6 +14,9 @@
$termBoxRows = $( 'tr.wb-terms-label,
tr.wb-terms-description' ),
ulsIsDefined = mw.uls !== undefined && $.uls !==
undefined && $.uls.data !== undefined;
+ // TODO: This shouldn't be done if the user does have a Babel
box with a single language
+ // that's skipped.
+ // TODO: Try to refactor and split this into methods.
if( $termBoxRows.length === 0 && ulsIsDefined ) {
// No term box present; Ask ULS to provide languages
and generate plain HTML:
var languageCodes = mw.uls.getFrequentLanguageList(),
@@ -27,6 +30,7 @@
}
var $sectionHeading = addTermBoxSection();
+ // TODO: Constants 1 and 4 aren't described at all, try
to refactor this.
$sectionHeading.after( renderTermBox( title, wb.entity,
languageCodes.slice( 1, 4 ) ) );
$termBoxRows = $( 'tr.wb-terms-label,
tr.wb-terms-description' );
--
To view, visit https://gerrit.wikimedia.org/r/113799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f628d7134b393152d1ccb36a691a5eafee38e91
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
