Merge "Make 'quotation-marks' message non-optional"

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 4931944..1cc20b9 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4652,7 +4652,7 @@ Please confirm that you really want to recreate this page.",
 'percent'             => '$1%', # only translate this message to other languages if you have to change it
 'parentheses'         => '($1)', # only translate this message to other languages if you have to change it
 'brackets'            => '[$1]', # only translate this message to other languages if you have to change it
-'quotation-marks'     => '"$1"', # only translate this message to other languages if you have to change it
+'quotation-marks'     => '"$1"',
 
 # Multipage image navigation
 'imgmultipageprev' => '← previous page',

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index b42e5af..f6e2f6d 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -9559,7 +9559,9 @@ Most languages use a space, but some Asian languages, such as Thai and Chinese,
 'percent' => '{{optional}}',
 'parentheses' => '{{optional}}',
 'brackets' => '{{Optional}}',
-'quotation-marks' => '{{optional}}',
+'quotation-marks' => 'Quotation marks, for citing, sometimes titles etc., depending on the language.
+
+See: https://en.wikipedia.org/wiki/Non-English_usage_of_quotation_marks',
 
 # Multipage image navigation
 'imgmultipageprev' => '{{Identical|Previous page}}',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 4e9ce40..267666d 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -456,7 +456,6 @@ $wgOptionalMessages = array(
        'percent',
        'parentheses',
        'brackets',
-       'quotation-marks',
        'listgrouprights-right-display',
        'listgrouprights-right-revoked',
        'timezone-utc',