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

Change subject: Do not hardcode colons outside of translatable strings
......................................................................


Do not hardcode colons outside of translatable strings

Bug: T69375
Change-Id: I6d592bddb47ada1e221e3d6921a1b62484ee3e04
---
M Quiz.class.php
M i18n/en.json
2 files changed, 7 insertions(+), 8 deletions(-)

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



diff --git a/Quiz.class.php b/Quiz.class.php
index 7ffd842..06a65e0 100644
--- a/Quiz.class.php
+++ b/Quiz.class.php
@@ -137,13 +137,12 @@
                # Determine the content of the settings table.
                $settings = array_fill( 0, 4, '' );
                if( !$this->mDisplaySimple ) {
-                       // @todo FIXME: Hard coded colons below (a few times). 
Should be part of messages.
-                       $settings[0] .= '<td>' . wfMessage( 'quiz_addedPoints', 
$this->mAddedPoints )->escaped() . ':</td>' .
+                       $settings[0] .= '<td>' . wfMessage( 'quiz_addedPoints', 
$this->mAddedPoints )->escaped() . '</td>' .
                                                        "<td><input 
class=\"numerical\" type=\"text\" name=\"addedPoints\" 
value=\"$this->mAddedPoints\"/>&#160;&#160;</td>";
-                       $settings[1] .= '<td>' . wfMessage( 
'quiz_cutoffPoints', $this->mCutoffPoints )->escaped() . ':</td>' .
+                       $settings[1] .= '<td>' . wfMessage( 
'quiz_cutoffPoints', $this->mCutoffPoints )->escaped() . '</td>' .
                                                        "<td><input 
class=\"numerical\" type=\"text\" name=\"cutoffPoints\" 
value=\"$this->mCutoffPoints\"/></td>";
                        $bChecked = ( $this->mIgnoringCoef ) ? ' 
checked="checked"' : '';
-                       $settings[2] .= '<td>' . wfMessage( 'quiz_ignoreCoef' 
)->escaped() . ':</td>' .
+                       $settings[2] .= '<td>' . wfMessage( 'quiz_ignoreCoef' 
)->escaped() . '</td>' .
                                                        "<td><input 
type=\"checkbox\" name=\"ignoringCoef\"$bChecked/></td>";
                        if( $this->mShuffle && !$this->mBeingCorrected ) {
                                $settings[3] .= '<td><input class="shuffle" 
name="shuffleButton" type="button" value="' . wfMessage( 'quiz_shuffle' 
)->escaped() . '" style="display: none;"/></td>' .
diff --git a/i18n/en.json b/i18n/en.json
index 7792d03..cc96c3b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,9 +5,9 @@
                ]
        },
        "quiz_desc": "Allows creation of quizzes",
-       "quiz_addedPoints": "{{PLURAL:$1|Point|Points}} added for a correct 
answer",
-       "quiz_cutoffPoints": "{{PLURAL:$1|Point|Points}} for a wrong answer",
-       "quiz_ignoreCoef": "Ignore the questions' coefficients",
+       "quiz_addedPoints": "{{PLURAL:$1|Point|Points}} added for a correct 
answer:",
+       "quiz_cutoffPoints": "{{PLURAL:$1|Point|Points}} for a wrong answer:",
+       "quiz_ignoreCoef": "Ignore the questions' coefficients:",
        "quiz_shuffle": "Shuffle questions",
        "quiz_colorRight": "Right",
        "quiz_colorWrong": "Wrong",
@@ -17,4 +17,4 @@
        "quiz_score": "Your score is $1 / $2",
        "quiz_points": "$1 | {{PLURAL:$2|1 point|$2 points}}",
        "quiz_reset": "Reset"
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d592bddb47ada1e221e3d6921a1b62484ee3e04
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: JackPotte <[email protected]>
Gerrit-Reviewer: JackPotte <[email protected]>
Gerrit-Reviewer: Mvolz <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Shirayuki <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to