From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 2 Apr 2016 12:08:56 +0000 (+0000)
Subject: Merge "Show time left until block expiry in BlockListPager"
X-Git-Tag: 1.31.0-rc.0~7420
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=a46cc763792f458816bf2cfd6c48125c97b96ad3;hp=96d6dc23432a278478c2cfec05e9f83a53890264;p=lhc%2Fweb%2Fwiklou.git

Merge "Show time left until block expiry in BlockListPager"
---

diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 580f7ccb19..74c2997525 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -289,8 +289,10 @@ class SiteStatsInit {
 	public function __construct( $database = false ) {
 		if ( $database instanceof IDatabase ) {
 			$this->db = $database;
+		} elseif ( $database ) {
+			$this->db = wfGetDB( DB_MASTER );
 		} else {
-			$this->db = wfGetDB( $database ? DB_MASTER : DB_SLAVE );
+			$this->db = wfGetDB( DB_SLAVE, 'vslow' );
 		}
 	}
 
diff --git a/resources/Resources.php b/resources/Resources.php
index 0f3d70b480..6992de1411 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -436,6 +436,8 @@ return [
 			'ca' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-ca.js',
 			'cs' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-cs.js',
 			'da' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-da.js',
+			'de-at' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-AT.js',
+			'de-ch' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-CH.js',
 			'de' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de.js',
 			'el' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-el.js',
 			'en-au' => 'resources/lib/jquery.ui/i18n/jquery.ui.datepicker-en-AU.js',
diff --git a/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-AT.js b/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-AT.js
new file mode 100644
index 0000000000..456c3a0552
--- /dev/null
+++ b/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-AT.js
@@ -0,0 +1,22 @@
+/* Austrian German initialisation for the jQuery UI date picker plugin. */
+jQuery(function($){
+	$.datepicker.regional['de-AT'] = {
+		closeText: 'schließen',
+		prevText: '&#x3C;zurück',
+		nextText: 'Vor&#x3E;',
+		currentText: 'heute',
+		monthNames: ['Jänner','Februar','März','April','Mai','Juni',
+		'Juli','August','September','Oktober','November','Dezember'],
+		monthNamesShort: ['Jän','Feb','Mär','Apr','Mai','Jun',
+		'Jul','Aug','Sep','Okt','Nov','Dez'],
+		dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
+		dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		weekHeader: 'KW',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['de-AT']);
+});
diff --git a/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-CH.js b/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-CH.js
new file mode 100644
index 0000000000..60cbc29f37
--- /dev/null
+++ b/resources/lib/jquery.ui/i18n/jquery.ui.datepicker-de-CH.js
@@ -0,0 +1,22 @@
+/* Swiss Standard German initialisation for the jQuery UI date picker plugin. */
+jQuery(function($){
+	$.datepicker.regional['de-CH'] = {
+		closeText: 'schliessen',
+		prevText: '&#x3C;zurück',
+		nextText: 'Vor&#x3E;',
+		currentText: 'heute',
+		monthNames: ['Januar','Februar','März','April','Mai','Juni',
+		'Juli','August','September','Oktober','November','Dezember'],
+		monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',
+		'Jul','Aug','Sep','Okt','Nov','Dez'],
+		dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
+		dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		weekHeader: 'KW',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['de-CH']);
+});