openstack
/
horizon
Code Issues Proposed changes

Merge "Mark string in routerrule template translatable"

This commit is contained in:
Jenkins 2014-03-13 15:37:08 +00:00 committed by Gerrit Code Review
parent 75c08b235f db2aa1d3f3
commit ce7eb3ec4c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/project/instances/forms.py
View File

@ -146,7 +146,7 @@ class DecryptPasswordInstanceForm(forms.SelfHandlingForm):
_attrs = {'readonly': 'readonly'}
self.fields['decrypted_password'] = forms.CharField(
widget=forms.widgets.TextInput(_attrs),
label=_("Password:"),
label=_("Password"),
required=False)
except Exception:
redirect = reverse('horizon:project:instances:index')

4
openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/grid.html
View File

@ -94,7 +94,7 @@
<div class="modal-body">
<p>{% blocktrans %}A more specific rule affects a portion of this traffic so a rule cannot be automatically generated to control the behavior of the entire source/destination combination.{% endblocktrans %}</p>
<hr>
<h4>Conflicting Rule:</h4>
<h4>{% trans "Conflicting Rule" %}</h4>
<b>{% trans "Source" %}:</b> {{ dest.conflicting_rule.source }}<br>
<b>{% trans "Destination" %}:</b> {{ dest.conflicting_rule.destination }}<br>
<b>{% trans "Action" %}:</b> {{ dest.conflicting_rule.action }}<br>
@ -118,7 +118,7 @@
</tr>
</tfoot>
</table>
<h3>Description:</h3>
<h3>{% trans "Description" %}</h3>
<p>{% blocktrans %}The color and icon of an intersection indicates whether or not traffic is permitted from the source (row) to the destination (column).
Clicking the <i class="icon-random"></i> button in the intersection will install a rule to switch the traffic behavior.<br/>