You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/10/18 20:04:28 UTC
git commit: Quickview UI: Localize string 'Quickview'
Updated Branches:
refs/heads/master ca6f1ef7b -> acae5f23b
Quickview UI: Localize string 'Quickview'
Conflicts:
client/WEB-INF/classes/resources/messages.properties
ui/dictionary.jsp
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/acae5f23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/acae5f23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/acae5f23
Branch: refs/heads/master
Commit: acae5f23bc12dfc79324ec9836b08df1d1fd8123
Parents: ca6f1ef
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 18 11:01:55 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 18 11:03:24 2012 -0700
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 1 +
ui/dictionary.jsp | 1 +
ui/scripts/ui/widgets/listView.js | 4 ++--
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/acae5f23/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 681f3cf..ce76a84 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -17,6 +17,7 @@
#new labels (begin) **********************************************************************************************
+label.quickview=Quickview
label.migrate.to.host=Migrate to host
label.migrate.to.storage=Migrate to storage
label.stop=Stop
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/acae5f23/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index b043046..bf53ed9 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
<% long now = System.currentTimeMillis(); %>
<script language="javascript">
dictionary = {
+'label.quickview': '<fmt:message key="label.quickview"/>',
'label.migrate.to.host': '<fmt:message key="label.migrate.to.host"/>',
'label.migrate.to.storage': '<fmt:message key="label.migrate.to.storage"/>',
'label.stop': '<fmt:message key="label.stop"/>',
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/acae5f23/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 2a6919d..a6bb040 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -655,7 +655,7 @@
if (detailView && !detailView.noCompact && !uiCustom) {
$thead.find('tr').append(
$('<th></th>')
- .html('Quickview')
+ .html(_l('label.quickview'))
.addClass('quick-view reduced-hide')
);
}
@@ -1055,7 +1055,7 @@
// Title
$title.append(
- $('<span>').html('Quickview: '),
+ $('<span>').html(_l('label.quickview') + ': '),
$('<span>').addClass('title').html(
cloudStack.concat(
$tr.find('td:first span').html(), 30