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

Merge release branch 4.7 to 4.8

Browse Source 
* 4.7:
  CLOUDSTACK-9267: String is not localized on create instance wizards.
This commit is contained in:
Rafael Weingärtner 2016-02-26 13:07:57 -03:00
commit 12a4ca28c4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/scripts/network.js
View File

@ -6051,7 +6051,7 @@
var items = []; var items = [];
items.push({ items.push({
id: '', id: '',
description: 'label.none' description: _l('label.none')
}); });
items.push({ items.push({
id: 'modp1024', id: 'modp1024',
@ -6119,7 +6119,7 @@
var items = []; var items = [];
items.push({ items.push({
id: '', id: '',
description: 'label.none' description: _l('label.none')
}); });
items.push({ items.push({
id: 'modp1024', id: 'modp1024',
@ -6400,7 +6400,7 @@
var items = []; var items = [];
items.push({ items.push({
id: '', id: '',
description: 'label.none' description: _l('label.none')
}); });
items.push({ items.push({
id: 'modp1024', id: 'modp1024',
@ -6468,7 +6468,7 @@
var items = []; var items = [];
items.push({ items.push({
id: '', id: '',
description: 'label.none' description: _l('label.none')
}); });
items.push({ items.push({
id: 'modp1024', id: 'modp1024',

2
ui/scripts/ui-custom/instanceWizard.js
View File

@ -372,7 +372,7 @@
$select.addClass('selected').append( $select.addClass('selected').append(
$('<div>').addClass('hypervisor') $('<div>').addClass('hypervisor')
.append($('<label>').html('Hypervisor:')) .append($('<label>').html(_l('label.hypervisor') + ':'))
.append($('<select>').attr({ .append($('<select>').attr({
name: 'hypervisorid' name: 'hypervisorid'
})) }))

2
ui/scripts/ui-custom/projects.js
View File

@ -706,7 +706,7 @@
*/ */
var addProject = function() { var addProject = function() {
pageElems.newProjectForm().dialog({ pageElems.newProjectForm().dialog({
title: 'label.new.project', title: _l('label.new.project'),
closeOnEscape: false, closeOnEscape: false,
width: 760 width: 760
}).closest('.ui-dialog').overlay(); }).closest('.ui-dialog').overlay();