← Back to branch summary

~ubuntu-branches/ubuntu/trusty/horizon/trusty

« back to all changes in this revision

Viewing changes to horizon/dashboards/syspanel/users/forms.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-03-09 11:50:22 UTC
  • mfrom: (1.1.9)
  • Revision ID: package-import@ubuntu.com-20120309115022-ymiww5i58rbg97my
Tags: 2012.1~rc1~20120308.1479-0ubuntu1
https://launchpad.net/bugs/947118
https://launchpad.net/bugs/944235
* New upstream version.
* debian/rules: Fix symlink when installing horizon.
  (LP: #947118)
* debian/control: Add python-django-nose as a dep. (LP: #944235)
* debian/control: Fix broken depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
horizon/dashboards/syspanel/users/forms.py
36
36
    def __init__(self, request, *args, **kwargs):
37
37
        super(BaseUserForm, self).__init__(*args, **kwargs)
38
38
        # Populate tenant choices
39
 
        tenant_choices = [('', "Select a tenant")]
 
39
        tenant_choices = [('', _("Select a project"))]
40
40
        for tenant in api.tenant_list(request, admin=True):
41
41
            if tenant.enabled:
42
42
                tenant_choices.append((tenant.id, tenant.name))
76
76
                                             default_role.id)
77
77
            except:
78
78
                exceptions.handle(request,
79
 
                                  _('Unable to add user to primary tenant.'))
 
79
                                  _('Unable to add user to primary project.'))
80
80
            return shortcuts.redirect('horizon:syspanel:users:index')
81
81
        except:
82
82
            exceptions.handle(request, _('Unable to create user.'))