From a94900fab00c6bb764f14e6db89bb0edc237f7af Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Sat, 19 Dec 2015 23:23:18 +0200 Subject: [PATCH] Fix transaction-duration-limit-exceeded * Fix the wording. * Add PLURAL support. Bug: T121821 Change-Id: I9cf27534a5b7a055a7c2544f6366dd0e40c5e9a3 --- includes/MediaWiki.php | 2 +- languages/i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php index fcd425d270..be0073d01e 100644 --- a/includes/MediaWiki.php +++ b/includes/MediaWiki.php @@ -548,7 +548,7 @@ class MediaWiki { if ( $limit > 0 && $time > $limit ) { throw new DBTransactionError( $db, - wfMessage( 'transaction-duration-limit-exceeded', $time, $limit )->plain() + wfMessage( 'transaction-duration-limit-exceeded', $time, $limit )->text() ); } } ); diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 60f6645282..5603100286 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -316,7 +316,7 @@ "databaseerror-query": "Query: $1", "databaseerror-function": "Function: $1", "databaseerror-error": "Error: $1", - "transaction-duration-limit-exceeded": "In order to avoid creating high replication lag, this transaction was aborted because the write duration ($1) exceeded the $2 second limit.\nIf you are changing many items at once, trying doing multiple smaller operations instead.", + "transaction-duration-limit-exceeded": "To avoid creating high replication lag, this transaction was aborted because the write duration ($1) exceeded the $2 {{PLURAL:$2|second|seconds}} limit.\nIf you are changing many items at once, try doing multiple smaller operations instead.", "laggedslavemode": "Warning: Page may not contain recent updates.", "readonly": "Database locked", "enterlockreason": "Enter a reason for the lock, including an estimate of when the lock will be released", -- 2.20.1