[PATCH conductor 2/2] BZ798555 added active record translations and cleared up views and i18n accordingly
jtomasek at redhat.com
jtomasek at redhat.com
Tue Mar 6 16:28:37 UTC 2012
From: Jiri Tomasek <jtomasek at redhat.com>
---
src/app/controllers/catalogs_controller.rb | 1 +
src/app/controllers/realms_controller.rb | 1 -
src/app/views/catalogs/_form.html.haml | 4 +-
.../views/config_servers/_config_server_form.haml | 6 +-
src/app/views/deployables/_form.html.haml | 6 +-
src/app/views/deployables/_from_url.html.haml | 4 +-
src/app/views/deployables/_upload.html.haml | 4 +-
src/app/views/deployments/_edit.html.haml | 2 +-
src/app/views/hardware_profiles/_form.html.haml | 2 +-
src/app/views/instances/_edit.html.haml | 2 +-
src/app/views/layouts/_error_messages.html.haml | 2 +-
src/app/views/pool_families/_form.html.haml | 2 +-
src/app/views/pools/_form.html.haml | 4 +-
src/app/views/providers/_form.html.haml | 10 +-
src/app/views/realms/_form.html.haml | 4 +-
src/app/views/realms/new.html.haml | 2 +-
src/app/views/roles/_form.html.haml | 2 +-
src/app/views/users/_form.html.haml | 4 +-
src/config/locales/activerecord/en.yml | 345 ++++++++++++++++++++
src/config/locales/en.yml | 21 --
src/features/provider.feature | 2 +-
src/features/user.feature | 8 +-
22 files changed, 381 insertions(+), 57 deletions(-)
create mode 100644 src/config/locales/activerecord/en.yml
diff --git a/src/app/controllers/catalogs_controller.rb b/src/app/controllers/catalogs_controller.rb
index 97053ce..18fa292 100644
--- a/src/app/controllers/catalogs_controller.rb
+++ b/src/app/controllers/catalogs_controller.rb
@@ -52,6 +52,7 @@ class CatalogsController < ApplicationController
end
def create
+ load_pools
@catalog = Catalog.new(params[:catalog])
require_privilege(Privilege::CREATE, Catalog, @catalog.pool)
if @catalog.save
diff --git a/src/app/controllers/realms_controller.rb b/src/app/controllers/realms_controller.rb
index 6ba29b6..e748999 100644
--- a/src/app/controllers/realms_controller.rb
+++ b/src/app/controllers/realms_controller.rb
@@ -31,7 +31,6 @@ class RealmsController < ApplicationController
def new
require_privilege(Privilege::CREATE, Realm)
- @title = t 'realms.new.create_realm'
@realm = FrontendRealm.new
load_backend_realms
end
diff --git a/src/app/views/catalogs/_form.html.haml b/src/app/views/catalogs/_form.html.haml
index 34122d6..eb88f48 100644
--- a/src/app/views/catalogs/_form.html.haml
+++ b/src/app/views/catalogs/_form.html.haml
@@ -2,10 +2,10 @@
= render 'layouts/error_messages', :object => @catalog
%fieldset
%p
- = form.label :name, t('catalogs.index.name')
+ = form.label :name
= form.text_field :name, :class => 'em long'
%p
- = form.label :pool_id, t('pools.pool')
+ = form.label :pool_id
= form.select(:pool_id, @pools.collect{|p| [p.name, p.id]}, :prompt => t("catalogs.form.select_pool"))
%fieldset.options
diff --git a/src/app/views/config_servers/_config_server_form.haml b/src/app/views/config_servers/_config_server_form.haml
index a2e0a31..871d198 100644
--- a/src/app/views/config_servers/_config_server_form.haml
+++ b/src/app/views/config_servers/_config_server_form.haml
@@ -3,13 +3,13 @@
%fieldset
%p.clearfix
= hidden_field_tag "provider_account_id", @provider_account.id
- = form.label :endpoint, t('.endpoint')
+ = form.label :endpoint
= form.text_field :endpoint, :class => 'em long'
%p.clearfix
- = form.label :key, t('.key')
+ = form.label :key
= form.text_field :key
%p.clearfix
- = form.label :secret, t('.secret')
+ = form.label :secret
= password_field_tag "config_server[secret]", @config_server.secret
%fieldset.options
diff --git a/src/app/views/deployables/_form.html.haml b/src/app/views/deployables/_form.html.haml
index 3a372cd..609715f 100644
--- a/src/app/views/deployables/_form.html.haml
+++ b/src/app/views/deployables/_form.html.haml
@@ -15,13 +15,13 @@
- else
%em=t('deployables.new.no_catalog_selected')
%p.clearfix
- = form.label :name, t('deployables.index.name')
+ = form.label :name
= form.text_field :name, :class => 'long'
%p.clearfix
- = form.label :description, t('.description')
+ = form.label :description
= form.text_area :description, :class => 'long'
%p.clearfix
- = form.label :xml, t('.deployable_xml')
+ = form.label :xml
%span.text_instead_input= link_to t("deployables.properties.edit_deployable_xml"), edit_polymorphic_path([@catalog, @deployable], :edit_xml=>true)
%fieldset.align-center
diff --git a/src/app/views/deployables/_from_url.html.haml b/src/app/views/deployables/_from_url.html.haml
index dc5c8a4..8ac3c83 100644
--- a/src/app/views/deployables/_from_url.html.haml
+++ b/src/app/views/deployables/_from_url.html.haml
@@ -11,10 +11,10 @@
- else
%em=t('deployables.new.no_catalog_selected')
%p.clearfix
- = form.label :name, t('deployables.index.name')
+ = form.label :name
= form.text_field :name, :class => 'em long'
%p.clearfix
- = form.label :description, t('deployables.form.description')
+ = form.label :description
= form.text_area :description, :class => 'long'
%p.clearfix
= label_tag :url, t('deployables.form.deployable_xml_url')
diff --git a/src/app/views/deployables/_upload.html.haml b/src/app/views/deployables/_upload.html.haml
index e26ae15..34688da 100644
--- a/src/app/views/deployables/_upload.html.haml
+++ b/src/app/views/deployables/_upload.html.haml
@@ -11,10 +11,10 @@
- else
%em=t('deployables.new.no_catalog_selected')
%p.clearfix
- = form.label :name, t('deployables.index.name')
+ = form.label :name
= form.text_field :name, :class => 'em long'
%p.clearfix
- = form.label :description, t('deployables.form.description')
+ = form.label :description
= form.text_area :description, :class => 'long'
%p.clearfix
= form.label :xml, t('deployables.form.choose_xml')
diff --git a/src/app/views/deployments/_edit.html.haml b/src/app/views/deployments/_edit.html.haml
index 95612ff..eb55f6b 100644
--- a/src/app/views/deployments/_edit.html.haml
+++ b/src/app/views/deployments/_edit.html.haml
@@ -4,7 +4,7 @@
= form_for @deployment do
%ul
%li
- = label :deployment, t('name')
+ = label :deployment
= text_field :deployment, :name
= submit_tag t('cancel'), :name => 'cancel'
diff --git a/src/app/views/hardware_profiles/_form.html.haml b/src/app/views/hardware_profiles/_form.html.haml
index 606ad3e..58e6c1c 100644
--- a/src/app/views/hardware_profiles/_form.html.haml
+++ b/src/app/views/hardware_profiles/_form.html.haml
@@ -1,6 +1,6 @@
- if @hardware_profile.errors.any?
= render 'layouts/error_messages', :object => @hardware_profile
-= hwp_form.label :name, t('hardware_profiles.form.name')
+= hwp_form.label :name
= hwp_form.text_field :name
%table
%thead
diff --git a/src/app/views/instances/_edit.html.haml b/src/app/views/instances/_edit.html.haml
index 78d3c88..0ea4240 100644
--- a/src/app/views/instances/_edit.html.haml
+++ b/src/app/views/instances/_edit.html.haml
@@ -4,7 +4,7 @@
= form_for @instance do
%ul
%li
- = label :instance, t('instances.edit.name')
+ = label :instance, :name
= text_field :instance, :name
= submit_tag t('cancel'), :name => 'cancel'
diff --git a/src/app/views/layouts/_error_messages.html.haml b/src/app/views/layouts/_error_messages.html.haml
index 5ce1fab..b216ae2 100644
--- a/src/app/views/layouts/_error_messages.html.haml
+++ b/src/app/views/layouts/_error_messages.html.haml
@@ -5,6 +5,6 @@
=image_tag 'flash_warning_icon.png', :alt => 'Errors'
%ul.flashes
%li
- %strong= t("errors.template.header", :count => object.errors.count)
+ %strong= t("errors.template.header", :model => object.class.model_name.human, :count => object.errors.count)
- object.errors.full_messages.each do |msg|
%li= msg
diff --git a/src/app/views/pool_families/_form.html.haml b/src/app/views/pool_families/_form.html.haml
index 44fb02c..ffd69eb 100644
--- a/src/app/views/pool_families/_form.html.haml
+++ b/src/app/views/pool_families/_form.html.haml
@@ -2,7 +2,7 @@
= render 'layouts/error_messages', :object => @pool_family
%fieldset
%p.clearfix
- = form.label :name, t("pool_families.form.pool_family_name")
+ = form.label :name
= form.text_field :name, :title => 'pool_family_name', :value => @pool_family.name, :class => 'em long'
= form.fields_for :quota do |quota_form|
diff --git a/src/app/views/pools/_form.html.haml b/src/app/views/pools/_form.html.haml
index 98f9c44..a167e37 100644
--- a/src/app/views/pools/_form.html.haml
+++ b/src/app/views/pools/_form.html.haml
@@ -4,10 +4,10 @@
%fieldset
%p
- = form.label :name, t('name'), :class => 'em'
+ = form.label :name, :class => 'em'
= form.text_field :name, :class => 'em long'
%p
- = form.label :pool_family_id, t("pool_families.pool_family")
+ = form.label :pool_family_id
- if @pool_families
= form.collection_select :pool_family_id, @pool_families, :id, :name
- else
diff --git a/src/app/views/providers/_form.html.haml b/src/app/views/providers/_form.html.haml
index a932dc4..395c911 100644
--- a/src/app/views/providers/_form.html.haml
+++ b/src/app/views/providers/_form.html.haml
@@ -2,13 +2,13 @@
= render 'layouts/error_messages', :object => @provider
%fieldset
%p.clearfix
- = form.label :name, t('providers.form.provider_name')
- = form.text_field :name, :title => t('providers.form.provider_name'), :value => @provider.name, :class => 'long'
+ = form.label :name
+ = form.text_field :name, :value => @provider.name, :class => 'long'
%p.clearfix
- = form.label :url, t('providers.form.provider_url')
- = form.text_field :url, :title => t('providers.form.provider_url'), :value => @provider.url, :class => 'long'
+ = form.label :url
+ = form.text_field :url, :value => @provider.url, :class => 'long'
%p.clearfix
- = form.label :provider_type_id, t('providers.form.provider_type')
+ = form.label :provider_type_id
= form.select(:provider_type_id, @provider_type_options, :prompt => t('providers.form.select_type_of_provider'))
%p.clearfix
= form.label :deltacloud_provider, t('providers.form.x_deltacloud_provider.generic')
diff --git a/src/app/views/realms/_form.html.haml b/src/app/views/realms/_form.html.haml
index 21d7a67..99eee2e 100644
--- a/src/app/views/realms/_form.html.haml
+++ b/src/app/views/realms/_form.html.haml
@@ -2,10 +2,10 @@
= render 'layouts/error_messages', :object => @realm
%fieldset
%p.clearfix
- = form.label :name, t('realms.form.realm_name')
+ = form.label :name
= form.text_field :name, :title => 'realm_name', :value => @realm.name, :class => 'em long'
%p.clearfix
- = form.label :description, t('.description')
+ = form.label :description
= form.text_area :description, :title => 'description', :value => @realm.description
%fieldset.options
diff --git a/src/app/views/realms/new.html.haml b/src/app/views/realms/new.html.haml
index c4b5ba1..28cecae 100644
--- a/src/app/views/realms/new.html.haml
+++ b/src/app/views/realms/new.html.haml
@@ -1,6 +1,6 @@
= render :partial => 'layouts/admin_nav'
%header.admin-page-header
- %h1= @title
+ %h1= t 'realms.new.create_realm'
#obj_actions
.return_to
=t'return_to'
diff --git a/src/app/views/roles/_form.html.haml b/src/app/views/roles/_form.html.haml
index d40ca09..ff8475f 100644
--- a/src/app/views/roles/_form.html.haml
+++ b/src/app/views/roles/_form.html.haml
@@ -1,7 +1,7 @@
- if @role.errors.any?
= render 'layouts/error_messages', :object => @role
%fieldset
- = form.label :name, t('roles.form.name')
+ = form.label :name
= form.text_field :name, :class => "em long"
%fieldset.options
= form.submit t('save'), :class => "submit button"
diff --git a/src/app/views/users/_form.html.haml b/src/app/views/users/_form.html.haml
index 008d8e9..3115823 100644
--- a/src/app/views/users/_form.html.haml
+++ b/src/app/views/users/_form.html.haml
@@ -3,10 +3,10 @@
%fieldset
%p.clearfix
- = form.label :first_name, t(:first_name)
+ = form.label :first_name
= form.text_field :first_name, :class =>"check_change"
%p.clearfix
- = form.label :last_name, t(:last_name)
+ = form.label :last_name
= form.text_field :last_name, :class =>"check_change"
%p.clearfix
= form.label :email, t(:email), :required => true
diff --git a/src/config/locales/activerecord/en.yml b/src/config/locales/activerecord/en.yml
new file mode 100644
index 0000000..e93499c
--- /dev/null
+++ b/src/config/locales/activerecord/en.yml
@@ -0,0 +1,345 @@
+en:
+ activerecord:
+ models:
+ base_permission_object: "Base Permission Object"
+ catalog_entry: "Catalog Entry"
+ catalog: "Catalog"
+ config_server: "Config Server"
+ credential_definition: "Credential Definition"
+ credential: "Credential"
+ delayed_job: "Delayed Job"
+ deployable: "Deployable"
+ deployment: "Deployment"
+ event: "Event"
+ frontend_realm: "Frontend Realm"
+ hardware_profile_propertie: "Hardware Profile Propertie"
+ hardware_profile: "Hardware Profile"
+ hook: "Hook"
+ icicle: "Icicle"
+ instance_hwp: "Instance Hwp"
+ instance_key: "Instance Key"
+ instance_parameter: "Instance Parameter"
+ instance: "Instance"
+ metadata_object: "Metadata Object"
+ permission: "Permission"
+ pool_family: "Pool Family"
+ pool: "Pool"
+ privilege: "Privilege"
+ property_enum_entry: "Property Enum Entry"
+ provider_account: "Provider Account"
+ provider_type: "Provider Type"
+ provider: "Provider"
+ quota: "Quota"
+ realm_backend_target: "Realm Backend Target"
+ realm: "Realm"
+ role: "Role"
+ session: "Session"
+ task: "Task"
+ user: "User"
+ view_state: "View State"
+ attributes:
+ base_permission_object:
+ name: "Name"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ catalog_entry:
+ catalog_id: "Catalog"
+ deployable_id: "Deployable"
+ catalog:
+ pool_id: "Pool"
+ name: "Name"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ pool_family_id: "Pool Family"
+ config_server:
+ endpoint: "Server Endpoint (URL)"
+ key: "Consumer Key"
+ secret: "Consumer Secret"
+ provider_account_id: "Provider Account"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ credential_definition:
+ name: "Name"
+ label: "Label"
+ input_type: "Input Type"
+ provider_type_id: "Provider Type"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ credential:
+ provider_account_id: "Provider Account"
+ value: "Value"
+ credential_definition_id: "Credential Definition"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ delayed_job:
+ priority: "Priority"
+ attempts: "Attempts"
+ handler: "Handler"
+ last_error: "Last Error"
+ run_at: "Run At"
+ locked_at: "Locked At"
+ failed_at: "Failed At"
+ locked_by: "Locked By"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ deployable:
+ name: "Name"
+ description: "Description"
+ xml: "Deployable XML"
+ xml_filename: "XML Filename"
+ owner_id: "Owner"
+ pool_family_id: "Pool Family"
+ deployment:
+ name: "Name"
+ realm_id: "Realm"
+ owner_id: "Owner"
+ pool_id: "Pool"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ frontend_realm_id: "Frontend Realm"
+ deployable_xml: "Deployable Xml"
+ scheduled_for_deletion: "Scheduled For Deletion"
+ uuid: "Uuid"
+ pool_family_id: "Pool Family"
+ event:
+ source_id: "Source"
+ source_type: "Source Type"
+ event_time: "Event Time"
+ status_code: "Status Code"
+ summary: "Summary"
+ description: "Description"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ frontend_realm:
+ name: "Name"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ description: "Description"
+ hardware_profile_property:
+ name: "Name"
+ kind: "Kind"
+ unit: "Unit"
+ value: "Value"
+ range_first: "Range First"
+ range_last: "Range Last"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ hardware_profile:
+ external_key: "External Key"
+ name: "Name"
+ memory_id: "Memory"
+ storage_id: "Storage"
+ cpu_id: "Cpu"
+ architecture_id: "Architecture"
+ provider_id: "Provider"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ hook:
+ uri: "Uri"
+ version: "Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ icicle:
+ uuid: "Uuid"
+ xml: "Xml"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ instance_hwp:
+ memory: "Memory"
+ cpu: "Cpu"
+ architecture: "Architecture"
+ storage: "Storage"
+ lock_version: "Lock Version"
+ instance_key:
+ instance_id: "Instance"
+ name: "Name"
+ pem: "Pem"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ instance_parameter:
+ service: "Service"
+ name: "Name"
+ type: "Type"
+ value: "Value"
+ instance_id: "Instance"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ instance:
+ external_key: "External Key"
+ name: "Name"
+ hardware_profile_id: "Hardware Profile"
+ frontend_realm_id: "Frontend Realm"
+ owner_id: "Owner"
+ pool_id: "Pool"
+ provider_account_id: "Provider Account"
+ instance_hwp_id: "Instance Hwp"
+ public_addresses: "Public Addresses"
+ private_addresses: "Private Addresses"
+ state: "State"
+ last_error: "Last Error"
+ lock_version: "Lock Version"
+ acc_pending_time: "Acc Pending Time"
+ acc_running_time: "Acc Running Time"
+ acc_shutting_down_time: "Acc Shutting Down Time"
+ acc_stopped_time: "Acc Stopped Time"
+ time_last_pending: "Time Last Pending"
+ time_last_running: "Time Last Running"
+ time_last_shutting_down: "Time Last Shutting Down"
+ time_last_stopped: "Time Last Stopped"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ deployment_id: "Deployment"
+ assembly_xml: "Assembly Xml"
+ image_uuid: "Image Uuid"
+ image_build_uuid: "Image Build Uuid"
+ provider_image_uuid: "Provider Image Uuid"
+ provider_instance_id: "Provider Instance"
+ instance_config_xml: "Instance Config Xml"
+ user_data: "User Data"
+ uuid: "Uuid"
+ secret: "Secret"
+ pool_family_id: "Pool Family"
+ metadata_object:
+ key: "Key"
+ value: "Value"
+ object_type: "Object Type"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ permission:
+ role_id: "Role"
+ user_id: "User"
+ permission_object_id: "Permission Object"
+ permission_object_type: "Permission Object Type"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ pool_family:
+ name: "Pool Family Name"
+ description: "Description"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ quota_id: "Quota"
+ pool:
+ name: "Name"
+ exported_as: "Exported As"
+ quota_id: "Quota"
+ pool_family_id: "Pool Family"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ enabled: "Enabled"
+ privilege:
+ role_id: "Role"
+ target_type: "Target Type"
+ action: "Action"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ property_enum_entry:
+ hardware_profile_property_id: "Hardware Profile Property"
+ value: "Value"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ provider_account:
+ label: "Label"
+ provider_id: "Provider"
+ quota_id: "Quota"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ priority: "Priority"
+ provider_type:
+ name: "Name"
+ deltacloud_driver: "Deltacloud Driver"
+ ssh_user: "Ssh User"
+ home_dir: "Home Dir"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ provider:
+ name: "Provider name"
+ url: "Provider URL"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ provider_type_id: "Provider Type"
+ deltacloud_provider: "Deltacloud Provider"
+ enabled: "Enabled"
+ available: "Available"
+ quota:
+ running_instances: "Running Instances"
+ total_instances: "Total Instances"
+ maximum_running_instances: "Maximum Running Instances"
+ maximum_total_instances: "Maximum Total Instances"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ realm_backend_target:
+ realm_or_provider_id: "Realm Or Provider"
+ realm_or_provider_type: "Realm Or Provider Type"
+ frontend_realm_id: "Frontend Realm"
+ realm:
+ external_key: "External Key"
+ name: "Name"
+ provider_id: "Provider"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ available: "Available"
+ role:
+ name: "Name"
+ scope: "Scope"
+ lock_version: "Lock Version"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ assign_to_owner: "Assign To Owner"
+ session:
+ session_id: "Session"
+ data: "Data"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ task:
+ user: "User"
+ type: "Type"
+ action: "Action"
+ state: "State"
+ task_target_id: "Task Target"
+ task_target_type: "Task Target Type"
+ args: "Args"
+ created_at: "Created At"
+ time_submitted: "Time Submitted"
+ time_started: "Time Started"
+ time_ended: "Time Ended"
+ message: "Message"
+ failure_code: "Failure Code"
+ lock_version: "Lock Version"
+ user:
+ login: "Login"
+ email: "Email"
+ crypted_password: "Crypted Password"
+ first_name: "First Name"
+ last_name: "Last Name"
+ quota_id: "Quota"
+ login_count: "Login Count"
+ failed_login_count: "Failed Login Count"
+ last_request_at: "Last Request At"
+ current_login_at: "Current Login At"
+ last_login_at: "Last Login At"
+ current_login_ip: "Current Login Ip"
+ last_login_ip: "Last Login Ip"
+ created_at: "Created At"
+ updated_at: "Updated At"
+ view_state:
+ user_id: "User"
+ name: "Name"
+ controller: "Controller"
+ action: "Action"
+ state: "State"
+ created_at: "Created At"
+ updated_at: "Updated At"
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 1ce89a3..e377cad 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -8,11 +8,6 @@ en:
x_hours:
one: 1 hour
other: "%{count} hours"
- errors:
- template:
- header:
- one: 1 error prohibited this record from being saved
- other: '%{count} errors prohibited this record from being saved'
search:
no_results: "No matching results."
users:
@@ -510,7 +505,6 @@ en:
storage: Storage
virtual_cpu: Virtual CPU
form:
- name: Name
check_matches: Check Matches
history:
history: History
@@ -562,9 +556,6 @@ en:
tab_captions:
properties: Properties
mapping: Mapping
- form:
- realm_name: Realm Name
- description: Description
list:
delete_selected: Delete Selected
mapping:
@@ -629,8 +620,6 @@ en:
environments: Environments
edit:
return_to: "Return to:"
- form:
- pool_family_name: Pool Family Name
flash:
notice:
added: "Pool family was added."
@@ -908,7 +897,6 @@ en:
form:
choose_xml: Choose Deployable XML file
catalog: Catalog
- description: Description
cancel: Cancel
save: Save
deployable_xml: Deployable XML
@@ -1017,9 +1005,6 @@ en:
ec2: EC2 Region
rhevm: RHEV-M API_PROVIDER
vsphere: vSphere API hostname
- provider_name: Provider Name
- provider_url: Provider URL
- provider_type: Provider Type
select_type_of_provider: Select type of provider
caution_alt_text: Caution
enter_correct_url_msg: Please enter a correct URL format.
@@ -1165,10 +1150,6 @@ en:
new_config_server: New Config Server
edit:
edit_config_server: Edit Config Server
- config_server_form:
- endpoint: Server Endpoint (URL)
- key: Consumer Key
- secret: Consumer Secret
flash:
notice:
test_successful: Test successful
@@ -1245,8 +1226,6 @@ en:
new_role: New Role
tab_captions:
properties: Properties
- form:
- name: Name
list:
roles_list: Roles List
properties:
diff --git a/src/features/provider.feature b/src/features/provider.feature
index 85a4568..b1df22e 100644
--- a/src/features/provider.feature
+++ b/src/features/provider.feature
@@ -42,7 +42,7 @@ Feature: Manage Providers
Scenario: Show provider details
Given there is a provider named "testprovider"
When I am on the testprovider's edit provider page
- Then I should see "Provider Name"
+ Then I should see "Provider name"
And I should see "Provider URL"
Scenario: Create a new Provider
diff --git a/src/features/user.feature b/src/features/user.feature
index 01a8467..3fa6c8d 100644
--- a/src/features/user.feature
+++ b/src/features/user.feature
@@ -56,8 +56,8 @@ Feature: Manage Users
| Choose a username | testuser2 |
| Choose a password | secret |
| Confirm password | secret |
- | First name | Joe |
- | Last name | Tester |
+ | First Name | Joe |
+ | Last Name | Tester |
| E-mail | testuser2 at example.com |
And I press "Save"
Then I should be on the users page
@@ -72,8 +72,8 @@ Feature: Manage Users
| Choose a username | testuser2 |
| Choose a password | secret |
| Confirm password | secret |
- | First name | Joe |
- | Last name | Tester |
+ | First Name | Joe |
+ | Last Name | Tester |
| E-mail | testuser2 at example.com |
And I follow "Users"
Then I should be on the users page
--
1.7.7.6
More information about the aeolus-devel
mailing list