jenkins-bot has submitted this change and it was merged.
Change subject: Do not pass empty language parameter to the
CrossLanguageTranslationSearchQuery.
......................................................................
Do not pass empty language parameter to the CrossLanguageTranslationSearchQuery.
Pass the interface language to CrossLanguageTranslationSearchQuery
when the language parameter is empty.
Bug: T115478
Change-Id: I923f9a12cf88bf00426263231dd8bd67ae844ace
Followup-id: I584fb2a38d7d42c3ff0ddcfeda8222fb370cff37
---
M resources/js/ext.translate.special.searchtranslations.js
M specials/SpecialSearchTranslations.php
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Nikerabbit: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.searchtranslations.js
b/resources/js/ext.translate.special.searchtranslations.js
index 92536f7..560e249 100644
--- a/resources/js/ext.translate.special.searchtranslations.js
+++ b/resources/js/ext.translate.special.searchtranslations.js
@@ -99,7 +99,7 @@
if ( currentLanguage !== '' ) {
uri = new mw.Uri( location.href );
- uri.extend( { language: '' } );
+ uri.extend( { language: '', filter: '' } );
addToSelectedBox( getLanguageLabel( currentLanguage ),
uri.toString() );
}
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index bfd4c74..55f8ee2 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -90,15 +90,15 @@
return;
}
- $params = $opts->getAllValues();
+ $options = $params = $opts->getAllValues();
$filter = $opts->getValue( 'filter' );
try {
- $translationSearch = new
CrossLanguageTranslationSearchQuery( $params, $server );
+ if ( $opts->getValue( 'language' ) === '' ) {
+ $options['language'] =
$this->getLanguage()->getCode();
+ }
+ $translationSearch = new
CrossLanguageTranslationSearchQuery( $options, $server );
if ( in_array( $filter,
$translationSearch->getAvailableFilters() ) ) {
- if ( $opts->getValue( 'language' ) === '' ) {
- $params['language'] =
$this->getLanguage()->getCode();
- $opts->setValue( 'language',
$params['language'] );
- }
+ $opts->setValue( 'language',
$options['language'] );
$documents = $translationSearch->getDocuments();
$total = $translationSearch->getTotalHits();
$resultset = $translationSearch->getResultSet();
--
To view, visit https://gerrit.wikimedia.org/r/246156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I923f9a12cf88bf00426263231dd8bd67ae844ace
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Phoenix303 <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Phoenix303 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
