Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D77EF10AC4 for ; Thu, 6 Mar 2014 22:08:20 +0000 (UTC) Received: (qmail 11808 invoked by uid 500); 6 Mar 2014 22:07:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 11070 invoked by uid 500); 6 Mar 2014 22:06:58 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 10521 invoked by uid 99); 6 Mar 2014 22:06:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2014 22:06:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0A57893FDF4; Thu, 6 Mar 2014 22:06:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Date: Thu, 06 Mar 2014 22:06:56 -0000 Message-Id: <6325fcb6689b4e3b805eb24a8ad9603f@git.apache.org> In-Reply-To: <4ea5b3c85db3438ebfb801be6169eca8@git.apache.org> References: <4ea5b3c85db3438ebfb801be6169eca8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/50] [abbrv] git commit: updated refs/heads/rbac to 48e08fe Fix CLOUDSTACK-4563: Initial zone wizard UI label issue Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/47790237 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/47790237 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/47790237 Branch: refs/heads/rbac Commit: 477902379e0fad25a796ad3cbed53bec33737541 Parents: b71f507 Author: Gabor Apati-Nagy Authored: Mon Mar 3 10:17:57 2014 -0800 Committer: Brian Federle Committed: Mon Mar 3 10:19:03 2014 -0800 ---------------------------------------------------------------------- client/WEB-INF/classes/resources/messages.properties | 1 + ui/dictionary.jsp | 1 + ui/scripts/zoneWizard.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47790237/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 1e91d38..82ac499 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -945,6 +945,7 @@ label.project.view=Project View label.project=Project label.projects=Projects label.protocol=Protocol +label.provider=Provider label.providers=Providers label.public.interface=Public Interface label.public.ip=Public IP Address http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47790237/ui/dictionary.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index fdf15cc..11dbeb5 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -933,6 +933,7 @@ dictionary = { 'label.projects': '', 'label.project.view': '', 'label.protocol': '', +'label.provider': '', 'label.providers': '', 'label.provider': '', 'label.public': '', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47790237/ui/scripts/zoneWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 2691586..1de3646 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -1872,7 +1872,7 @@ secondaryStorage: { fields: { provider: { - label: 'Provider', + label: 'label.provider', select: function(args) { var storageproviders = []; storageproviders.push({ id: '', description: ''});