MtDu has uploaded a new change for review. https://gerrit.wikimedia.org/r/267447
Change subject: Add GENDER support to some openstacker messages *addedto *failedtoadd ...................................................................... Add GENDER support to some openstacker messages *addedto *failedtoadd Bug: T99063 Change-Id: I0e4abc3e1c783140a3eb4a5991d007a14b38be98 --- M i18n/en.json M i18n/qqq.json M special/SpecialNovaProject.php M special/SpecialNovaRole.php 4 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager refs/changes/47/267447/1 diff --git a/i18n/en.json b/i18n/en.json index 32fbb8c..ed12684 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -210,8 +210,8 @@ "openstackmanager-deleteproject": "Delete", "openstackmanager-deletedproject": "Successfully deleted project.", "openstackmanager-deleteprojectfailed": "Failed to delete project.", - "openstackmanager-addedto": "Successfully added $1 to $2.", - "openstackmanager-failedtoadd": "Failed to add $1 to $2.", + "openstackmanager-addedto": "Successfully {{GENDER|$3:added}} $1 to $2.", + "openstackmanager-failedtoadd": "Failed to {{GENDER|$3:add}} $1 to $2.", "openstackmanager-setgroupmembers": "Successfully set group members for $1", "openstackmanager-failedtosetgroupmembers": "Failed to set group members for $1", "openstackmanager-removedfrom": "Successfully removed $1 from $2.", diff --git a/i18n/qqq.json b/i18n/qqq.json index 4ff2be2..41e3ccc 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -233,8 +233,8 @@ "openstackmanager-deleteproject": "Used as page title and as action link title, in Special:NovaProject.\n{{Identical|Delete}}", "openstackmanager-deletedproject": "Used as success message in Special:NovaProject.\n\nThis message indicates the project has been deleted successfully.\n\nSee also:\n* {{msg-mw|Openstackmanager-deleteprojectfailed}}", "openstackmanager-deleteprojectfailed": "Used as failure message in Special:NovaProject.\n\nThis message indicates the project has been failed to delete.\n\nSee also:\n* {{msg-mw|Openstackmanager-deletedproject}}", - "openstackmanager-addedto": "Used as success message in Special:NovaProject and Special:NovaRole.\n\nParameters:\n* $1 - member\n* $2 - project name or role name\n\nSee also:\n* {{msg-mw|Openstackmanager-failedtoadd}}", - "openstackmanager-failedtoadd": "Used as failure message in Special:NovaProject and Special:NovaRole.\n\nParameters:\n* $1 - member\n* $2 - project name or role name\n\nSee also:\n* {{msg-mw|Openstackmanager-addedto}}", + "openstackmanager-addedto": "Used as success message in Special:NovaProject and Special:NovaRole.\n\nParameters:\n* $1 - member\n* $2 - project name or role name\n* $3 - user's name, used for GENDER\n\nSee also:\n* {{msg-mw|Openstackmanager-failedtoadd}}", + "openstackmanager-failedtoadd": "Used as failure message in Special:NovaProject and Special:NovaRole.\n\nParameters:\n* $1 - member\n* $2 - project name or role name\n* $3 - user's name, used for GENDER\n\nSee also:\n* {{msg-mw|Openstackmanager-addedto}}", "openstackmanager-setgroupmembers": "Used as success message in [[Special:NovaServiceGroup]].\n\nParameters:\n* $1 - project name or role name", "openstackmanager-failedtosetgroupmembers": "Used as failure message in [[Special:NovaServiceGroup]].\n\nParameters:\n* $1 - project name or role name", "openstackmanager-removedfrom": "Used as success message in Special:NovaProject and Special:NovaRole.\n\nParameters:\n* $1 - member\n* $2 - project name or role name\n\nSee also:\n* {{msg-mw|Openstackmanager-failedtoremove}}", diff --git a/special/SpecialNovaProject.php b/special/SpecialNovaProject.php index f6532e8..322fb1a 100644 --- a/special/SpecialNovaProject.php +++ b/special/SpecialNovaProject.php @@ -461,7 +461,7 @@ foreach ( $members as $member ) { $user = User::newFromName( $member, 'usable' ); if ( !$user ) { - $this->getOutput()->addWikiMsg( 'openstackmanager-failedtoadd', $formData['member'], $formData['projectname'] ); + $this->getOutput()->addWikiMsg( 'openstackmanager-failedtoadd', $formData['member'], $formData['projectname'], $this->getUser()->getName() ); continue; } $success = $project->addMember( $member ); @@ -471,7 +471,7 @@ # successfully been added to a project $user->addGroup( 'shell' ); } - $this->getOutput()->addWikiMsg( 'openstackmanager-addedto', $formData['member'], $formData['projectname'] ); + $this->getOutput()->addWikiMsg( 'openstackmanager-addedto', $formData['member'], $formData['projectname'], $this->getUser()->getName() ); if ( class_exists( 'EchoEvent' ) ) { EchoEvent::create( array( 'type' => 'osm-projectmembers-add', diff --git a/special/SpecialNovaRole.php b/special/SpecialNovaRole.php index 0b25363..b72c410 100644 --- a/special/SpecialNovaRole.php +++ b/special/SpecialNovaRole.php @@ -204,9 +204,9 @@ foreach ( $members as $member ) { $success = $role->addMember( $member ); if ( $success ) { - $this->getOutput()->addWikiMsg( 'openstackmanager-addedto', $member, $formData['rolename'] ); + $this->getOutput()->addWikiMsg( 'openstackmanager-addedto', $member, $formData['rolename'], $this->getUser()->getName() ); } else { - $this->getOutput()->addWikiMsg( 'openstackmanager-failedtoadd', $member, $formData['rolename'] ); + $this->getOutput()->addWikiMsg( 'openstackmanager-failedtoadd', $member, $formData['rolename'], $this->getUser()->getName() ); } } $project->editArticle(); -- To view, visit https://gerrit.wikimedia.org/r/267447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e4abc3e1c783140a3eb4a5991d007a14b38be98 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenStackManager Gerrit-Branch: master Gerrit-Owner: MtDu <justin.d...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits