We were previously asking users to select a deployable definition from
the drop-down, when the new terminology for that feature is "catalog
entry".
Resolves
https://bugzilla.redhat.com/show_bug.cgi?id=735249
---
src/app/views/deployments/_launch_new.haml | 19 ++++++++++++-------
src/config/locales/en.yml | 7 +++++++
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/app/views/deployments/_launch_new.haml
b/src/app/views/deployments/_launch_new.haml
index c3df0e9..417ec99 100644
--- a/src/app/views/deployments/_launch_new.haml
+++ b/src/app/views/deployments/_launch_new.haml
@@ -10,7 +10,8 @@
%section.content-section.deployment
%header
- %h2 Deployment Details
+ %h2
+ = t 'deployments.deployment_details'
.content
= form_for :deployment, {:url => new_deployment_path, :method => :get, :html
=> {:class => 'generic'}} do
@@ -19,24 +20,28 @@
%fieldset
%p
%label{:for => 'deployment_name'}
- Deployment Name
- %span (uniquely identifies your deployment)
+ = t 'deployments.deployment_name'
+ %span
+ = t 'deployments.deployment_name_subtext'
= text_field(:deployment, :name, :class => 'em long')
%span#name_avail_indicator
%fieldset
%p
- %label{:for => 'catalog_entry_id'} Deployable Definition
+ %label{:for => 'catalog_entry_id'}
+ = t('catalog_entries.index.catalog_entry')
= select_tag :catalog_entry_id, options_for_select([['Load definition from
URL', 'other']] + @catalog_entries.map {|d| [d.name, d.id]},
params[:catalog_entry_id])
%p#deployable-url-section
%label{:for => 'deployable_url'}
- Deployable URL
- %span (must be a valid URL including http://)
+ = t('deployables.index.deployable_url')
+ %span
+ = t('deployables.index.deployable_url_subtext')
= text_field_tag :deployable_url, params[:deployable_url], :class =>
'long'
%fieldset
%p
- %label{:for => 'frontend_realm_id'} Realm
+ %label{:for => 'frontend_realm_id'}
+ = t('realms.index.realm')
= select :deployment, :frontend_realm_id, @realms.map{|r| [r.name, r.id]},
:include_blank => true
%fieldset.options
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 7ae9e32..8d62ee3 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -81,6 +81,8 @@ en:
deployments: Deployments
deployment: Deployment
deployment_name: Deployment Name
+ deployment_name_subtext: "(uniquely identifies your deployment)"
+ deployment_details: Deployment Details
confirm_delete: "Are you sure you want to delete this deployment?"
disabled_pool: "Cannot launch a Deployment in this Pool. The pool has been
disabled."
updated:
@@ -152,6 +154,7 @@ en:
virtual_cpu: Virtual CPU
realms:
index:
+ realm: Realm
realm_name: Realm Name
pool_families:
pool_families: Pool Families
@@ -163,6 +166,7 @@ en:
quota_limit: Quota Limit
catalog_entries:
index:
+ catalog_entry: Catalog Entry
catalog_entries: Catalog Entries
name: Name
url: URL
@@ -180,6 +184,9 @@ en:
deployables:
index:
deployables: Deployables
+ deployable_definition: Deployable Definition
+ deployable_url: Deployable URL
+ deployable_url_subtext: "(must be a valid URL including http://)"
name: Name
description: Description
base_deployable: Base Deployable
--
1.7.6