Nemo bis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189317
Change subject: Actually use PLURAL in mwe-upwiz-campaign-*-count-desc
......................................................................
Actually use PLURAL in mwe-upwiz-campaign-*-count-desc
Followup to ba4427c5cbe75f0ae924d058cbedd9a9a38967b3
Change-Id: I9fe0e8121efd7eeef7c3026eac17a306512ce292
---
M i18n/en.json
M i18n/qqq.json
M includes/CampaignPageFormatter.php
3 files changed, 21 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/17/189317/1
diff --git a/i18n/en.json b/i18n/en.json
index d19ad75..74581ed 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -232,8 +232,8 @@
"mwe-upwiz-dialog-title": "Warning",
"mwe-upwiz-campaign-create-account-button": "Create an account and
upload!",
"mwe-upwiz-campaign-upload-button": "Upload!",
- "mwe-upwiz-campaign-media-count-desc": "Uploads",
- "mwe-upwiz-campaign-contributors-count-desc": "Contributors",
+ "mwe-upwiz-campaign-media-count-desc": "{{PLURAL:$1|Upload|Uploads}}",
+ "mwe-upwiz-campaign-contributors-count-desc":
"{{PLURAL:$1|Contributor|Contributors}}",
"mwe-upwiz-campaign-view-all-media": "View all uploaded media",
"mwe-upwiz-campaign-no-uploads-yet": "No uploads yet!",
"mwe-upwiz-license-cc-by-sa-4.0": "Creative Commons Attribution
ShareAlike 4.0 ([$2 legal code])",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d66d165..6b1f174 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -255,8 +255,8 @@
"mwe-upwiz-dialog-title": "{{Identical|Warning}}",
"mwe-upwiz-campaign-create-account-button": "Text on button shown to
logged out users asking them to create an account and then upload media. Link
takes them to Create Account page",
"mwe-upwiz-campaign-upload-button": "Text on button shown to logged in
users asking them to upload media for this campaign\n{{Identical|Upload}}",
- "mwe-upwiz-campaign-media-count-desc": "Text shown under the number of
uploads this campaign has received\n{{Identical|Upload}}",
- "mwe-upwiz-campaign-contributors-count-desc": "Text shown under the
number of contributors this campaign has had\n{{Identical|Contributor}}",
+ "mwe-upwiz-campaign-media-count-desc": "Text shown under the number of
uploads this campaign has received\n\nParameters:\n* $1 - number of
uploads\n{{Identical|Upload}}",
+ "mwe-upwiz-campaign-contributors-count-desc": "Text shown under the
number of contributors this campaign has had\n\nParameters:\n* $1 - number of
contributors\n{{Identical|Contributor}}",
"mwe-upwiz-campaign-view-all-media": "Text on link to go to a page
showing all the uploads from the campaign so far",
"mwe-upwiz-campaign-no-uploads-yet": "Text shown when no media has been
uploaded yet for this campaign",
"mwe-upwiz-license-cc-by-sa-4.0":
"{{CreativeCommonsLicense|by-sa|4.0}}\nParameters:\n* $1 - (Unused) empty
string\n* $2 - the URL \"//creativecommons.org/licenses/by-sa/4.0/\"\nFor more
information, see
https://www.mediawiki.org/wiki/UploadWizard\n{{Related|Mwe-upwiz-license-cc}}",
diff --git a/includes/CampaignPageFormatter.php
b/includes/CampaignPageFormatter.php
index 9597c19..a60b2b2 100644
--- a/includes/CampaignPageFormatter.php
+++ b/includes/CampaignPageFormatter.php
@@ -89,17 +89,23 @@
}
if ( UploadWizardConfig::getSetting(
'campaignExpensiveStatsEnabled' ) === true ) {
+ $uploaderCount =
$this->campaign->getTotalContributorsCount();
$campaignExpensiveStats =
Html::rawElement( 'div', array( 'class' =>
'mw-campaign-number-container' ),
Html::element( 'div', array( 'class' =>
'mw-campaign-number' ),
-
$this->context->getLanguage()->formatNum(
$this->campaign->getTotalContributorsCount() ) ) .
- Html::element( 'span', array( 'class'
=> 'mw-campaign-number-desc' ), wfMessage(
'mwe-upwiz-campaign-contributors-count-desc')->plain() )
+
$this->context->getLanguage()->formatNum( $uploaderCount ) ) .
+ Html::element( 'span',
+ array( 'class' =>
'mw-campaign-number-desc' ),
+ wfMessage(
'mwe-upwiz-campaign-contributors-count-desc')
+ ->numParams( $uploaderCount )
+ ->text()
+ )
);
} else {
$campaignExpensiveStats = '';
}
-
+ $uploadCount = $this->campaign->getUploadedMediaCount();
$result =
Html::rawElement( 'div', array( 'id' =>
'mw-campaign-container' ),
Html::rawElement( 'div', array( 'id' =>
'mw-campaign-header' ),
@@ -114,8 +120,14 @@
$campaignExpensiveStats .
Html::rawElement( 'div', array(
'class' => 'mw-campaign-number-container' ),
Html::element( 'div',
array( 'class' => 'mw-campaign-number' ),
-
$this->context->getLanguage()->formatNum(
$this->campaign->getUploadedMediaCount() ) ) .
- Html::element( 'span',
array( 'class' => 'mw-campaign-number-desc' ), wfMessage(
'mwe-upwiz-campaign-media-count-desc')->text() )
+
$this->context->getLanguage()->formatNum( $uploadCount )
+ ) .
+ Html::element( 'span',
+ array( 'class'
=> 'mw-campaign-number-desc' ),
+ wfMessage(
'mwe-upwiz-campaign-media-count-desc')
+ ->numParams(
$uploadCount )
+ ->text()
+ )
)
)
) .
--
To view, visit https://gerrit.wikimedia.org/r/189317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fe0e8121efd7eeef7c3026eac17a306512ce292
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Nemo bis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
