| Index: trunk/extensions/OpenStackManager/SpecialNovaInstance.php |
| — | — | @@ -227,7 +227,7 @@ |
| 228 | 228 | 'section' => 'instance/puppetinfo', |
| 229 | 229 | 'options' => $classes, |
| 230 | 230 | 'default' => $defaults, |
| 231 | | - 'label-message' => 'puppetclasses', |
| | 231 | + 'label-message' => 'openstackmanager-puppetclasses', |
| 232 | 232 | ); |
| 233 | 233 | } |
| 234 | 234 | |
| — | — | @@ -252,7 +252,7 @@ |
| 253 | 253 | 'default' => 'configure', |
| 254 | 254 | ); |
| 255 | 255 | |
| 256 | | - $instanceForm = new SpecialNovaInstanceForm( $instanceInfo, 'novainstance-form' ); |
| | 256 | + $instanceForm = new SpecialNovaInstanceForm( $instanceInfo, 'openstackmanager-novainstance' ); |
| 257 | 257 | $instanceForm->setTitle( SpecialPage::getTitleFor( 'NovaInstance' ) ); |
| 258 | 258 | $instanceForm->setSubmitID( 'novainstance-form-configureinstancesubmit' ); |
| 259 | 259 | $instanceForm->setSubmitCallback( array( $this, 'tryConfigureSubmit' ) ); |
| — | — | @@ -270,7 +270,7 @@ |
| 271 | 271 | $instanceid = $wgRequest->getText( 'instanceid' ); |
| 272 | 272 | $project = $wgRequest->getText( 'project' ); |
| 273 | 273 | if ( ! $wgRequest->wasPosted() ) { |
| 274 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-deleteinstancequestion', $instanceid ) ); |
| | 274 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-deleteinstancequestion', array(), $instanceid ) ); |
| 275 | 275 | $wgOut->addHTML( $out ); |
| 276 | 276 | } |
| 277 | 277 | $instanceInfo = Array(); |
| — | — | @@ -286,7 +286,7 @@ |
| 287 | 287 | 'type' => 'hidden', |
| 288 | 288 | 'default' => 'delete', |
| 289 | 289 | ); |
| 290 | | - $instanceForm = new SpecialNovaInstanceForm( $instanceInfo, 'novainstance-form' ); |
| | 290 | + $instanceForm = new SpecialNovaInstanceForm( $instanceInfo, 'openstackmanager-novainstance' ); |
| 291 | 291 | $instanceForm->setTitle( SpecialPage::getTitleFor( 'NovaInstance' ) ); |
| 292 | 292 | $instanceForm->setSubmitID( 'novainstance-form-deleteinstancesubmit' ); |
| 293 | 293 | $instanceForm->setSubmitCallback( array( $this, 'tryDeleteSubmit' ) ); |
| — | — | @@ -332,19 +332,22 @@ |
| 333 | 333 | $instanceOut .= Html::element( 'td', array(), $instance->getInstanceType() ); |
| 334 | 334 | $instanceOut .= Html::element( 'td', array(), $instance->getInstancePrivateIP() ); |
| 335 | 335 | $instanceOut .= Html::element( 'td', array(), $instance->getImageId() ); |
| 336 | | - $actions = $sk->link( $this->getTitle(), 'delete', array(), |
| | 336 | + $msg = wfMsg( 'openstackmanager-delete' ); |
| | 337 | + $actions = $sk->link( $this->getTitle(), $msg, array(), |
| 337 | 338 | array( 'action' => 'delete', |
| 338 | 339 | 'project' => $project, |
| 339 | 340 | 'instanceid' => $instance->getInstanceId() ), |
| 340 | 341 | array() ); |
| 341 | 342 | $actions .= ', '; |
| 342 | | - $actions .= $sk->link( $this->getTitle(), 'rename', array(), |
| | 343 | + $msg = wfMsg( 'openstackmanager-rename' ); |
| | 344 | + $actions .= $sk->link( $this->getTitle(), $msg, array(), |
| 343 | 345 | array( 'action' => 'rename', |
| 344 | 346 | 'project' => $project, |
| 345 | 347 | 'instanceid' => $instance->getInstanceId() ), |
| 346 | 348 | array() ); |
| 347 | 349 | $actions .= ', '; |
| 348 | | - $actions .= $sk->link( $this->getTitle(), 'configure', array(), |
| | 350 | + $msg = wfMsg( 'openstackmanager-configure' ); |
| | 351 | + $actions .= $sk->link( $this->getTitle(), $msg, array(), |
| 349 | 352 | array( 'action' => 'configure', |
| 350 | 353 | 'project' => $project, |
| 351 | 354 | 'instanceid' => $instance->getInstanceId() ), |
| — | — | @@ -398,7 +401,7 @@ |
| 399 | 402 | $title = Title::newFromText( $wgOut->getPageTitle() ); |
| 400 | 403 | $job = new OpenStackNovaHostJob( $title, array( 'instanceid' => (string)$instance->getInstanceId() ) ); |
| 401 | 404 | $job->insert(); |
| 402 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-createdinstance', |
| | 405 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-createdinstance', array(), |
| 403 | 406 | $instance->getInstanceID(), $instance->getImageId(), |
| 404 | 407 | $host->getFullyQualifiedHostName() ) ); |
| 405 | 408 | } else { |
| — | — | @@ -430,9 +433,9 @@ |
| 431 | 434 | if ( $success ) { |
| 432 | 435 | $success = OpenStackNovaHost::deleteHostByInstanceId( $instanceid ); |
| 433 | 436 | if ( $success ) { |
| 434 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-deletedinstance', $instanceid ) ); |
| | 437 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-deletedinstance', array(), $instanceid ) ); |
| 435 | 438 | } else { |
| 436 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-deletedinstance-faileddns', $instancename, $instanceid ) ); |
| | 439 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-deletedinstance-faileddns', array(), $instancename, $instanceid ) ); |
| 437 | 440 | } |
| 438 | 441 | } else { |
| 439 | 442 | $out = Html::element( 'p', array(), wfMsg( 'openstackmanager-deleteinstancefailed' ) ); |
| Index: trunk/extensions/OpenStackManager/SpecialNovaProject.php |
| — | — | @@ -61,7 +61,7 @@ |
| 62 | 62 | $projectInfo = Array(); |
| 63 | 63 | $projectInfo['projectname'] = array( |
| 64 | 64 | 'type' => 'text', |
| 65 | | - 'label-message' => 'projectname', |
| | 65 | + 'label-message' => 'openstackmanager-projectname', |
| 66 | 66 | 'default' => '', |
| 67 | 67 | 'section' => 'project/info', |
| 68 | 68 | ); |
| — | — | @@ -71,7 +71,7 @@ |
| 72 | 72 | 'default' => 'create', |
| 73 | 73 | ); |
| 74 | 74 | |
| 75 | | - $projectForm = new SpecialNovaProjectForm( $projectInfo, 'novaprojectform' ); |
| | 75 | + $projectForm = new SpecialNovaProjectForm( $projectInfo, 'openstackmanager-novaproject' ); |
| 76 | 76 | $projectForm->setTitle( SpecialPage::getTitleFor( 'NovaProject' ) ); |
| 77 | 77 | $projectForm->setSubmitID( 'novaproject-form-createprojectsubmit' ); |
| 78 | 78 | $projectForm->setSubmitCallback( array( $this, 'tryCreateSubmit' ) ); |
| — | — | @@ -90,7 +90,7 @@ |
| 91 | 91 | $projectInfo = Array(); |
| 92 | 92 | $projectInfo['member'] = array( |
| 93 | 93 | 'type' => 'text', |
| 94 | | - 'label-message' => 'member', |
| | 94 | + 'label-message' => 'openstackmanager-member', |
| 95 | 95 | 'default' => '', |
| 96 | 96 | 'section' => 'project/info', |
| 97 | 97 | ); |
| — | — | @@ -103,7 +103,7 @@ |
| 104 | 104 | 'default' => $project, |
| 105 | 105 | ); |
| 106 | 106 | |
| 107 | | - $projectForm = new SpecialNovaProjectForm( $projectInfo, 'novaprojectform' ); |
| | 107 | + $projectForm = new SpecialNovaProjectForm( $projectInfo, 'openstackmanager-novaproject' ); |
| 108 | 108 | $projectForm->setTitle( SpecialPage::getTitleFor( 'NovaProject' ) ); |
| 109 | 109 | $projectForm->setSubmitID( 'novaproject-form-addmembersubmit' ); |
| 110 | 110 | $projectForm->setSubmitCallback( array( $this, 'tryAddMemberSubmit' ) ); |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | $member = $wgRequest->getText( 'member' ); |
| 123 | 123 | $project = $wgRequest->getText( 'projectname' ); |
| 124 | 124 | if ( ! $wgRequest->wasPosted() ) { |
| 125 | | - $out .= Html::element( 'p', array(), wfMsgExt( 'openstackmanager-removememberconfirm', $member, $project ) ); |
| | 125 | + $out .= Html::element( 'p', array(), wfMsgExt( 'openstackmanager-removememberconfirm', array(), $member, $project ) ); |
| 126 | 126 | $wgOut->addHTML( $out ); |
| 127 | 127 | } |
| 128 | 128 | $projectInfo = Array(); |
| — | — | @@ -138,7 +138,7 @@ |
| 139 | 139 | 'default' => $project, |
| 140 | 140 | ); |
| 141 | 141 | |
| 142 | | - $projectForm = new SpecialNovaProjectForm( $projectInfo, 'novaprojectform' ); |
| | 142 | + $projectForm = new SpecialNovaProjectForm( $projectInfo, 'openstackmanager-novaproject' ); |
| 143 | 143 | $projectForm->setTitle( SpecialPage::getTitleFor( 'NovaProject' ) ); |
| 144 | 144 | $projectForm->setSubmitID( 'novaproject-form-deletemembersubmit' ); |
| 145 | 145 | $projectForm->setSubmitCallback( array( $this, 'tryDeleteMemberSubmit' ) ); |
| — | — | @@ -155,7 +155,7 @@ |
| 156 | 156 | |
| 157 | 157 | $project = $wgRequest->getText( 'projectname' ); |
| 158 | 158 | if ( ! $wgRequest->wasPosted() ) { |
| 159 | | - $out .= Html::element( 'p', array(), wfMsgExt( 'openstackmanager-removeprojectconfirm', $project ) ); |
| | 159 | + $out .= Html::element( 'p', array(), wfMsgExt( 'openstackmanager-removeprojectconfirm', array(), $project ) ); |
| 160 | 160 | $wgOut->addHTML( $out ); |
| 161 | 161 | } |
| 162 | 162 | $projectInfo = Array(); |
| — | — | @@ -167,7 +167,7 @@ |
| 168 | 168 | 'type' => 'hidden', |
| 169 | 169 | 'default' => 'delete', |
| 170 | 170 | ); |
| 171 | | - $projectForm = new SpecialNovaProjectForm( $projectInfo, 'novaproject-form' ); |
| | 171 | + $projectForm = new SpecialNovaProjectForm( $projectInfo, 'openstackmanager-novaproject' ); |
| 172 | 172 | $projectForm->setTitle( SpecialPage::getTitleFor( 'NovaProject' ) ); |
| 173 | 173 | $projectForm->setSubmitID( 'novaproject-form-deleteprojectsubmit' ); |
| 174 | 174 | $projectForm->setSubmitCallback( array( $this, 'tryDeleteSubmit' ) ); |
| — | — | @@ -186,9 +186,9 @@ |
| 187 | 187 | $out = ''; |
| 188 | 188 | $sk = $wgUser->getSkin(); |
| 189 | 189 | $out .= $sk->link( $this->getTitle(), wfMsg( 'openstackmanager-createproject' ), array(), array( 'action' => 'create' ), array() ); |
| 190 | | - $projectsOut = Html::element( 'th', array(), 'Project name' ); |
| 191 | | - $projectsOut .= Html::element( 'th', array(), 'Members' ); |
| 192 | | - $projectsOut .= Html::element( 'th', array(), 'Action' ); |
| | 190 | + $projectsOut = Html::element( 'th', array(), wfMsg( 'openstackmanager-projectname' ) ); |
| | 191 | + $projectsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-members' ) ); |
| | 192 | + $projectsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-actions' ) ); |
| 193 | 193 | $projects = OpenStackNovaProject::getAllProjects(); |
| 194 | 194 | if ( ! $projects ) { |
| 195 | 195 | $projectsOut = ''; |
| — | — | @@ -264,10 +264,10 @@ |
| 265 | 265 | $project = new OpenStackNovaProject( $formData['projectname'] ); |
| 266 | 266 | $success = $project->addMember( $formData['member'] ); |
| 267 | 267 | if ( $success ) { |
| 268 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-addedto', $formData['member'], |
| | 268 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-addedto', array(), $formData['member'], |
| 269 | 269 | $formData['projectname'] ) ); |
| 270 | 270 | } else { |
| 271 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-failedtoadd', $formData['member'], |
| | 271 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-failedtoadd', array(), $formData['member'], |
| 272 | 272 | $formData['projectname'] ) ); |
| 273 | 273 | } |
| 274 | 274 | $out .= '<br />'; |
| — | — | @@ -284,10 +284,10 @@ |
| 285 | 285 | $project = new OpenStackNovaProject( $formData['projectname'] ); |
| 286 | 286 | $success = $project->deleteMember( $formData['member'] ); |
| 287 | 287 | if ( $success ) { |
| 288 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-removedfrom', $formData['member'], |
| | 288 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-removedfrom', array(), $formData['member'], |
| 289 | 289 | $formData['projectname'] ) ); |
| 290 | 290 | } else { |
| 291 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-failedtoremove', $formData['member'], |
| | 291 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-failedtoremove', array(), $formData['member'], |
| 292 | 292 | $formData['projectname'] ) ); |
| 293 | 293 | } |
| 294 | 294 | $out .= '<br />'; |
| Index: trunk/extensions/OpenStackManager/SpecialNovaDomain.php |
| — | — | @@ -47,19 +47,19 @@ |
| 48 | 48 | $domainInfo = Array(); |
| 49 | 49 | $domainInfo['domainname'] = array( |
| 50 | 50 | 'type' => 'text', |
| 51 | | - 'label-message' => 'domainname', |
| | 51 | + 'label-message' => 'openstackmanager-domainname', |
| 52 | 52 | 'default' => '', |
| 53 | 53 | 'section' => 'domain/info', |
| 54 | 54 | ); |
| 55 | 55 | $domainInfo['fqdn'] = array( |
| 56 | 56 | 'type' => 'text', |
| 57 | | - 'label-message' => 'fqdn', |
| | 57 | + 'label-message' => 'openstackmanager-fqdn', |
| 58 | 58 | 'default' => '', |
| 59 | 59 | 'section' => 'domain/info', |
| 60 | 60 | ); |
| 61 | 61 | $domainInfo['location'] = array( |
| 62 | 62 | 'type' => 'text', |
| 63 | | - 'label-message' => 'location', |
| | 63 | + 'label-message' => 'openstackmanager-location', |
| 64 | 64 | 'default' => '', |
| 65 | 65 | 'section' => 'domain/info', |
| 66 | 66 | ); |
| — | — | @@ -68,7 +68,7 @@ |
| 69 | 69 | 'default' => 'create', |
| 70 | 70 | ); |
| 71 | 71 | |
| 72 | | - $domainForm = new SpecialNovaDomainForm( $domainInfo, 'novadomainform' ); |
| | 72 | + $domainForm = new SpecialNovaDomainForm( $domainInfo, 'openstackmanager-novadomain' ); |
| 73 | 73 | $domainForm->setTitle( SpecialPage::getTitleFor( 'NovaDomain' ) ); |
| 74 | 74 | $domainForm->setSubmitID( 'novadomain-form-createdomainsubmit' ); |
| 75 | 75 | $domainForm->setSubmitCallback( array( $this, 'tryCreateSubmit' ) ); |
| — | — | @@ -85,7 +85,7 @@ |
| 86 | 86 | |
| 87 | 87 | $domainname = $wgRequest->getText( 'domainname' ); |
| 88 | 88 | if ( ! $wgRequest->wasPosted() ) { |
| 89 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-deletedomain-confirm', $domainname ) ); |
| | 89 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-deletedomain-confirm', array(), $domainname ) ); |
| 90 | 90 | $wgOut->addHTML( $out ); |
| 91 | 91 | } |
| 92 | 92 | $domainInfo = Array(); |
| — | — | @@ -97,7 +97,7 @@ |
| 98 | 98 | 'type' => 'hidden', |
| 99 | 99 | 'default' => 'delete', |
| 100 | 100 | ); |
| 101 | | - $domainForm = new SpecialNovaDomainForm( $domainInfo, 'novadomain-form' ); |
| | 101 | + $domainForm = new SpecialNovaDomainForm( $domainInfo, 'openstackmanager-novadomain' ); |
| 102 | 102 | $domainForm->setTitle( SpecialPage::getTitleFor( 'NovaDomain' ) ); |
| 103 | 103 | $domainForm->setSubmitID( 'novadomain-form-deletedomainsubmit' ); |
| 104 | 104 | $domainForm->setSubmitCallback( array( $this, 'tryDeleteSubmit' ) ); |
| — | — | @@ -116,10 +116,10 @@ |
| 117 | 117 | $out = ''; |
| 118 | 118 | $sk = $wgUser->getSkin(); |
| 119 | 119 | $out .= $sk->link( $this->getTitle(), wfMsg( 'openstackmanager-createdomain' ), array(), array( 'action' => 'create' ), array() ); |
| 120 | | - $domainsOut = Html::element( 'th', array(), 'Domain name' ); |
| 121 | | - $domainsOut .= Html::element( 'th', array(), 'FQDN' ); |
| 122 | | - $domainsOut .= Html::element( 'th', array(), 'Location' ); |
| 123 | | - $domainsOut .= Html::element( 'th', array(), 'Action' ); |
| | 120 | + $domainsOut = Html::element( 'th', array(), wfMsg( 'openstackmanager-domainname' ) ); |
| | 121 | + $domainsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-fqdn' ) ); |
| | 122 | + $domainsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-location' ) ); |
| | 123 | + $domainsOut .= Html::element( 'th', array(), wfMsg( 'openstackmanager-actions' ) ); |
| 124 | 124 | $domains = OpenStackNovaDomain::getAllDomains(); |
| 125 | 125 | foreach ( $domains as $domain ) { |
| 126 | 126 | $domainName = $domain->getDomainName(); |
| — | — | @@ -128,7 +128,8 @@ |
| 129 | 129 | $domainOut = Html::element( 'td', array(), $domainName ); |
| 130 | 130 | $domainOut .= Html::element( 'td', array(), $fqdn ); |
| 131 | 131 | $domainOut .= Html::element( 'td', array(), $location ); |
| 132 | | - $link = $sk->link( $this->getTitle(), 'delete domain', array(), |
| | 132 | + $msg = wfMsg( 'openstackmanager-delete' ); |
| | 133 | + $link = $sk->link( $this->getTitle(), $msg, array(), |
| 133 | 134 | array( 'action' => 'delete', 'domainname' => $domainName ), array() ); |
| 134 | 135 | $domainOut .= Html::rawElement( 'td', array(), $link ); |
| 135 | 136 | $domainsOut .= Html::rawElement( 'tr', array(), $domainOut ); |
| Index: trunk/extensions/OpenStackManager/OpenStackManager.i18n.php |
| — | — | @@ -22,6 +22,15 @@ |
| 23 | 23 | 'openstackmanager-instance' => 'Manage Instance', |
| 24 | 24 | 'openstackmanager-title' => 'OpenStackManager', |
| 25 | 25 | |
| | 26 | + 'novadomain' => 'Nova Domain', |
| | 27 | + 'novainstance' => 'Nova Instance', |
| | 28 | + 'novakey' => 'Nova Key', |
| | 29 | + 'novaproject' => 'Nova Project', |
| | 30 | + |
| | 31 | + 'openstackmanager-delete' => 'delete', |
| | 32 | + 'openstackmanager-configure' => 'configure', |
| | 33 | + 'openstackmanager-rename' => 'rename', |
| | 34 | + 'openstackmanager-actions' => 'Actions', |
| 26 | 35 | 'openstackmanager-notloggedin' => 'Not logged in', |
| 27 | 36 | 'openstackmanager-mustbeloggedin' => '<p>You must be logged in to perform this action</p>', |
| 28 | 37 | 'openstackmanager-nonovacred' => 'No Nova credentials found for your account', |
| — | — | @@ -32,6 +41,8 @@ |
| 33 | 42 | |
| 34 | 43 | 'openstackmanager-deletedomain' => 'Delete domain', |
| 35 | 44 | 'openstackmanager-deletedomain-confirm' => 'Are you sure you wish to delete domain "$1"? This action has reprecusions on all VMs. Do not take this action lightly!', |
| | 45 | + 'openstackmanager-novadomain-domain' => 'Domain', |
| | 46 | + 'openstackmanager-novadomain-info' => 'Domain Information', |
| 36 | 47 | |
| 37 | 48 | 'openstackmanager-createdomainfailed' => 'Failed to create domain', |
| 38 | 49 | 'openstackmanager-createddomain' => 'Created domain', |
| — | — | @@ -39,6 +50,9 @@ |
| 40 | 51 | 'openstackmanager-backdomainlist' => 'Back to domain list', |
| 41 | 52 | 'openstackmanager-deleteddomain' => 'Successfully deleted domain', |
| 42 | 53 | 'openstackmanager-failedeletedomain' => 'Failed to delete domain', |
| | 54 | + 'openstackmanager-domainname' => 'Domain Name', |
| | 55 | + 'openstackmanager-fqdn' => 'Fully Qualified Domain Name', |
| | 56 | + 'openstackmanager-location' => 'Location', |
| 43 | 57 | |
| 44 | 58 | 'openstackmanager-novainstance-instance' => 'Instance', |
| 45 | 59 | 'openstackmanager-configureinstance' => 'Configure Instance', |
| — | — | @@ -54,15 +68,15 @@ |
| 55 | 69 | 'openstackmanager-instanceid' => 'Instance ID', |
| 56 | 70 | 'openstackmanager-instancestate' => 'Instance State', |
| 57 | 71 | 'openstackmanager-instancetype' => 'Instance Type', |
| | 72 | + 'openstackmanager-instanceip' => 'Instance IP', |
| 58 | 73 | 'openstackmanager-availabilityzone' => 'Availability Zone', |
| 59 | 74 | 'openstackmanager-imageid' => 'Image ID', |
| 60 | 75 | 'openstackmanager-imagetype' => 'Image Type', |
| 61 | | - 'openstackmanager-actions' => 'Actions', |
| 62 | 76 | |
| 63 | 77 | 'openstackmanager-createinstance' => 'Create a new instance', |
| 64 | 78 | 'openstackmanager-invaliddomain' => 'Requested domain is invalid', |
| 65 | 79 | |
| 66 | | - 'openstackmanager-createdinstance' => 'Created instance $1 with image $2 and hostname $3 and ip $4', |
| | 80 | + 'openstackmanager-createdinstance' => 'Created instance $1 with image $2 and hostname $3', |
| 67 | 81 | 'openstackmanager-createfailedldap' => 'Failed to create instance as the host could not be added to LDAP', |
| 68 | 82 | 'openstackmanager-createinstancefailed' => 'Failed to create instance', |
| 69 | 83 | 'openstackmanager-backinstancelist' => 'Back to instance list', |
| — | — | @@ -94,6 +108,7 @@ |
| 95 | 109 | 'openstackmanager-createproject' => 'Create a new project', |
| 96 | 110 | 'openstackmanager-projectname' => 'Project name', |
| 97 | 111 | 'openstackmanager-members' => 'Members', |
| | 112 | + 'openstackmanager-member' => 'Member', |
| 98 | 113 | 'openstackmanager-action' => 'Action', |
| 99 | 114 | 'openstackmanager-createproject' => 'Create project', |
| 100 | 115 | 'openstackmanager-createprojectfailed' => 'Failed to create project', |
| — | — | @@ -108,6 +123,8 @@ |
| 109 | 124 | 'openstackmanager-removedfrom' => 'Successfully removed $1 from $2', |
| 110 | 125 | 'openstackmanager-failedtoremove' => 'Failed to remove $1 from $2', |
| 111 | 126 | 'openstackmanager-badinstancename' => 'Bad instance name provided. Instance names must start with a-z, and can only contain a-z, 0-9, and - characters.', |
| | 127 | + 'openstackmanager-novaproject-project' => 'Project', |
| | 128 | + 'openstackmanager-novaproject-info' => 'Project Information', |
| 112 | 129 | |
| 113 | 130 | ); |
| 114 | 131 | |
| Index: trunk/extensions/OpenStackManager/SpecialNovaKey.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | if ( $wgOpenStackManagerNovaKeypairStorage == 'nova' ) { |
| 58 | 58 | $keyInfo['keyname'] = array( |
| 59 | 59 | 'type' => 'text', |
| 60 | | - 'label-message' => 'keyname', |
| | 60 | + 'label-message' => 'openstackmanager-keyname', |
| 61 | 61 | 'default' => '', |
| 62 | 62 | 'section' => 'key/info', |
| 63 | 63 | ); |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | 'type' => 'textarea', |
| 68 | 68 | 'section' => 'key/info', |
| 69 | 69 | 'default' => '', |
| 70 | | - 'label-message' => 'key', |
| | 70 | + 'label-message' => 'openstackmanager-key', |
| 71 | 71 | ); |
| 72 | 72 | |
| 73 | 73 | $keyInfo['action'] = array( |
| — | — | @@ -79,7 +79,7 @@ |
| 80 | 80 | 'default' => htmlentities( $project ), |
| 81 | 81 | ); |
| 82 | 82 | |
| 83 | | - $keyForm = new SpecialNovaKeyForm( $keyInfo, 'novakey-form' ); |
| | 83 | + $keyForm = new SpecialNovaKeyForm( $keyInfo, 'openstackmanager-novakey' ); |
| 84 | 84 | $keyForm->setTitle( SpecialPage::getTitleFor( 'NovaKey' ) ); |
| 85 | 85 | $keyForm->setSubmitID( 'novakey-form-createkeysubmit' ); |
| 86 | 86 | $keyForm->setSubmitCallback( array( $this, 'tryImportSubmit' ) ); |
| — | — | @@ -132,7 +132,7 @@ |
| 133 | 133 | 'type' => 'hidden', |
| 134 | 134 | 'default' => 'delete', |
| 135 | 135 | ); |
| 136 | | - $keyForm = new SpecialNovaKeyForm( $keyInfo, 'novakey-form' ); |
| | 136 | + $keyForm = new SpecialNovaKeyForm( $keyInfo, 'openstackmanager-novakey' ); |
| 137 | 137 | $keyForm->setTitle( SpecialPage::getTitleFor( 'NovaKey' ) ); |
| 138 | 138 | $keyForm->setSubmitID( 'novakey-form-deletekeysubmit' ); |
| 139 | 139 | $keyForm->setSubmitCallback( array( $this, 'tryDeleteSubmit' ) ); |
| — | — | @@ -176,7 +176,8 @@ |
| 177 | 177 | $keysOut = ''; |
| 178 | 178 | foreach ( $keypairs as $hash => $key ) { |
| 179 | 179 | $keyOut = Html::element( 'td', array(), $key ); |
| 180 | | - $link = $sk->link( $this->getTitle(), 'delete', array(), array( 'action' => 'delete', 'hash' => $hash ), array() ); |
| | 180 | + $msg = wfMsg( 'openstackmanager-delete' ); |
| | 181 | + $link = $sk->link( $this->getTitle(), $msg, array(), array( 'action' => 'delete', 'hash' => $hash ), array() ); |
| 181 | 182 | $keyOut .= Html::rawElement( 'td', array(), $link ); |
| 182 | 183 | $keysOut .= Html::rawElement( 'tr', array(), $keyOut ); |
| 183 | 184 | } |
| — | — | @@ -206,7 +207,7 @@ |
| 207 | 208 | # of this option isn't currently recommended |
| 208 | 209 | $keypair = $this->userNova->importKeypair( $formData['keyname'], $formData['key'] ); |
| 209 | 210 | |
| 210 | | - $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-keypairimportedfingerprint', |
| | 211 | + $out = Html::element( 'p', array(), wfMsgExt( 'openstackmanager-keypairimportedfingerprint', array(), |
| 211 | 212 | $keypair->getKeyName(), $keypair->getKeyFingerprint() ) ); |
| 212 | 213 | } else { |
| 213 | 214 | $out = Html::element( 'p', array(), wfMsg( 'openstackmanager-invalidkeypair' ) ); |