apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Fix labels broken by translate code (#3386)

Browse Source 
As discussed in #3385, the translation code does not work with self closing translate tags when there is other content at the same level, e.g. <div><translate key="foo"/>: Something</div> - it will remove the ": Something". This PR changes the affected tags to non-self closing, e.g. <translate key="foo"></translate>: Something

This fixes the Zone names not being displayed on the capacity graphs on the dashboard, plus some minor missing labels elsewhere.

Fixes #3385
This commit is contained in:
Richard Lawley 2019-06-13 11:21:26 +01:00 committed by Rohit Yadav
parent 1c963bac13
commit 873f1f247d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/index.html
View File

@ -312,8 +312,8 @@
<div class="specify-ip"> <div class="specify-ip">
<label> <label>
<translate key="label.ip.address" /> <translate key="label.ip.address" />
(<translate key="label.optional"/>):
</label> </label>
(<label><translate key="label.optional"></translate></label>):
<input type="text" name="vpc-specify-ip" /> <input type="text" name="vpc-specify-ip" />
</div> </div>
</p> </p>
@ -431,7 +431,7 @@
<!-- Name --> <!-- Name -->
<div class="select odd vm-instance-name"> <div class="select odd vm-instance-name">
<div class="name"> <div class="name">
<span><translate key="label.name"/> (<translate key="label.optional"/>)</span> <span><label><translate key="label.name" /></label> (<label><translate key="label.optional"/></label>)</span>
</div> </div>
<div class="value"> <div class="value">
<input type="text" name="displayname" class="disallowSpecialCharacters" /> <input type="text" name="displayname" class="disallowSpecialCharacters" />
@ -440,7 +440,7 @@
<!-- Add to group --> <!-- Add to group -->
<div class="select"> <div class="select">
<div class="name"> <div class="name">
<span><translate key="label.add.to.group"/> (<translate key="label.optional"/>)</span> <span><label><translate key="label.add.to.group"/></label> (<label><translate key="label.optional"/></label>)</span>
</div> </div>
<div class="value"> <div class="value">
<input type="text" name="groupname" class="disallowSpecialCharacters" /> <input type="text" name="groupname" class="disallowSpecialCharacters" />
@ -575,7 +575,7 @@
<!-- userdata --> <!-- userdata -->
<div class="select"> <div class="select">
<div class="name"> <div class="name">
<span><translate key="label.add.userdata"/> (<translate key="label.optional"/>)</span> <span><label><translate key="label.add.userdata"/></label> (<label><translate key="label.optional"/></label>)</span>
</div> </div>
<div class="value"> <div class="value">
<textarea name="userdata"></textarea> <textarea name="userdata"></textarea>
@ -1429,12 +1429,12 @@
<div class="selects" style="display:none;"> <div class="selects" style="display:none;">
<div class="select"> <div class="select">
<label><translate key="label.zone"/>:</label> <label><translate key="label.zone"/></label>:
<select> <select>
</select> </select>
</div> </div>
<div class="select"> <div class="select">
<label><translate key="label.pods"/>:</label> <label><translate key="label.pods"/></label>:
<select> <select>
</select> </select>
</div> </div>
@ -1495,7 +1495,7 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th><translate key="label.latest.events"/> <div class="button view-all events"><translate key="label.view.all"/></div></th> <th><label><translate key="label.latest.events"/></label> <div class="button view-all events"><translate key="label.view.all"/></div></th>
</tr> </tr>
</thead> </thead>
</table> </table>
@ -1512,7 +1512,7 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th><translate key="label.network"/> <div class="button view-all network"><translate key="label.view.all"/></div></th> <th><label><translate key="label.network"/></label> <div class="button view-all network"><translate key="label.view.all"/></div></th>
</tr> </tr>
</thead> </thead>
</table> </table>
@ -1520,13 +1520,13 @@
<tbody> <tbody>
<tr> <tr>
<td> <td>
<div class="desc"><span><translate key="label.isolated.networks"/>:</span></div> <div class="desc"><span><label><translate key="label.isolated.networks"/></label>:</span></div>
<div class="value"><span data-item="netTotal"></span></div> <div class="value"><span data-item="netTotal"></span></div>
</td> </td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<td> <td>
<div class="desc"><span><translate key="label.public.ips"/>:</span></div> <div class="desc"><span><label><translate key="label.public.ips"/></label>:</span></div>
<div class="value"><span data-item="ipTotal"></span></div> <div class="value"><span data-item="ipTotal"></span></div>
</td> </td>
</tr> </tr>