Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2937f3c4
authored
Apr 06, 2015
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix tx notifications
parent
04cbc0b5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
circle/dashboard/views/template.py
+1
-1
circle/dashboard/views/util.py
+3
-3
circle/dashboard/views/vm.py
+1
-1
circle/locale/hu/LC_MESSAGES/django.po
+6
-6
No files found.
circle/dashboard/views/template.py
View file @
2937f3c4
...
...
@@ -441,7 +441,7 @@ class TransferTemplateOwnershipView(TransferOwnershipView):
confirm_view
=
TransferTemplateOwnershipConfirmView
model
=
InstanceTemplate
notification_msg
=
ugettext_noop
(
'
%(
us
er)
s offered you to take the ownership of '
'
%(
own
er)
s offered you to take the ownership of '
'his/her template called
%(instance)
s. '
'<a href="
%(token)
s" '
'class="btn btn-success btn-small">Accept</a>'
)
...
...
circle/dashboard/views/util.py
View file @
2937f3c4
...
...
@@ -610,7 +610,7 @@ class TransferOwnershipView(CheckedDetailView, DetailView):
new_owner
.
profile
.
notify
(
ugettext_noop
(
'Ownership offer'
),
self
.
notification_msg
,
{
'instance'
:
obj
,
'token'
:
token_path
})
{
'instance'
:
obj
,
'token'
:
token_path
,
'owner'
:
request
.
user
})
except
Profile
.
DoesNotExist
:
messages
.
error
(
request
,
_
(
'Can not notify selected user.'
))
else
:
...
...
@@ -665,8 +665,8 @@ class TransferOwnershipConfirmView(LoginRequiredMixin, View):
old
.
profile
.
notify
(
ugettext_noop
(
'Ownership accepted'
),
ugettext_noop
(
'Your ownership offer of
%(instance)
s has been '
'accepted by
%(
us
er)
s.'
),
{
'instance'
:
instance
})
'accepted by
%(
own
er)
s.'
),
{
'instance'
:
instance
,
'owner'
:
request
.
user
})
return
redirect
(
instance
.
get_absolute_url
())
def
get_instance
(
self
,
key
,
user
):
...
...
circle/dashboard/views/vm.py
View file @
2937f3c4
...
...
@@ -1297,7 +1297,7 @@ class TransferInstanceOwnershipView(TransferOwnershipView):
confirm_view
=
TransferInstanceOwnershipConfirmView
model
=
Instance
notification_msg
=
ugettext_noop
(
'
%(
us
er)
s offered you to take the ownership of '
'
%(
own
er)
s offered you to take the ownership of '
'his/her virtual machine called
%(instance)
s. '
'<a href="
%(token)
s" '
'class="btn btn-success btn-small">Accept</a>'
)
...
...
circle/locale/hu/LC_MESSAGES/django.po
View file @
2937f3c4
...
...
@@ -2686,11 +2686,11 @@ msgstr ""
#: dashboard/views/template.py:444
#, python-format
msgid ""
"%(
us
er)s offered you to take the ownership of his/her template called "
"%(
own
er)s offered you to take the ownership of his/her template called "
"%(instance)s. <a href=\"%(token)s\" class=\"btn btn-success btn-"
"small\">Accept</a>"
msgstr ""
"%(
us
er)s át kívánja ruházni %(instance)s nevű sablonját Önre. <a "
"%(
own
er)s át kívánja ruházni %(instance)s nevű sablonját Önre. <a "
"href=\"%(token)s\" class=\"btn btn-success btn-small\">Elfogadás</a>"
#: dashboard/views/user.py:150
...
...
@@ -2856,8 +2856,8 @@ msgstr "Átruházás elfogadva"
#: dashboard/views/util.py:667
#, python-format
msgid "Your ownership offer of %(instance)s has been accepted by %(
us
er)s."
msgstr "%(instance)s gépre vonatkozó átruházási ajánlatát elfogadta %(
us
er)s."
msgid "Your ownership offer of %(instance)s has been accepted by %(
own
er)s."
msgstr "%(instance)s gépre vonatkozó átruházási ajánlatát elfogadta %(
own
er)s."
#: dashboard/views/util.py:716
msgid "Only the owners can delete the selected object."
...
...
@@ -2924,11 +2924,11 @@ msgstr "tulajdon átruházása"
#: dashboard/views/vm.py:1300
#, python-format
msgid ""
"%(
us
er)s offered you to take the ownership of his/her virtual machine called"
"%(
own
er)s offered you to take the ownership of his/her virtual machine called"
" %(instance)s. <a href=\"%(token)s\" class=\"btn btn-success btn-"
"small\">Accept</a>"
msgstr ""
"%(
us
er)s át kívánja ruházni %(instance)s nevű virtuális gépét Önre. <a "
"%(
own
er)s át kívánja ruházni %(instance)s nevű virtuális gépét Önre. <a "
"href=\"%(token)s\" class=\"btn btn-success btn-small\">Elfogadás</a>"
#: firewall/fields.py:42
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment