[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Prefer pages in the user's language in multilingual wikis

2016-10-12 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Prefer pages in the user's language in multilingual wikis
..


Prefer pages in the user's language in multilingual wikis

This currently is only applied to mediawikiwiki, but if someone comes up
with a list of appropriate places to apply it to we could do them too.

Bug: T68829
Change-Id: Iddeda848fe9e5cf988c065a6e4761a86a96f7f25
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 15 insertions(+), 0 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index 91f076a..cb0dc3f 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -234,6 +234,9 @@
 // Configure ICU Folding
 $wgCirrusSearchUseIcuFolding = $wmgCirrusSearchUseIcuFolding;
 
+// Prefer pages in user's language in multilingual wikis
+$wgCirrusSearchLanguageWeight = $wmgCirrusSearchLanguageWeight;
+
 # Load per realm specific configuration, either:
 # - CirrusSearch-labs.php
 # - CirrusSearch-production.php
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 42b358e..c4d11d5 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16688,6 +16688,18 @@
'enwiki' => false,
 ],
 
+'wmgCirrusSearchLanguageWeight' => [
+   'default' => [
+   'user' => 0.0,
+   'wiki' => 0,0,
+   ],
+   'mediawikiwiki' => [
+   'user' => 5.0,
+   'wiki' => 2.5,
+   ],
+],
+
+
 // Shard each wiki to be under 2gb per shard if possible.  Changing this for a 
wiki
 // requires an in place reindex.  Last full review 2014-07-01.  See
 // 
https://wikitech.wikimedia.org/wiki/Search/New#Estimating_the_number_of_shards_required

-- 
To view, visit https://gerrit.wikimedia.org/r/315532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddeda848fe9e5cf988c065a6e4761a86a96f7f25
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Prefer pages in the user's language in multilingual wikis

2016-10-12 Thread EBernhardson (Code Review)
EBernhardson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315532

Change subject: Prefer pages in the user's language in multilingual wikis
..

Prefer pages in the user's language in multilingual wikis

This currently is only applied to mediawikiwiki, but if someone comes up
with a list of appropriate places to apply it to we could do them too.

Bug: T68829
Change-Id: Iddeda848fe9e5cf988c065a6e4761a86a96f7f25
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 15 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/32/315532/1

diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index b7b3466..24c942d 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -483,6 +483,9 @@
 // Configure ICU Folding
 $wgCirrusSearchUseIcuFolding = $wmgCirrusSearchUseIcuFolding;
 
+// Prefer pages in user's language in multilingual wikis
+$wgCirrusSearchLanguageWeight = $wmgCirrusSearchLanguageWeight;
+
 # Load per realm specific configuration, either:
 # - CirrusSearch-labs.php
 # - CirrusSearch-production.php
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1d107fa..19cf04c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16627,6 +16627,18 @@
'default' => false,
 ],
 
+'wmgCirrusSearchLanguageWeight' => [
+   'default' => [
+   'user' => 0.0,
+   'wiki' => 0,0,
+   ],
+   'mediawikiwiki' => [
+   'user' => 5.0,
+   'wiki' => 2.5,
+   ],
+],
+
+
 // Shard each wiki to be under 2gb per shard if possible.  Changing this for a 
wiki
 // requires an in place reindex.  Last full review 2014-07-01.  See
 // 
https://wikitech.wikimedia.org/wiki/Search/New#Estimating_the_number_of_shards_required

-- 
To view, visit https://gerrit.wikimedia.org/r/315532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddeda848fe9e5cf988c065a6e4761a86a96f7f25
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits