jenkins-bot has submitted this change and it was merged.

Change subject: Update documentation for $wgExtensionMessagesFiles
......................................................................


Update documentation for $wgExtensionMessagesFiles

Follows-up e0043257c02e.

Change-Id: Id8212fca83fde09a89891ead1e0a107ff0d66398
(cherry picked from commit b67db3be8ef5cc9191c2dbdec8809af38596d06d)
---
M includes/DefaultSettings.php
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8b8d75c..f7936ec 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5992,13 +5992,13 @@
  *
  * Since MediaWiki 1.23, use of this variable to define messages is 
discouraged; instead, store
  * messages in JSON format and use $wgMessagesDirs. For setting other 
variables than
- * $messages, $wgExtensionMessagesFiles should still be used.
+ * $messages, $wgExtensionMessagesFiles should still be used. Use a DIFFERENT 
key because
+ * any entry having a key that also exists in $wgMessagesDirs will be ignored.
  *
- * If there is an entry in $wgMessagesDirs with the same key as one in
- * $wgExtensionMessagesFiles, then any $messages variables set in the 
$wgExtensionMessagesFiles file
- * will be ignored. This means an extension that only provides messages can be 
backwards compatible
- * by using both $wgExtensionMessagesFiles and $wgMessagesDirs, and only one 
of the two
- * will be used depending on what the version of MediaWiki supports.
+ * Extensions using the JSON message format can preserve backward 
compatibility with
+ * earlier versions of MediaWiki by using a compatibility shim, such as one 
generated
+ * by the generateJsonI18n.php maintenance script, listing it under the SAME 
key
+ * as for the $wgMessagesDirs entry.
  *
  * @par Example:
  * @code

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8212fca83fde09a89891ead1e0a107ff0d66398
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: MarkAHershberger <m...@nichework.com>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: PleaseStand <pleasest...@live.com>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to