From: Tomas Sedovic <tsedovic(a)redhat.com>
https://www.aeolusproject.org/redmine/issues/2610
---
src/app/controllers/config_servers_controller.rb | 14 +++++++-------
.../views/config_servers/_config_server_form.haml | 10 +++++-----
src/app/views/config_servers/_section_header.haml | 2 +-
src/app/views/config_servers/edit.haml | 2 +-
src/app/views/config_servers/new.haml | 2 +-
src/config/locales/en.yml | 20 +++++++++++++++++++-
6 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/app/controllers/config_servers_controller.rb
b/src/app/controllers/config_servers_controller.rb
index 03fc28f..7f29a6d 100644
--- a/src/app/controllers/config_servers_controller.rb
+++ b/src/app/controllers/config_servers_controller.rb
@@ -25,7 +25,7 @@ class ConfigServersController < ApplicationController
if not config_server.connection_valid?
flash[:error] = config_server.connection_error_msg
else
- flash[:notice] = "Test successful"
+ flash[:notice] = t('config_servers.flash.notice.test_successful')
end
provider_account = config_server.provider_account
provider = provider_account.provider
@@ -41,11 +41,11 @@ class ConfigServersController < ApplicationController
@config_server = ConfigServer.new(params[:config_server])
@config_server.provider_account = @provider_account
if @config_server.invalid?
- flash[:error] = "The config server information is invalid."
+ flash[:error] = t('config_servers.flash.error.invalid')
render :action => 'new' and return
end
@config_server.save!
- flash[:notice] = "Config server added."
+ flash[:notice] = t('config_servers.flash.notice.added')
redirect_to provider_provider_account_path((a)provider_account.provider,
@provider_account)
end
@@ -55,10 +55,10 @@ class ConfigServersController < ApplicationController
require_privilege(Privilege::MODIFY, @provider_account)
if @config_server.update_attributes(params[:config_server])
- flash[:notice] = "Config server updated."
+ flash[:notice] = t('config_servers.flash.notice.updated')
redirect_to provider_provider_account_path((a)provider_account.provider,
@provider_account)
else
- flash[:error] = "Config server was not updated"
+ flash[:error] = t('config_servers.flash.error.not_updated')
render :action => :edit
end
end
@@ -67,9 +67,9 @@ class ConfigServersController < ApplicationController
@config_server = ConfigServer.find(params[:id])
require_privilege(Privilege::MODIFY, @config_server.provider_account)
if ConfigServer.destroy(params[:id])
- flash[:notice] = "Config server was deleted."
+ flash[:notice] = t('config_servers.flash.notice.deleted')
else
- flash[:error] = "Config server was not deleted"
+ flash[:error] = t('config_servers.flash.error.not_deleted')
end
provider_account = @config_server.provider_account
provider = provider_account.provider
diff --git a/src/app/views/config_servers/_config_server_form.haml
b/src/app/views/config_servers/_config_server_form.haml
index 4896778..ebbd1f4 100644
--- a/src/app/views/config_servers/_config_server_form.haml
+++ b/src/app/views/config_servers/_config_server_form.haml
@@ -3,19 +3,19 @@
%fieldset
%p
= hidden_field_tag "provider_account_id", @provider_account.id
- = form.label :host
+ = form.label :host, t('.host')
= form.text_field :host, :class => 'em long'
%p
- = form.label :port
+ = form.label :port, t('.port')
= form.text_field :port
%p
- = form.label :username
+ = form.label :username, t('.username')
= form.text_field :username
%p
- = form.label :password
+ = form.label :password, t('.password')
= password_field_tag "config_server[password]", @config_server.password
%p
- = form.label :certificate
+ = form.label :certificate, t('.certificate')
%div.help
= t('config_servers.certificate_help')
= form.text_area :certificate, :rows => 20, :cols => 64
diff --git a/src/app/views/config_servers/_section_header.haml
b/src/app/views/config_servers/_section_header.haml
index d8e75fe..bdf4b48 100644
--- a/src/app/views/config_servers/_section_header.haml
+++ b/src/app/views/config_servers/_section_header.haml
@@ -1,3 +1,3 @@
%header.page-header
- %h1{:class => controller.controller_name} Config Server
+ %h1{:class => controller.controller_name}= t('.config_server')
.corner
diff --git a/src/app/views/config_servers/edit.haml
b/src/app/views/config_servers/edit.haml
index 07b3abe..b0586a6 100644
--- a/src/app/views/config_servers/edit.haml
+++ b/src/app/views/config_servers/edit.haml
@@ -3,7 +3,7 @@
%section.content-section.config_server
%header
- %h2 Edit Config Server
+ %h2= t('.edit_config_server')
.content
= form_for @config_server, :url => config_server_path(@config_server), :html =>
{:method => :put, :class => "generic"} do |f|
diff --git a/src/app/views/config_servers/new.haml
b/src/app/views/config_servers/new.haml
index 9ea48b2..8495f73 100644
--- a/src/app/views/config_servers/new.haml
+++ b/src/app/views/config_servers/new.haml
@@ -3,7 +3,7 @@
%section.content-section.config_server
%header
- %h2 New Config Server
+ %h2= t('.new_config_server')
.content
= form_for @config_server, :url => config_servers_path, :html => {:class =>
"generic"} do |f|
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 86b1cec..f5bc69b 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -692,10 +692,28 @@ en:
must_select_account: "You must select some accounts first."
config_servers:
certificate_help: Provide a certificate to enable https support
+ section_header:
+ config_server: Config Server
new:
new_config_server: New Config Server
edit:
edit_config_server: Edit Config Server
+ config_server_form:
+ host: Host
+ port: Port
+ username: Username
+ password: Password
+ certificate: Certificate
+ flash:
+ notice:
+ test_successful: Test successful
+ added: Config server added.
+ updated: Config server updated.
+ deleted: Config server was deleted.
+ error:
+ invalid: The config server information is invalid.
+ not_updated: Config server was not updated
+ not_deleted: Config server was not deleted
errors:
connection:
generic: "Could not validate config server connection (url: %{url}). Check
the connection parameters and try again."
@@ -778,4 +796,4 @@ en:
admin_tabs:
catalogs: Catalogs
realms: Realms
- hardware: Hardware
\ No newline at end of file
+ hardware: Hardware
--
1.7.6.4