---
src/app/controllers/providers_controller.rb | 10 ++++----
src/app/views/providers/_form.html.haml | 16 ++++++------
src/app/views/providers/_properties.html.haml | 12 ++++----
src/app/views/providers/_section_header.html.haml | 10 ++++----
src/app/views/providers/edit.html.haml | 15 ++++-------
src/app/views/providers/index.html.haml | 4 +-
src/app/views/providers/new.html.haml | 10 ++++----
src/app/views/providers/show.html.haml | 2 +-
src/config/locales/en.yml | 27 +++++++++++++++++++-
9 files changed, 63 insertions(+), 43 deletions(-)
diff --git a/src/app/controllers/providers_controller.rb
b/src/app/controllers/providers_controller.rb
index 09ee13d..a219fdf 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -76,8 +76,8 @@ class ProvidersController < ApplicationController
@realm_names = @provider.realms.collect { |r| r.name }
require_privilege(Privilege::VIEW, @provider)
- @tab_captions = ['Properties', 'HW Profiles', 'Realms',
'Provider Accounts', 'Services', 'History',
'Permissions']
- @details_tab = params[:details_tab].blank? ? 'properties' :
params[:details_tab]
+ @tab_captions = [t("properties"), t('hw_profiles'),
t('realm_s'), t("provider_accounts.index.provider_accounts"),
t('services'), t('history'), t('permissions')]
+ @details_tab = params[:details_tab].blank? ? t("properties") :
params[:details_tab]
if params.delete :test_provider
test_connection(@provider)
@@ -209,9 +209,9 @@ class ProvidersController < ApplicationController
def load_provider_tabs
@realms = @provider.all_associated_frontend_realms
#TODO add links to real data for history,properties,permissions
- @tabs = [{:name => 'Connectivity', :view => 'edit', :id =>
'connectivity', :count => @provider.provider_accounts.count},
- {:name => 'Accounts', :view =>
'provider_accounts/list', :id => 'accounts', :count =>
@provider.provider_accounts.count},
- {:name => 'Realms', :view => 'realms/list', :id =>
'realms', :count => @realms.count},
+ @tabs = [{:name => t('connectivity'), :view => 'edit', :id
=> 'connectivity', :count => @provider.provider_accounts.count},
+ {:name => t('accounts'), :view =>
'provider_accounts/list', :id => 'accounts', :count =>
@provider.provider_accounts.count},
+ {:name => t('realm_s'), :view => 'realms/list', :id
=> 'realms', :count => @realms.count},
#{:name => 'Roles & Permissions', :view => @view, :id
=> 'roles', :count => @provider.permissions.count},
]
add_permissions_tab(@provider, "edit_")
diff --git a/src/app/views/providers/_form.html.haml
b/src/app/views/providers/_form.html.haml
index 75d504e..fe8f17f 100644
--- a/src/app/views/providers/_form.html.haml
+++ b/src/app/views/providers/_form.html.haml
@@ -2,14 +2,14 @@
= render 'layouts/error_messages', :object => @provider
%fieldset
%p
- = form.label :name,'Provider name:'
- = form.text_field :name, :title => 'provider_name', :value =>
@provider.name, :class => 'long'
+ = form.label :name, t('providers.form.provider_name')
+ = form.text_field :name, :title => t('providers.form.provider_name'),
:value => @provider.name, :class => 'long'
%p
- = form.label :url, 'Provider URL:'
- = form.text_field :url, :title => 'provider_url', :value =>
@provider.url, :class => 'long'
+ = form.label :url, t('providers.form.provider_url')
+ = form.text_field :url, :title => t('providers.form.provider_url'), :value
=> @provider.url, :class => 'long'
%p
- = form.label :provider_type, 'Provider type:'
- = form.select(:provider_type_id, ProviderType.all.collect {|provider_type|
[provider_type.name,provider_type.id] }, :prompt => "Select type of
provider")
+ = form.label :provider_type, t('providers.form.provider_type')
+ = form.select(:provider_type_id, ProviderType.all.collect {|provider_type|
[provider_type.name,provider_type.id] }, :prompt =>
t('providers.form.select_type_of_provider'))
%p
- = form.label :url, 'X-Deltacloud-Provider:'
- = form.text_field :deltacloud_provider, :title => 'deltacloud_provider',
:value => @provider.deltacloud_provider, :class => 'long'
+ = form.label :url, t('providers.form.x_deltacloud_provider')
+ = form.text_field :deltacloud_provider, :title =>
t('providers.form.x_deltacloud_provider'), :value =>
@provider.deltacloud_provider, :class => 'long'
diff --git a/src/app/views/providers/_properties.html.haml
b/src/app/views/providers/_properties.html.haml
index ee8a768..1280666 100644
--- a/src/app/views/providers/_properties.html.haml
+++ b/src/app/views/providers/_properties.html.haml
@@ -2,32 +2,32 @@
%thead
%tr
%th.show
- Properties for
+ =t("catalog_entries.properties.properties_for")
= @provider.name
%th.show
%tbody
%tr
%td
- %label Provider name
+ %label= t("providers.index.provider_name")
%td
= @provider.name
%tr
%td
- %label Provider URL
+ %label= t("providers.index.provider_url")
%td
= @provider.url
%tr
%td
- %label Provider Type
+ %label= t("providers.index.provider_type")
%td
= @provider.provider_type.name
%tr
%td
- %label X-Deltacloud-Driver
+ %label= t("providers.index.x_deltacloud_driver")
%td
= @provider.provider_type.deltacloud_driver
%tr
%td
- %label X-Deltacloud-Provider
+ %label= t("providers.index.x_deltacloud_provider")
%td
= @provider.deltacloud_provider
diff --git a/src/app/views/providers/_section_header.html.haml
b/src/app/views/providers/_section_header.html.haml
index a513407..8c59da3 100644
--- a/src/app/views/providers/_section_header.html.haml
+++ b/src/app/views/providers/_section_header.html.haml
@@ -1,15 +1,15 @@
%header.admin-page-header
- %h1{:class => @provider.enabled ? 'enabled' : 'disabled'}=
@provider.name.blank? ? "Editing Provider" : @provider.name
+ %h1{:class => @provider.enabled ? 'enabled' : 'disabled'}=
@provider.name.blank? ? t("providers.editing_provider") : @provider.name
#obj_actions
- %span.label.light Choose a provider:
+ %span.label.light= t("providers.choose_a_provider")
%ul#provider_select
%li
- = link_to @provider.name.blank? ? "Editing Provider" : @provider.name,
"javascript:void(0)"
+ = link_to @provider.name.blank? ? t("providers.editing_provider") :
@provider.name, "javascript:void(0)"
%ul
- %li= link_to "+ Create New Provider", new_provider_path, :id =>
"create_new_provider"
+ %li= link_to "+" +
t("providers.index.create_new_provider"), new_provider_path, :id =>
"create_new_provider"
- @providers.each do |provider|
%li= link_to provider.name, edit_provider_path(provider)
= form_for @provider, :url => provider_path(@provider), :html => { :method
=> :put, :class => 'generic' } do |f|
= f.hidden_field :enabled, :value => !(a)provider.enabled
- = f.submit "", :confirm => "#{(a)provider.enabled ? "Disable
provider? All it's instances will be stopped!" : 'Enable
provider?'}", :class => "provider_toggle #{(a)provider.enabled ?
"on" : "off"}"
+ = f.submit "", :confirm => "#{(a)provider.enabled ?
t("providers.disable_provider") :
t("providers.enable_provider")}", :class => "provider_toggle
#{(a)provider.enabled ? "on" : "off"}"
diff --git a/src/app/views/providers/edit.html.haml
b/src/app/views/providers/edit.html.haml
index a1590eb..de14d1f 100644
--- a/src/app/views/providers/edit.html.haml
+++ b/src/app/views/providers/edit.html.haml
@@ -4,22 +4,19 @@
- unless @provider.enabled
%section.admin-content-section
%header.align-center
- %h2.disabled Provider is disabled.
+ %h2.disabled= t('providers.form.provider_id_disabled')
%p.align-center
- The provider "
- = @provider.name
- " is currently
- %strong disabled.
- To enable and configure provider, click the slide switch in the upper-right-hand
corner of this window.
+ = t("providers.edit.provider_disabled", :name => @provider.name)
+ = t("providers.edit.enable_configure_providers")
= image_tag "provider_enable_hint.png"
%section.admin-content-section.alerts
%header
%h2.alerts
- Alerts
+ = t("alerts_label")
%span.label.badge.count.alert= @alerts.count
.section-controls
- = link_to "Toggle Alerts", "#", :class => 'collapse
alerts' unless @alerts.blank?
+ = link_to t("providers.edit.toggle_alerts"), "#", :class =>
'collapse alerts' unless @alerts.blank?
- unless @alerts.blank?
.content.collapsible
%dl.alerts
@@ -37,7 +34,7 @@
/ unimplemented
%section.admin-content-section
%header#tab-container-1
- %h2.settings Settings
+ %h2.settings= t("settings.settings")
%nav.faceted
%ul#tab-container-1-nav
- @tabs.each do |tab|
diff --git a/src/app/views/providers/index.html.haml
b/src/app/views/providers/index.html.haml
index 1b2f482..fe749df 100644
--- a/src/app/views/providers/index.html.haml
+++ b/src/app/views/providers/index.html.haml
@@ -1,4 +1,4 @@
= render :partial => 'layouts/admin_nav'
%section.admin-content-section.provider
- No providers available. Please create one first.
- = link_to "Create New Provider", new_provider_path, :class =>
'button', :id => "create_new_provider"
+ = t("providers.index.no_providers_available")
+ = link_to t("providers.index.create_new_provider"), new_provider_path, :class
=> 'button', :id => "create_new_provider"
\ No newline at end of file
diff --git a/src/app/views/providers/new.html.haml
b/src/app/views/providers/new.html.haml
index 48baf5c..290100d 100644
--- a/src/app/views/providers/new.html.haml
+++ b/src/app/views/providers/new.html.haml
@@ -1,21 +1,21 @@
= render :partial => 'layouts/admin_nav'
%header.admin-page-header
- %h1= @provider.name.blank? ? "New Provider" : @provider.name
+ %h1= @provider.name.blank? ? t("providers.new.new_provider") :
@provider.name
#obj_actions
%span.label.light Choose a provider:
%ul#provider_select
%li
- = link_to "Create New Provider", "javascript:void(0)"
+ = link_to t("providers.index.create_new_provider"),
"javascript:void(0)"
%ul
- %li= link_to "+ Create New Provider", new_provider_path, :id =>
"create_new_provider"
+ %li= link_to "+ " +
t("providers.index.create_new_provider"), new_provider_path, :id =>
"create_new_provider"
- @providers.each do |provider|
%li= link_to provider.name, edit_provider_path(provider)
%section.admin-content-section.users
%header
- %h2.settings Settings
+ %h2.settings= t("settings.settings")
.content
= form_for @provider, :url => providers_path, :html => {:class =>
'generic'} do |f|
= render :partial => "form", :locals => { :form => f,
:cancel_path => providers_path }
%fieldset.options
- = f.submit "Save Provider", :class => "submit button
pill", :id => 'save'
+ = f.submit t("providers.new.save_provider"), :class => "submit
button pill", :id => 'save'
diff --git a/src/app/views/providers/show.html.haml
b/src/app/views/providers/show.html.haml
index 797c43a..2a9896e 100644
--- a/src/app/views/providers/show.html.haml
+++ b/src/app/views/providers/show.html.haml
@@ -3,7 +3,7 @@
%section.admin-content-section.provider
%header
- %h2 Properties
+ %h2= t("properties")
.content
%div#view
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 811d4a4..86b1cec 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -143,6 +143,12 @@ en:
quota_used: Quota Used
return_to: Return to
properties: Properties
+ hw_profiles: HW Profiles
+ services: Services
+ history: History
+ realm_s: Realms
+ connectivity: Connectivity
+ accounts: Accounts
catalog_images: Catalog Images
quota: Quota
deployments:
@@ -577,6 +583,10 @@ en:
provider: Provider
providers: Providers
confirm_delete: "Are you sure you want to delete this provider?"
+ editing_provider: Editing Provider
+ choose_a_provider: "Choose a provider:"
+ disable_provider: "Disable provider? All it's instances will be
stopped!"
+ enable_provider: "Enable provider?"
index:
provider_name: Provider Name
provider_url: Provider URL
@@ -584,9 +594,22 @@ en:
x_deltacloud_driver: X-Deltacloud-Driver
x_deltacloud_provider: X-Deltacloud-Provider
deleted: "Provider has been successfully deleted."
+ no_providers_available: No providers available. Please create one first.
+ create_new_provider: "Create New Provider"
+ new:
+ new_provider: New Provider
+ save_provider: Save Provider
+ edit:
+ provider_id_disabled: "Provider is disabled."
+ toggle_alerts: Toggle Alerts
+ provider_disabled: "The provider %{name} is currently disabled."
+ enable_configure_providers: "To enable and configure provider, click the slide
switch in the upper-right-hand corner of this window."
form:
- provider_name: Provider Name
- provider_url: Provider URL
+ x_deltacloud_provider: "X-Deltacloud-Provider:"
+ 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.
test_connection: Test Connection
--
1.7.6.4