openstack/horizon
Code Issues Proposed changes

Merge "i18n: Allow translator to control the word order (trunk)"

Browse Source
This commit is contained in:
Zuul 2018-01-31 05:33:49 +00:00 committed by Gerrit Code Review
commit f9c81696ed
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/networkports/ports.html
View File

@ -40,7 +40,11 @@
<td class="rsp-p1 word-break">{$ ctrl.nameOrID(item) $}</td>
<td class="rsp-p2">
<div ng-repeat="ip in item.fixed_ips">
{$ ip.ip_address $} on subnet: {$ item.subnet_names[ip.ip_address] $}
<span translate
translate-params-address="ip.ip_address"
translate-params-subnet="item.subnet_names[ip.ip_address]">
{$ address $} on subnet {$ subnet $}
</span>
</div>
</td>
<td class="rsp-p1">{$ item.admin_state | decode:ctrl.portAdminStates $}</td>

12
openstack_dashboard/static/app/core/trunks/steps/trunk-parent-port.html
View File

@ -46,7 +46,11 @@
<td class="rsp-p1 word-break">{$ ctrl.nameOrID(item) $}</td>
<td class="rsp-p2">
<div ng-repeat="ip in item.fixed_ips">
{$ ip.ip_address $} <span translate>on subnet</span>: {$ item.subnet_names[ip.ip_address] $}
<span translate
translate-params-address="ip.ip_address"
translate-params-subnet="item.subnet_names[ip.ip_address]">
{$ address $} on subnet {$ subnet $}
</span>
</div>
</td>
<td class="rsp-p1">{$ item.admin_state | decode:ctrl.portAdminStates $}</td>
@ -125,7 +129,11 @@
<td class="rsp-p1 word-break">{$ ctrl.nameOrID(item) $}</td>
<td class="rsp-p2">
<div ng-repeat="ip in item.fixed_ips">
{$ ip.ip_address $} <span translate>on subnet</span>: {$ item.subnet_names[ip.ip_address] $}
<span translate
translate-params-address="ip.ip_address"
translate-params-subnet="item.subnet_names[ip.ip_address]">
{$ address $} on subnet {$ subnet $}
</span>
</div>
</td>
<td class="rsp-p1">{$ item.admin_state | decode:ctrl.portAdminStates $}</td>

12
openstack_dashboard/static/app/core/trunks/steps/trunk-subports.html
View File

@ -49,7 +49,11 @@
<td class="rsp-p1 word-break">{$ ctrl.nameOrID(item) $}</td>
<td class="rsp-p2">
<div ng-repeat="ip in item.fixed_ips">
{$ ip.ip_address $} <span translate>on subnet</span>: {$ item.subnet_names[ip.ip_address] $}
<span translate
translate-params-address="ip.ip_address"
translate-params-subnet="item.subnet_names[ip.ip_address]">
{$ address $} on subnet {$ subnet $}
</span>
</div>
</td>
<td class="rsp-p1">{$ item.admin_state | decode:ctrl.portAdminStates $}</td>
@ -144,7 +148,11 @@
<td class="rsp-p1 word-break">{$ ctrl.nameOrID(item) $}</td>
<td class="rsp-p2">
<div ng-repeat="ip in item.fixed_ips">
{$ ip.ip_address $} <span translate>on subnet</span>: {$ item.subnet_names[ip.ip_address] $}
<span translate
translate-params-address="ip.ip_address"
translate-params-subnet="item.subnet_names[ip.ip_address]">
{$ address $} on subnet {$ subnet $}
</span>
</div>
</td>
<td class="rsp-p1">{$ item.admin_state | decode:ctrl.portAdminStates $}</td>