From: Tomas Sedovic tomas@sedovic.cz
https://bugzilla.redhat.com/show_bug.cgi?id=760661 --- src/config/locales/en.yml | 30 +++++++++++++++--------------- src/features/deployables.feature | 10 +++++----- 2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml index 51cbc8f..cfd2f1f 100644 --- a/src/config/locales/en.yml +++ b/src/config/locales/en.yml @@ -184,7 +184,7 @@ en: launch_from_catalog: profile: Profile hint: Choose a deployable to launch in the "%{pool}" pool - no_catalog_entry: 'No available catalog entry. Please add one first!' + no_catalog_entry: 'No available deployable. Please add one first!' details: Details select: Select image_id: Image ID @@ -408,7 +408,7 @@ en: destroy: Destroy images: catalog: Catalog - catalog_entry: Catalog Entry + catalog_entry: Deployable image: "Image:" pushed: %{uuid} pushed to %{provider} properties: @@ -600,14 +600,14 @@ en: select_to_add_accounts: "You must select at least one Provider Account to add." select_to_remove_accounts: "You must select at least one Provider Account to remove." catalog_entries: - new_catalog_entry: New Catalog Entry + new_catalog_entry: New Deployable index: - catalog_entry: Catalog Entry - catalog_entries: Catalog Entries + catalog_entry: Deployable + catalog_entries: Deployables name: Name deployable_xml: Deployable XML new: - add_catalog_entry: Add New Catalog Entry + add_catalog_entry: Add New Deployable choose_option_to_upload: Choose one of the following options to upload deployable XML file upload: Upload from_url: From URL @@ -626,21 +626,21 @@ en: rebuild_all: Rebuild all images start: Start edit: - editing_catalog_entry: Editing Catalog Entry + editing_catalog_entry: Editing Deployable list: - catalog_entries_list: Catalog Entries List + catalog_entries_list: Deployables List flash: warning: - not_valid_or_reachable: "Catalog entry XML file is either invalid or no longer reachable at %{url}" - no_url_provided: "No URL provided for the catalog entry XML file." + not_valid_or_reachable: "Deployable XML file is either invalid or no longer reachable at %{url}" + no_url_provided: "No URL provided for the deployable XML file." not_valid: "Deployable XML file doesn't resolve valid XML" - failed: Catalog entry was not created. + failed: Deployable was not created. notice: - added: Catalog entry added. - updated: Catalog entry updated successfully! - deleted: Catalog entry deleted. + added: Deployable added. + updated: Deployable updated successfully! + deleted: Deployable deleted. preset_filters: - all_catalog_entries: All Catalog Entries + all_catalog_entries: All Deployables catalogs: catalogs: Catalogs new_catalog: New Catalog diff --git a/src/features/deployables.feature b/src/features/deployables.feature index 16c7020..9a60274 100644 --- a/src/features/deployables.feature +++ b/src/features/deployables.feature @@ -10,14 +10,14 @@ Feature: Manage Catalog Entries Scenario: Create new catalog entry Given there is a "default" catalog When I am on the "default" catalog catalog entries page - Then I should see "Catalog Entries" + Then I should see "Deployables" When I follow "new_catalog_entry_button" - Then I should see "Add New Catalog Entry" + Then I should see "Add New Deployable" When I fill in "deployable[name]" with "test1" And I fill in "deployable[description]" with "description" When I attach the file "features/upload_files/deployable.xml" to "deployable[xml]" And I press "save_button" - Then I should see "Catalog entry added" + Then I should see "Deployable added"
Scenario: Change the name Given there is a "default" catalog @@ -25,10 +25,10 @@ Feature: Manage Catalog Entries When I am on the "default" catalog catalog entries page When I follow "testdepl" And I follow "edit_button" - Then I should see "Editing Catalog Entry" + Then I should see "Editing Deployable" When I fill in "deployable[name]" with "testdepl-renamed" And I press "save_button" - Then I should see "Catalog entry updated successfully!" + Then I should see "Deployable updated successfully!" And I should see "testdepl-renamed"
Scenario: Show catalog entry details
On 01/03/2012 04:35 PM, tsedovic@redhat.com wrote:
From: Tomas Sedovictomas@sedovic.cz
https://bugzilla.redhat.com/show_bug.cgi?id=760661
src/config/locales/en.yml | 30 +++++++++++++++--------------- src/features/deployables.feature | 10 +++++----- 2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml index 51cbc8f..cfd2f1f 100644 --- a/src/config/locales/en.yml +++ b/src/config/locales/en.yml @@ -184,7 +184,7 @@ en: launch_from_catalog: profile: Profile hint: Choose a deployable to launch in the "%{pool}" pool
no_catalog_entry: 'No available catalog entry. Please add one first!'
no_catalog_entry: 'No available deployable. Please add one first!' details: Details select: Select image_id: Image ID
@@ -408,7 +408,7 @@ en: destroy: Destroy images: catalog: Catalog
catalog_entry: Catalog Entry
catalog_entry: Deployable image: "Image:" pushed: %{uuid} pushed to %{provider} properties:
@@ -600,14 +600,14 @@ en: select_to_add_accounts: "You must select at least one Provider Account to add." select_to_remove_accounts: "You must select at least one Provider Account to remove." catalog_entries:
- new_catalog_entry: New Catalog Entry
- new_catalog_entry: New Deployable index:
catalog_entry: Catalog Entry
catalog_entries: Catalog Entries
catalog_entry: Deployable
catalog_entries: Deployables name: Name deployable_xml: Deployable XML new:
add_catalog_entry: Add New Catalog Entry
add_catalog_entry: Add New Deployable choose_option_to_upload: Choose one of the following options to upload deployable XML file upload: Upload from_url: From URL
@@ -626,21 +626,21 @@ en: rebuild_all: Rebuild all images start: Start edit:
editing_catalog_entry: Editing Catalog Entry
editing_catalog_entry: Editing Deployable list:
catalog_entries_list: Catalog Entries List
catalog_entries_list: Deployables List flash: warning:
not_valid_or_reachable: "Catalog entry XML file is either invalid or no longer reachable at %{url}"
no_url_provided: "No URL provided for the catalog entry XML file."
not_valid_or_reachable: "Deployable XML file is either invalid or no longer reachable at %{url}"
no_url_provided: "No URL provided for the deployable XML file." not_valid: "Deployable XML file doesn't resolve valid XML"
failed: Catalog entry was not created.
failed: Deployable was not created. notice:
added: Catalog entry added.
updated: Catalog entry updated successfully!
deleted: Catalog entry deleted.
added: Deployable added.
updated: Deployable updated successfully!
deleted: Deployable deleted. preset_filters:
all_catalog_entries: All Catalog Entries
catalogs: catalogs: Catalogs new_catalog: New Catalogall_catalog_entries: All Deployables
diff --git a/src/features/deployables.feature b/src/features/deployables.feature index 16c7020..9a60274 100644 --- a/src/features/deployables.feature +++ b/src/features/deployables.feature @@ -10,14 +10,14 @@ Feature: Manage Catalog Entries Scenario: Create new catalog entry Given there is a "default" catalog When I am on the "default" catalog catalog entries page
- Then I should see "Catalog Entries"
- Then I should see "Deployables" When I follow "new_catalog_entry_button"
- Then I should see "Add New Catalog Entry"
- Then I should see "Add New Deployable" When I fill in "deployable[name]" with "test1" And I fill in "deployable[description]" with "description" When I attach the file "features/upload_files/deployable.xml" to "deployable[xml]" And I press "save_button"
- Then I should see "Catalog entry added"
Then I should see "Deployable added"
Scenario: Change the name Given there is a "default" catalog
@@ -25,10 +25,10 @@ Feature: Manage Catalog Entries When I am on the "default" catalog catalog entries page When I follow "testdepl" And I follow "edit_button"
- Then I should see "Editing Catalog Entry"
- Then I should see "Editing Deployable" When I fill in "deployable[name]" with "testdepl-renamed" And I press "save_button"
- Then I should see "Catalog entry updated successfully!"
Then I should see "Deployable updated successfully!" And I should see "testdepl-renamed"
Scenario: Show catalog entry details
ACK
aeolus-devel@lists.fedorahosted.org