Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/181994
Change subject: Split time and date ...................................................................... Split time and date Per https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Ajaxpoll-your-vote/en Change-Id: If393af3cbed3514f973b16b05635c4860fb52d25 --- M AJAXPoll_body.php M i18n/en.json M i18n/qqq.json 3 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AJAXPoll refs/changes/94/181994/1 diff --git a/AJAXPoll_body.php b/AJAXPoll_body.php index 0220ecf..0f23a23 100644 --- a/AJAXPoll_body.php +++ b/AJAXPoll_body.php @@ -333,10 +333,13 @@ ); if ( $row = $dbr->fetchRow( $q ) ) { + $ts = wfTimestamp( TS_MW, $row[1] ); $ourLastVoteDate = wfMessage( 'ajaxpoll-your-vote', $lines[$row[0] - 1], - $wgLang->timeanddate( wfTimestamp( TS_MW, $row[1] ), true /* adjust? */ ) + $wgLang->timeanddate( $ts, true /* adjust? */ ), + $wgLang->date( $ts, true /* adjust? */ ), + $wgLang->time( $ts, true /* adjust? */ ) )->escaped(); $userVoted = true; } diff --git a/i18n/en.json b/i18n/en.json index 803970b..06bb31c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -12,7 +12,7 @@ "ajaxpoll-vote-add": "Your vote has been added.", "ajaxpoll-vote-error": "There was a problem with processing your vote, please try again.", "ajaxpoll-percent-votes": "$1% of all votes", - "ajaxpoll-your-vote": "You voted for \"$1\" on $2. You can change your vote by clicking a different answer below.", + "ajaxpoll-your-vote": "You voted for \"$1\" on $3 at $4. You can change your vote by clicking a different answer below.", "ajaxpoll-no-vote": "Please vote below.", "ajaxpoll-no-vote-results-after-voting": "Please vote below. Results will be shown when you have voted.", "ajaxpoll-info": "There {{PLURAL:$1|was one vote|were $1 votes}} since the poll was created on $2.", diff --git a/i18n/qqq.json b/i18n/qqq.json index f9168a7..ee0e0ac 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -13,7 +13,7 @@ "ajaxpoll-vote-add": "System response that the vote was successfully added.\n\nIf error, the following message is used:\n* {{msg-mw|Ajaxpoll-vote-error}}", "ajaxpoll-vote-error": "Used as error message.\n\nIf successful, the following message are used:\n* {{msg-mw|Ajaxpoll-vote-update}}\n* {{msg-mw|Ajaxpoll-vote-add}}\n* {{msg-mw|Ajaxpoll-vote-revoked}}", "ajaxpoll-percent-votes": "Parameters:\n* $1 - the percentage number of the votes", - "ajaxpoll-your-vote": "Parameters:\n* $1 - the answer name\n* $2 - the time/date when the answer was posted", + "ajaxpoll-your-vote": "Parameters:\n* $1 - the answer name\n* $2 - unused\n* $3 - date\n* $4 - time", "ajaxpoll-no-vote": "Used if there are no votes.\n\nSee also:\n* {{msg-mw|Ajaxpoll-revoke-vote}}", "ajaxpoll-no-vote-results-after-voting": "Invitation to vote and indication that results will be shown after voting.", "ajaxpoll-info": "Parameters:\n* $1 - the number of votes\n* $2 - the time and date when the poll was started", -- To view, visit https://gerrit.wikimedia.org/r/181994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If393af3cbed3514f973b16b05635c4860fb52d25 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AJAXPoll Gerrit-Branch: master Gerrit-Owner: Siebrand <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
