You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2016/02/25 13:41:41 UTC
[1/3] git commit: updated refs/heads/master to 7a9bfce
Repository: cloudstack
Updated Branches:
refs/heads/master 908b769ab -> 7a9bfce42
CLOUDSTACK-9267: String is not localized on create instance wizards.
Fixed the hard coded string.
Added _l() to dictioanry keys.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f2d3cc89
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2d3cc89
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2d3cc89
Branch: refs/heads/master
Commit: f2d3cc893c6c38cce2c6fccc5f7f1e04f50242ce
Parents: e5ef933
Author: Nitin Kumar Maharana <ni...@gmail.com>
Authored: Wed Feb 3 00:28:28 2016 +0530
Committer: Nitin Kumar Maharana <ni...@gmail.com>
Committed: Wed Feb 3 00:28:28 2016 +0530
----------------------------------------------------------------------
ui/scripts/network.js | 8 ++++----
ui/scripts/ui-custom/instanceWizard.js | 2 +-
ui/scripts/ui-custom/projects.js | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2d3cc89/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index bb599fd..0ec275a 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -6051,7 +6051,7 @@
var items = [];
items.push({
id: '',
- description: 'label.none'
+ description: _l('label.none')
});
items.push({
id: 'modp1024',
@@ -6119,7 +6119,7 @@
var items = [];
items.push({
id: '',
- description: 'label.none'
+ description: _l('label.none')
});
items.push({
id: 'modp1024',
@@ -6400,7 +6400,7 @@
var items = [];
items.push({
id: '',
- description: 'label.none'
+ description: _l('label.none')
});
items.push({
id: 'modp1024',
@@ -6468,7 +6468,7 @@
var items = [];
items.push({
id: '',
- description: 'label.none'
+ description: _l('label.none')
});
items.push({
id: 'modp1024',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2d3cc89/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index 78f781f..f9f0781 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -372,7 +372,7 @@
$select.addClass('selected').append(
$('<div>').addClass('hypervisor')
- .append($('<label>').html('Hypervisor:'))
+ .append($('<label>').html(_l('label.hypervisor') + ':'))
.append($('<select>').attr({
name: 'hypervisorid'
}))
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2d3cc89/ui/scripts/ui-custom/projects.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/projects.js b/ui/scripts/ui-custom/projects.js
index 97c9b06..f6a2321 100644
--- a/ui/scripts/ui-custom/projects.js
+++ b/ui/scripts/ui-custom/projects.js
@@ -706,7 +706,7 @@
*/
var addProject = function() {
pageElems.newProjectForm().dialog({
- title: 'label.new.project',
+ title: _l('label.new.project'),
closeOnEscape: false,
width: 760
}).closest('.ui-dialog').overlay();
[2/3] git commit: updated refs/heads/master to 7a9bfce
Posted by ra...@apache.org.
Merge pull request #1390 from nitin-maharana/CloudStack-Nitin24_4.7
CLOUDSTACK-9267: String is not localized on create instance wizards.Repro Steps:
==========
1. Setup basic environments as normal.
2. Open a browser, go to Web Console.
3. Upload a iso template.
4. Go to "Instances" page and add new instance.
5. Check the strings on create instance wizards.
Expected Result:
=============
All the strings should be localized on create instance wizards.
Actual Result:
===========
Some strings are not localized on create instance wizards.
Language:
========
JA -> Fail
SC -> Fail
Fix:
===
Fixed the hard coded string.
* pr/1390:
CLOUDSTACK-9267: String is not localized on create instance wizards.
Signed-off-by: Rafael Weingärtner <ra...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9610056f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9610056f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9610056f
Branch: refs/heads/master
Commit: 9610056fa59117cd0e4ef89b37c9cd2d4dbc99f4
Parents: a243339 f2d3cc8
Author: Rafael Weingärtner <ra...@apache.org>
Authored: Thu Feb 25 09:38:25 2016 -0300
Committer: Rafael Weingärtner <ra...@apache.org>
Committed: Thu Feb 25 09:38:25 2016 -0300
----------------------------------------------------------------------
ui/scripts/network.js | 8 ++++----
ui/scripts/ui-custom/instanceWizard.js | 2 +-
ui/scripts/ui-custom/projects.js | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[3/3] git commit: updated refs/heads/master to 7a9bfce
Posted by ra...@apache.org.
Merge release branch 4.7 to master
* 4.7:
CLOUDSTACK-9267: String is not localized on create instance wizards.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a9bfce4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a9bfce4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a9bfce4
Branch: refs/heads/master
Commit: 7a9bfce427a8b4170261f96ab20e7916e96ac97b
Parents: 908b769 9610056
Author: Rafael Weingärtner <ra...@apache.org>
Authored: Thu Feb 25 09:40:54 2016 -0300
Committer: Rafael Weingärtner <ra...@apache.org>
Committed: Thu Feb 25 09:40:54 2016 -0300
----------------------------------------------------------------------
ui/scripts/network.js | 8 ++++----
ui/scripts/ui-custom/instanceWizard.js | 2 +-
ui/scripts/ui-custom/projects.js | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------