On Monday 17 October 2011 10:29:04 jzigmund(a)redhat.com wrote:
From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/app/controllers/application_controller.rb | 25 ++-
src/app/controllers/pool_families_controller.rb | 2 +-
src/app/controllers/pools_controller.rb | 32 +-
src/app/controllers/users_controller.rb | 2 +-
src/app/helpers/provider_accounts_helper.rb | 2 +-
src/app/views/deployments/_alerts_show.html.haml | 4 +-
src/app/views/deployments/_list.html.haml | 4 +-
src/app/views/deployments/_pretty_view.html.haml | 16 +-
src/app/views/instances/_list.html.haml | 17 +-
src/app/views/layouts/_filter_table.html.haml | 7 +-
src/app/views/layouts/_masthead.html.haml | 4 +-
src/app/views/layouts/_nav_history.html.haml | 4 +-
src/app/views/layouts/_select_all_none.html.haml | 7 +-
src/app/views/pools/_alerts_index.html.haml | 4 +-
src/app/views/pools/_deployments.html.haml | 6 +-
src/app/views/pools/_edit.html.haml | 6 +-
src/app/views/pools/_form.html.haml | 17 +-
src/app/views/pools/_header_index.html.haml | 4 +-
src/app/views/pools/_header_show.html.haml | 8 +-
src/app/views/pools/_list.html.haml | 6 +-
src/app/views/pools/_new.html.haml | 2 +-
src/app/views/pools/_pretty_list.html.haml | 12 +-
src/app/views/pools/_scoreboard_index.html.haml | 4 +-
src/app/views/pools/_scoreboard_show.html.haml | 12 +-
src/app/views/pools/_section_header.html.haml | 4 +-
src/config/locales/cs.yml | 349
++++++++++++++++++++++ src/config/locales/en.yml |
83 ++++-
27 files changed, 536 insertions(+), 107 deletions(-)
create mode 100644 src/config/locales/cs.yml
diff --git a/src/app/controllers/application_controller.rb
b/src/app/controllers/application_controller.rb index a56556d..7aaa7e5
100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -25,7 +25,7 @@ class ApplicationController < ActionController::Base
# FIXME: not sure what we're doing aobut service layer w/ deltacloud
include ApplicationService
helper_method :current_user, :filter_view?
- before_filter :read_breadcrumbs
+ before_filter :read_breadcrumbs, :set_locale
# General error handlers, must be in order from least specific
# to most specific
@@ -37,7 +37,12 @@ class ApplicationController < ActionController::Base
helper_method :check_privilege
+ def set_locale
+ I18n.locale =
request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first + end
+
protected
+
# permissions checking
def handle_perm_error(error)
@@ -259,4 +264,22 @@ class ApplicationController < ActionController::Base
]
end
+ def set_locale
+ I18n.locale = detect_locale || I18n.default_locale
+ end
+
+ def detect_locale
+ languages = env['HTTP_ACCEPT_LANGUAGE'].split(',')
+ prefs = []
+ languages.each do |language|
+ language += ";q=1.0" unless language.match(";q=\d+\.\d+")
+ lang_code, lang_weight = language.split(";q=")
+ lang_code = lang_code.gsub(/-[a-z]+$/i) { |x| x.upcase }.to_sym
+ prefs << [lang_weight, lang_code]
+ end
+ # This is slightly abusing array sorting
+ ordered_languages = prefs.sort.reverse.collect{|p| p[1]}
+
+ (ordered_languages & I18n.available_locales).first
+ end
end
diff --git a/src/app/controllers/pool_families_controller.rb
b/src/app/controllers/pool_families_controller.rb index eea79ee..15c80e4
100644
--- a/src/app/controllers/pool_families_controller.rb
+++ b/src/app/controllers/pool_families_controller.rb
@@ -151,7 +151,7 @@ class PoolFamiliesController < ApplicationController
@header = [
{:name => '', :sortable => false},
{:name => t("pool_families.index.name"), :sort_attr => :name},
- {:name => t("pool_families.index.quota_used"), :sort_attr =>
:name},
+ {:name => t("quota_used"), :sort_attr => :name},
{:name => t("pool_families.index.quota_limit"), :sort_attr =>
:name}, ]
end
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb index 8f725a4..d1aa7c8 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -41,9 +41,9 @@ class PoolsController < ApplicationController
@user_pools = Pool.list_for_user(current_user, Privilege::VIEW)
if filter_view?
- @tabs = [{:name => 'Pools', :view => 'list', :id =>
'pools'},
- {:name => 'Deployments', :view =>
'deployments/list', :id
=> 'deployments'}, - {:name => 'Instances', :view
=>
'instances/list', :id => 'instances'}, + @tabs = [{:name =>
"#{t'pools.index.pools'}", :view => 'list', :id =>
'pools'}, +
{:name => "#{t'deployments.deployments'}", :view =>
'deployments/list',
:id => 'deployments'}, + {:name =>
"#{t'instances.instances'}", :view => 'instances/list', :id
=>
'instances'}, ]
details_tab_name = params[:details_tab].blank? ? 'pools' :
params[:details_tab] @details_tab = @tabs.find {|t| t[:id] ==
details_tab_name} || @tabs.first[:name].downcase @@ -88,10 +88,10 @@ class
PoolsController < ApplicationController
@view = filter_view? ? 'history_filter' : 'history_pretty'
end
#TODO add links to real data for history,properties,permissions
- @tabs = [{:name => 'Deployments', :view => @view, :id
=>
'deployments', :count => @pool.deployments.count}, + @tabs = [{:name =>
"#{t'deployments.deployments'}",:view => @view, :id =>
'deployments',
:count => @pool.deployments.count}, #{:name => 'History', :view
=>
@view, :id => 'history'}, - {:name =>
'Properties',
:view => 'properties', :id => 'properties'}, -
{:name =>
'Catalog Images', :view => 'images', :id => 'images'}
+
{:name => "#{t'properties'}", :view => 'properties', :id
=> 'properties'},
+ {:name => "#{t'catalog_images'}", :view =>
'images', :id =>
'images'} ]
if "images" == params[:details_tab]
@map = @pool.provider_image_map
@@ -103,7 +103,7 @@ class PoolsController < ApplicationController
end
if @pool.has_privilege(current_user, Privilege::PERM_VIEW)
@roles = Role.find_all_by_scope((a)permission_object.class.name)
- @tabs << {:name => 'Users',
+ @tabs << {:name => "#{t'users.users'}",
:view => 'permissions',
:id => 'permissions',
:count => @pool.permissions.count}
@@ -142,13 +142,13 @@ class PoolsController < ApplicationController
respond_to do |format|
if @pool.save
@pool.assign_owner_roles(current_user)
- flash[:notice] = "Pool added."
+ flash[:notice] = t "pools.flash.notice.added"
format.html { redirect_to :action => 'show', :id => @pool.id }
# TODO - The new UI is almost certainly going to want a new
partial for .js format.js { render :partial => 'show', :id => @pool.id }
format.json { render :json => @pool, :status => :created }
else
- flash.now[:warning] = "Pool creation failed."
+ flash.now[:warning] = t "pools.flash.warning.creation_failed"
format.html { render :new }
format.js { render :partial => 'new' }
format.json { render :json => @pool.errors, :status =>
:unprocessable_entity } @@ -176,12 +176,12 @@ class PoolsController <
ApplicationController @pool.quota.set_maximum_running_instances(limit)
respond_to do |format|
if @pool.update_attributes(params[:pool])
- flash[:notice] = "Pool updated."
+ flash[:notice] = t "pools.flash.notice.updated"
format.html { redirect_to :action => 'show', :id => @pool.id }
format.js { render :partial => 'show', :id => @pool.id }
format.json { render :json => @pool }
else
- flash[:error] = "Pool wasn't updated!"
+ flash[:error] = t "pools.flash.error.not_updated"
format.html { render :action => :edit }
format.js { render :partial => 'edit', :id => @pool.id }
format.json { render :json => @pool.errors, :status =>
:unprocessable_entity } @@ -203,8 +203,8 @@ class PoolsController <
ApplicationController
failed << pool.name
end
end
- flash[:success] = t('pools.index.pool_deleted', :list =>
destroyed.to_sentence, :count => destroyed.size) if destroyed.present? -
flash[:error] = t('pools.index.pool_not_deleted', :list =>
failed.to_sentence, :count => failed.size) if failed.present? +
flash[:success] = t('pools.flash.success.pool_deleted', :list =>
destroyed.to_sentence, :count => destroyed.size) if destroyed.present? +
flash[:error] = t('pools.flash.error.pool_not_deleted', :list =>
failed.to_sentence, :count => failed.size) if failed.present? respond_to
do |format|
# TODO - What is expected to be returned on an AJAX delete?
format.html { redirect_to pools_url }
@@ -235,10 +235,10 @@ class PoolsController < ApplicationController
end
unless destroyed.empty?
- flash[:notice] = t('pools.index.pool_deleted', :count =>
destroyed.length, :list => destroyed.join(', ')) + flash[:notice] =
t('pools.flash.success.pool_deleted', :count => destroyed.length, :list =>
destroyed.join(', ')) end
unless failed.empty?
- error_messages << t('pools.index.pool_not_deleted', :count =>
failed.length, :list => failed.join(', ')) + error_messages <<
t('pools.flash.error.pool_not_deleted', :count => failed.length, :list =>
failed.join(', ')) end
unless error_messages.empty?
flash[:error] = error_messages.join('<br />')
@@ -260,7 +260,7 @@ class PoolsController < ApplicationController
{ :name => t("instances.instances"), :sortable => false },
{ :name => t("pools.index.pending"), :sortable => false },
{ :name => t("pools.index.failed"), :sortable => false },
- { :name => t("pools.index.quota_used"), :sortable => false },
+ { :name => t("quota_used"), :sortable => false },
{ :name => t("pools.index.pool_family"), :sortable => false },
]
diff --git a/src/app/controllers/users_controller.rb
b/src/app/controllers/users_controller.rb index 4c64715..f4da86e 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -153,7 +153,7 @@ class UsersController < ApplicationController
{ :name => t('users.index.user_id'), :sortable => false },
{ :name => t('users.index.last_name'), :sortable => false },
{ :name => t('users.index.first_name'), :sortable => false },
- { :name => t('users.index.quota_used'), :sortable => false },
+ { :name => t('quota_used'), :sortable => false },
{ :name => t('users.index.quota_instances'), :sortable => false },
{ :name => t('users.index.email'), :sortable => false },
]
diff --git a/src/app/helpers/provider_accounts_helper.rb
b/src/app/helpers/provider_accounts_helper.rb index 5adfaf2..28c6e64
100644
--- a/src/app/helpers/provider_accounts_helper.rb
+++ b/src/app/helpers/provider_accounts_helper.rb
@@ -6,7 +6,7 @@ module ProviderAccountsHelper
{ :name => t("provider_accounts.index.username"), :sortable =>
false}, { :name => t("provider_accounts.index.provider_name"), :sortable
=> false }, { :name => t("provider_accounts.index.provider_type"),
:sortable => false }, - { :name =>
t("provider_accounts.index.quota_used"), :sortable => false }, + {
:name => t("quota_used"), :sortable => false },
{ :name => t("provider_accounts.index.quota_limit"), :sortable =>
false } ]
end
diff --git a/src/app/views/deployments/_alerts_show.html.haml
b/src/app/views/deployments/_alerts_show.html.haml index 3010828..4bd68c8
100644
--- a/src/app/views/deployments/_alerts_show.html.haml
+++ b/src/app/views/deployments/_alerts_show.html.haml
@@ -1,7 +1,7 @@
- if @failed_instances.count > 0
%section.content-section.alerts
%header
- %h2 Alerts
+ %h2=t 'alerts_label'
%span.label.badge.alert.count= @failed_instances.length
.section-controls
-#%a.collapse{'href'=>'#'} Collapse
@@ -11,5 +11,5 @@
- @failed_instances.each do |inst|
%li.alert
%dt.subject.critical= inst.name
- %dd.type Instance Failure
+ %dd.type=t 'alerts.instance_failure'
%dd.desc= "#{inst.last_error.blank? ? inst.state :
inst.last_error}" diff --git a/src/app/views/deployments/_list.html.haml
b/src/app/views/deployments/_list.html.haml index 8a0504c..4b7a45f 100644
--- a/src/app/views/deployments/_list.html.haml
+++ b/src/app/views/deployments/_list.html.haml
@@ -2,8 +2,8 @@
= render :partial => '/layouts/notification'
- content_for :form_header do
- %li= restful_submit_tag 'Stop Selected', 'stop',
multi_stop_deployments_path, 'POST', :class => 'button', :id =>
"stop_button" - %li= restful_submit_tag 'Delete Selected',
'destroy',
multi_destroy_deployments_path, 'DELETE', :class => 'button danger',
:id
=> "delete_button" + %li= restful_submit_tag
"#{t'deployments.list.stop_selected'}", 'stop',
multi_stop_deployments_path, 'POST', :class => 'button', :id =>
"stop_button" + %li= restful_submit_tag
"#{t'deployments.list.delete_selected'}", 'destroy',
multi_destroy_deployments_path, 'DELETE', :class => 'button danger',
:id
=> "delete_button" = hidden_field_tag 'backlink', request.url
= filter_table(@deployments_header, @deployments) do |deployment|
diff --git a/src/app/views/deployments/_pretty_view.html.haml
b/src/app/views/deployments/_pretty_view.html.haml index ccaad6c..9f9af4f
100644
--- a/src/app/views/deployments/_pretty_view.html.haml
+++ b/src/app/views/deployments/_pretty_view.html.haml
@@ -8,15 +8,15 @@
%dl.statistics
%ul
%li.uptime
- %dt.uptime Uptime
+ %dt.uptime=t'uptime'
%dd= count_uptime(deployment.uptime_1st_instance)
%li.instances
- %dt.instances.count Instances
+ %dt.instances.count=t'instances.instances'
%dd
= deployment.instances.count || 0
- %span.inline-label Instances
+ %span.inline-label=t'instances.instances'
%li.provider
- %dt.instances.count Provider
+ %dt.instances.count=t'providers.provider'
%dd= deployment.provider.provider_type.name unless
deployment.provider.blank?
:javascript
@@ -35,17 +35,17 @@
<dl class="statistics">
<ul>
<li class="uptime">
- <dt class="uptime">Uptime</dt>
+ <dt class="uptime">#{t'uptime'}</dt>
<dd>${uptime}</dd>
</li>
<li class="instances">
- <dt class="instances count">Instances</dt>
+ <dt class="instances
count">#{t'instances.instances'}</dt>
<dd>${instances_count}
- <span class="inline-label">Instances</span>
+ <span
class="inline-label">#{t'instances.instances'}</span>
</dd>
</li>
<li class="provider">
- <dt class="instances count">Provider</dt>
+ <dt class="instances
count">#{t'providers.provider'}</dt>
<dd>
{{if provider}} ${provider.name} {{/if}}
</dd>
diff --git a/src/app/views/instances/_list.html.haml
b/src/app/views/instances/_list.html.haml index 70de8e6..6a9dc2e 100644
--- a/src/app/views/instances/_list.html.haml
+++ b/src/app/views/instances/_list.html.haml
@@ -1,17 +1,18 @@
- content_for :form_header do
- %li= link_to "Export events", export_events_instances_path, :class =>
'button' - %li= restful_submit_tag 'Stop Selected Instances',
'stop',
multi_stop_instances_path, 'GET', :class => 'button', :id =>
'stop_selected_instances' + %li= link_to
"#{t'instances.list.export_events'}", export_events_instances_path,
:class
=> 'button' + %li= restful_submit_tag
"#{t'instances.list.stop_selected_instances'}", 'stop',
multi_stop_instances_path, 'GET', :class => 'button', :id =>
'stop_selected_instances' = hidden_field_tag 'backlink', request.url
%li
- if @hide_stopped
- %b Stopped
- instances are hidden:
- = link_to "show all", params.merge('hide_stopped' =>
'false'), :id
=> 'show_all_instances' + %b
+ = "#{t'instances.list.stopped_instances_hidden'}:"
+ = link_to "#{t'instances.list.show_all'}",
params.merge('hide_stopped' => 'false'), :id =>
'show_all_instances' -
else
- Showing all instances:
- = link_to "hide stopped", params.merge('hide_stopped' =>
'true')
+ %B
+ = "#{t'instances.list.showing_all_instances'}:"
+ = link_to "#{t'instances.list.hide_stopped'}",
params.merge('hide_stopped' => 'true')
-= filter_table([{:name =>''}, {:name => ''}, {:name =>
'Name'}, {:name =>
'Public Address'}, {:name => 'State'}, {:name =>
'Provider'}, {:name =>
'Owner'}], @instances) do |instance| += filter_table([{:name =>''},
{:name
=> ''}, {:name => "#{t'instances.list.table.name'}"},
{:name =>
"#{t'instances.list.table.public_address'}"}, {:name
=>"#{t'instances.list.table.state'}"}, {:name
=>"#{t'instances.list.table.provider'}"}, {:name
=>"#{t'instances.list.table.owner'}"}], @instances) do |instance|
%tr{
:class => cycle('nostripe', 'stripe') }
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/layouts/_filter_table.html.haml
b/src/app/views/layouts/_filter_table.html.haml index 8a36b92..1d46fb2
100644
--- a/src/app/views/layouts/_filter_table.html.haml
+++ b/src/app/views/layouts/_filter_table.html.haml
@@ -11,11 +11,12 @@
-# %li
-# %a.button.pill{:href => '#'} Add/Remove Columns
%li
- %label{:for => "select_#{lower_class}"} Viewing
+ %label{:for => "select_#{lower_class}"}=t
'filter_table.viewing'
= select_tag("select_#{lower_class}",
saved_searches.join.html_safe,:disabled => true) %li.object-count
- %strong= object_count.to_s
- results
+ %strong
+ = object_count.to_s
+ =t 'filter_table.results'
-# %li
-# %a.button.pill{:href => '#'} Save and Share
- if content_for? form_header
diff --git a/src/app/views/layouts/_masthead.html.haml
b/src/app/views/layouts/_masthead.html.haml index 60fbc2f..9fe8f2b 100644
--- a/src/app/views/layouts/_masthead.html.haml
+++ b/src/app/views/layouts/_masthead.html.haml
@@ -7,8 +7,8 @@
= "#{current_user.first_name} #{current_user.last_name}" if
current_user.present? %a.button.pill.user-dropdown{:href => '#'}
%span#user-menu{ :class => javascript? ? 'js' : 'nojs' }
- = link_to "My Account", account_path
- = link_to t(:logout), logout_path
+ = link_to t('masthead.my_account'), account_path
+ = link_to t('masthead.logout'), logout_path
%li.separator
%li
%div.query-input
diff --git a/src/app/views/layouts/_nav_history.html.haml
b/src/app/views/layouts/_nav_history.html.haml index 6688d10..82339d4
100644
--- a/src/app/views/layouts/_nav_history.html.haml
+++ b/src/app/views/layouts/_nav_history.html.haml
@@ -1,6 +1,8 @@
- unless @read_breadcrumbs.blank?
%nav#nav_history
- %span.label.light.small « Return to
+ %span.label.light.small
+ «
+ =t ('return_to')
%ol.nav_hist_bar
- @read_breadcrumbs.each do |breadcrumb|
%li{:class => breadcrumb[:class]}
diff --git a/src/app/views/layouts/_select_all_none.html.haml
b/src/app/views/layouts/_select_all_none.html.haml index fe14d61..287ed28
100644
--- a/src/app/views/layouts/_select_all_none.html.haml
+++ b/src/app/views/layouts/_select_all_none.html.haml
@@ -1,3 +1,4 @@
-Select:
-= link_to "All", params.merge(:select => 'all')
-= link_to "None", params.merge(:select => 'none')
+="#{t'select.select'}:"
+
+= link_to "#{t'select.all'}", params.merge(:select =>
'all')
+= link_to "#{t'select.none'}", params.merge(:select =>
'none')
diff --git a/src/app/views/pools/_alerts_index.html.haml
b/src/app/views/pools/_alerts_index.html.haml index 3010828..2a4a0d7
100644
--- a/src/app/views/pools/_alerts_index.html.haml
+++ b/src/app/views/pools/_alerts_index.html.haml
@@ -1,7 +1,7 @@
- if @failed_instances.count > 0
%section.content-section.alerts
%header
- %h2 Alerts
+ %h2=t "alerts_label"
%span.label.badge.alert.count= @failed_instances.length
.section-controls
-#%a.collapse{'href'=>'#'} Collapse
@@ -11,5 +11,5 @@
- @failed_instances.each do |inst|
%li.alert
%dt.subject.critical= inst.name
- %dd.type Instance Failure
+ %dd.type=t "alerts.instance_failure"
%dd.desc= "#{inst.last_error.blank? ? inst.state :
inst.last_error}" diff --git a/src/app/views/pools/_deployments.html.haml
b/src/app/views/pools/_deployments.html.haml index 6a4833a..70cfea0 100644
--- a/src/app/views/pools/_deployments.html.haml
+++ b/src/app/views/pools/_deployments.html.haml
@@ -4,14 +4,14 @@
%li.deployment
%h3.name
= link_to deployment.name, deployment_path(deployment)
- Global uptime
+ = t 'pools.index.global_uptime'
= count_uptime(deployment.uptime_all)
%dl.statistics
%ul
%li.right
- %dt.instances.count Instances
+ %dt.instances.count= t 'instances.instances'
%dd= deployment.instances.count || 0
%li.left
- %dt Uptime
+ %dt=t :uptime
%dd= count_uptime(deployment.uptime_1st_instance)
\ No newline at end of file
diff --git a/src/app/views/pools/_edit.html.haml
b/src/app/views/pools/_edit.html.haml index a20a705..86f7c5b 100644
--- a/src/app/views/pools/_edit.html.haml
+++ b/src/app/views/pools/_edit.html.haml
@@ -1,15 +1,15 @@
%header.page-header
%h1{:class => controller.controller_name}= @pool.name
#obj_actions.button-container
- = link_to 'New Pool', new_pool_url, :class => 'button primary',
:id =>
'new_pool_button' + = link_to t('pools.new_pool'), new_pool_url,
:class
=> 'button primary', :id => 'new_pool_button' .button-group
- = link_to 'Cancel Editing', pool_path(@pool), :class => 'button
pill
danger', :id => 'new_user_button' + = link_to t('cancel'),
pool_path(@pool), :class => 'button pill danger', :id =>
'new_user_button'
.corner
%section.content-section.user
%header
%h2
- Edit pool
+ =t'pools.edit_pool'
= @pool.name
.content
diff --git a/src/app/views/pools/_form.html.haml
b/src/app/views/pools/_form.html.haml index 7303660..a87f5d2 100644
--- a/src/app/views/pools/_form.html.haml
+++ b/src/app/views/pools/_form.html.haml
@@ -4,30 +4,31 @@
%fieldset
%p
- = form.label :name, "Name", :class => 'em'
+ = form.label :name, t('name'), :class => 'em'
= form.text_field :name, :class => 'em long'
%p
- = form.label :pool_family_id, "Pool Family"
+ = form.label :pool_family_id, t("pool_families.pool_family")
= form.collection_select :pool_family_id, PoolFamily.all, :id, :name
%fieldset
%p
%label
- Quota
+ = t('quota')
%span
- (# instances or
- %a#unlimited_quota_btn{:href => '#'} unlimited
+ (#
+ =t('pools.form.instance_or')
+ %a#unlimited_quota_btn{:href =>
'#'}=t('pools.form.unlimited')
)
= text_field :quota, :maximum_running_instances, :title =>
t('provider_accounts.form.quota_instances'), :value =>
@quota.maximum_running_instances || "unlimited", :id =>
"quota_instances"
%fieldset
%p
- = form.label :enabled, "Pool Enabled?", :class => 'checkbox'
+ = form.label :enabled, "#{t('pools.form.pool_enabled')}?",
:class =>
'checkbox' = form.check_box :enabled
%fieldset.options
- = form.submit "Save", :class => 'button', :id =>
'save_button'
- = link_to 'Cancel', pools_path, :class => 'button danger'
+ = form.submit t("save"), :class => 'button', :id =>
'save_button'
+ = link_to t('cancel'), pools_path, :class => 'button danger'
:javascript
$(document).ready(function(){
diff --git a/src/app/views/pools/_header_index.html.haml
b/src/app/views/pools/_header_index.html.haml index 2068acf..cb50c16
100644
--- a/src/app/views/pools/_header_index.html.haml
+++ b/src/app/views/pools/_header_index.html.haml
@@ -1,9 +1,9 @@
%header.page-header
- %h1.section-index Overview
+ %h1.section-index=t 'pools.index.overview'
#obj_actions.button-container
.button-group
= pretty_filter_toggle(pools_path(:view => 'pretty'),
pools_path(:view => 'filter')) - = link_to "New Pool",
new_pool_path, {
:class => 'button primary', :id => 'new_pool_button' } + =
link_to
t('pools.index.new_pool'), new_pool_path, { :class => 'button
primary',
:id => 'new_pool_button' } .corner
= render :partial => 'scoreboard_index'
diff --git a/src/app/views/pools/_header_show.html.haml
b/src/app/views/pools/_header_show.html.haml index 1924fa9..08956b0 100644
--- a/src/app/views/pools/_header_show.html.haml
+++ b/src/app/views/pools/_header_show.html.haml
@@ -1,9 +1,9 @@
%header.page-header
%h1.pools
- = [@pool.name, "Pool"].join(' ')
+ = [@pool.name, "#{t'pools.index.pool'}"].join(' ')
#obj_actions.button-container
- = link_to 'New Deployment', launch_new_deployments_path(:pool_id =>
@pool.id), :class => 'button primary', :id =>
'new_deployment_button' +
= link_to t('deployments.new_deployment'),
launch_new_deployments_path(:pool_id => @pool.id), :class => 'button
primary', :id => 'new_deployment_button' .button-group
- = link_to 'Edit', edit_pool_path(@pool), :class => 'button
pill',
:id => 'edit_pool_button' - = button_to 'Delete',
pool_path(@pool),
:method => :delete, :confirm => t('pools.index.confirm_delete'), :class
=>
"button pill danger", :id => 'delete_pool_button' + = link_to
t('edit'), edit_pool_path(@pool), :class => 'button pill', :id =>
'edit_pool_button' + = button_to t('delete'), pool_path(@pool),
:method => :delete, :confirm => t('pools.index.confirm_delete'), :class
=>
"button pill danger", :id => 'delete_pool_button' .corner
diff --git a/src/app/views/pools/_list.html.haml
b/src/app/views/pools/_list.html.haml index d7bf205..8464f0f 100644
--- a/src/app/views/pools/_list.html.haml
+++ b/src/app/views/pools/_list.html.haml
@@ -1,8 +1,8 @@
- content_for :form_header do
- %li= link_to "New Pool", new_pool_path, { :class => 'button', :id
=>
'new_pool_button' } - %li= restful_submit_tag "Destroy",
"destroy",
multi_destroy_pools_path, 'DELETE', :id => 'delete_button', :class
=>
'button danger' + %li= link_to "#{t'pools.new_pool'}",
new_pool_path, {
:class => 'button', :id => 'new_pool_button' } + %li=
restful_submit_tag
"#{t'pools.index.destroy'}", "destroy",
multi_destroy_pools_path,
'DELETE', :id => 'delete_button', :class => 'button danger'
%li
- = label_tag "More actions"
+ = label_tag "#{t'pools.list.more_actions'}"
= select_tag("more_actions",nil, :disabled => true)
= filter_table(@header, @pools) do |pool|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/pools/_new.html.haml
b/src/app/views/pools/_new.html.haml index e54f91d..de87f0d 100644
--- a/src/app/views/pools/_new.html.haml
+++ b/src/app/views/pools/_new.html.haml
@@ -2,7 +2,7 @@
%section.content-section.pools
%header
- %h2 Create New Pool
+ %h2=t('pools.create_new_pool')
.content
= render :partial => 'form'
diff --git a/src/app/views/pools/_pretty_list.html.haml
b/src/app/views/pools/_pretty_list.html.haml index 461db2d..548ef0d 100644
--- a/src/app/views/pools/_pretty_list.html.haml
+++ b/src/app/views/pools/_pretty_list.html.haml
@@ -1,5 +1,5 @@
%header
- %h2 Your Pools
+ %h2=t 'pools.index.your_pools'
%span.label.badge.dark.count= @pools.length
.content
@@ -11,15 +11,15 @@
%dl.statistics
%ul.groups
%li
- %dt Deployments
+ %dt=t 'deployments.deployments'
%dd.count.deployment= pool.deployments.count
%li
- %dt Instances
+ %dt=t 'instances.instances'
%dd.count.instance= pool.instances.count
%dd.count.instance.pending= pool.instances.select {|i|
i.state == Instance::STATE_PENDING }.length %dd.count.instance.failure=
pool.instances.select {|i| i.state == Instance::STATE_ERROR || i.state ==
Instance::STATE_CREATE_FAILED }.length %li
- %dt Quota Used
+ %dt=t'quota_used'
%dd.percentage.quota
= number_to_percentage(pool.quota.percentage_used,
:precision => 0) %a.control{:href => '#'}
@@ -28,9 +28,9 @@
= render :partial => 'deployments', :locals => {:deployments
=>
pool.deployments} %ul.content.actions
%li
- = link_to "#{html_escape(pool.name)} Pool details
»".html_safe, pool_path(pool), :class =>'pool_details' +
=
link_to ("#{html_escape(pool.name)} " +
"#{t'pools.index.pool_details'}" +
" »").html_safe, pool_path(pool), :class =>'pool_details'
%li
- = link_to 'New Deployment', launch_new_deployments_path(:pool_id
=> pool.id), :class => 'button primary', :id =>
'new_deployment_button' +
= link_to "#{t'deployments.new_deployment'}",
launch_new_deployments_path(:pool_id => pool.id), :class => 'button
primary', :id => 'new_deployment_button'
:javascript
$(document).ready(function() {
diff --git a/src/app/views/pools/_scoreboard_index.html.haml
b/src/app/views/pools/_scoreboard_index.html.haml index 57578d9..31ade11
100644
--- a/src/app/views/pools/_scoreboard_index.html.haml
+++ b/src/app/views/pools/_scoreboard_index.html.haml
@@ -16,13 +16,13 @@
%li
%ul.subgroup
%li
- %dt= t("alerts")
+ %dt= t("alerts_label")
%dd.count.alert= @statistics[:instances_failed]
%li
%dt= t("updates")
%dd.count.update 0
%li
- %dt= t("pools.index.quota_used")
+ %dt= t("quota_used")
%dd.percentage.quota 0%
%dd.fraction.instance
%span.part 0
diff --git a/src/app/views/pools/_scoreboard_show.html.haml
b/src/app/views/pools/_scoreboard_show.html.haml index ba05cb1..86def34
100644
--- a/src/app/views/pools/_scoreboard_show.html.haml
+++ b/src/app/views/pools/_scoreboard_show.html.haml
@@ -2,26 +2,26 @@
%dl.statistics
%ul.groups
%li
- %dt Cloud Providers
+ %dt=t'cloud_providers'
%dd.count.provider= @statistics[:cloud_providers]
%li
- %dt Deployments
+ %dt=t'deployments.deployments'
%dd.count.deployment= @statistics[:deployments]
%li
- %dt Instances
+ %dt=t'instances.instances'
%dd.count.instance= @statistics[:instances_deployed]
%dd.count.instance.pending= @statistics[:instances_pending]
%dd.count.instance.failure= @statistics[:instances_failed]
%li
%ul.subgroup
%li
- %dt Alerts
+ %dt=t'alerts_label'
%dd.count.alert 0
%li
- %dt Updates
+ %dt=t'updates'
%dd.count.update 0
%li
- %dt Quota Used
+ %dt=t'quota_used'
%dd.percentage.quota
= number_to_percentage((a)pool.quota.percentage_used, :precision
=> 0) %dd.fraction.instance
diff --git a/src/app/views/pools/_section_header.html.haml
b/src/app/views/pools/_section_header.html.haml index 94599e3..59ef6b9
100644
--- a/src/app/views/pools/_section_header.html.haml
+++ b/src/app/views/pools/_section_header.html.haml
@@ -1,5 +1,5 @@
%header.page-header
- %h1{:class => controller.controller_name} Pools
+ %h1{:class => controller.controller_name}=t('pools.pools')
#obj_actions.button-group
- = link_to 'New Pool', new_pool_url, :class => 'button primary',
:id =>
'new_pool_button' + = link_to t('pools.new_pool'), new_pool_url,
:class
=> 'button primary', :id => 'new_pool_button' .corner
diff --git a/src/config/locales/cs.yml b/src/config/locales/cs.yml
new file mode 100644
index 0000000..3fb0113
--- /dev/null
+++ b/src/config/locales/cs.yml
@@ -0,0 +1,349 @@
+cs:
+ deployments:
+ list:
+ delete_selected: hgbiaj nincfdko
+ stop_selected: ojda aehfllmi
+ confirm_delete: hma eei nfff ldf abhi ai elemmn jein lgblafebacn
+ deployment_details: fdnhfcijfg kgfcdia
+ none_selected: lgb omob eeckhc jbo kg hlbm nljbbcddogih
+ deployments: mjdohbhijai
+ not_updated:
+ one: dci faibaloiio %{list} ilehi jha io clokkhid
+ other: mjg cfkeghoaken %{list} nnigc nan jj nhhaocha
+ new_deployment: adf cdkalbhffi
+ deleted:
+ one: dam fndmdiagdf %{list} nnf hbboccfhi lkg omajelakg
+ other: lgj mlgdlomiifm %{list} cedd ehbmakffb iog jjhcjelmd
+ not_deleted:
+ one: oah beoemjijil %{list} fhool bjb jd follckmd
+ other: hfe olnkomebhme %{list} ohimk cmb ki jolejehd
+ deployment_name: efjmakflim anaj
+ deployment_name_subtext: damjmbnco kflegbjokb ndfj enfjjknahan
+ updated:
+ one: kik fehgnlgmmb %{list} ihh lcdcdanhfbbj gglkdkgf
+ other: jod fjddjgcamdm %{list} bdfh lifndfdajiic jhogmjjg
+ disabled_pool: jgflfd mcbncg l onhandedkg ng lgom dmlda khj iijg kan
mmne jfhkocjho + deployment: dgbigmgemh
+ state: acifa
+ login: nkk dk
+ save: lcgm
+ define_locales: lnhieo kbeahmn
+ settings:
+ self_service:
+ account: doodgln
+ self_service_default: mcnk oabnnggbna mllancgfdcgd bbnjlbc
+ index:
+ define_hardware_profiles: cdkafb kioghddo jccenfdo
+ manage_providers_desc: fedih hool abo fmf dbacahgkd ba mcjnjcb
eedkfbd fahghigoa ki hgihoj lfiobjliib fklnf koeo lel fgm angief cmdcecckc
hgfmaedb omg loicn enlfoocgim kff jkahklamfcnkiggll momdhnef bk eimkji
mimckhggdo + define_services: chgkjk fdejjlkb
+ manage_users_desc: dmenm kaeln dndfga naa dcdidc amfd odahjcjd bd
ijkoln mmmmnafcck aomgge lcjkmi nod oihgejmlbf mlc lennfm +
general_settings_desc: cknanl edonmclkoaeb folldkf iehokgkmfgene kikcj
egcafl ielllafjc fijlgl ijgkkgg afhnlde + general_settings: olnejdm
aafccgke
+ manage_users: ghaeli hgbih
+ define_locales: elfchc oomjaji
+ permissions_desc: nmdajm bidccbbfcbmc nlfjaee obfhdk
+ define_services_desc: bomad ckbg ake mhcedo kiclcbji fcee malmbn
agggeeefi ohgl mdohfc gfnnc bnjfkcml biil ke nghoan ki kbjkgbkgbe
mcjogcggo klkmc en bmlkl mfiogmekmklbi + permissions: lkiahbdkoni
+ define_hardware_profiles_desc: jfobj dggo odf fdngkf efg bnjok ma
eeb okkkhemh dgfgknhd mdli nekhcb mkfamknch mgah kfbgjb gl cih ogihhf fef
andanfe mh mog nnhgn ioji gl jgljfbm la eekbl mhncab ef mickjblbbabn
jnlodlg na djbfclkfkb caanjiencn + define_locales_desc: minjk noha
jhj mdelon hne lckgd fl kjllcdi mahg ijknok gobocaokd aoeg hljmhf ee dej
icijgb jmh idghgbn bb ime kjben ligd bh ifdioni jo djdgc fgjkbg je mhi
jibhdafonebb cafmennlk gigkfaj oi fmjdiakidn fmoecjlije +
manage_providers: ilnkbf bfmaaekak
+ settings: oicaecjk
+ administer: genfelhcnh
+ role: lbgl
+ searches: edhnhkde
+ maximum_running_instances: bhmjmje hodlhin mkgjnkgdj
+ browse_packages: lnagfg hckocjgc
+ basic_template: gcfmamol helmaon gofdf comfdjel
+ new: bbk
+ setting: njadgicj
+ catalogs:
+ index:
+ name: gcfi
+ catalog_name: hgcllak oggd
+ catalogs: nolbbkkk
+ updated:
+ many: fnokomoc lkdjekg mhkoniaicaejb
+ one: kmjdaik cgdnleg addiogagmhccc
+ created:
+ many: fckbhjoi ihckfibi
+ one: fcejkif ahhfdkco
+ user: nnki
+ instance_management: ihcndabl kdnjabggcc
+ map_profiles: knh domkoicd
+ general_settings: hnkhmja gdhoafmb
+ edit: olcg
+ confirm_password: kkjfena fkmibaaf
+ help: bdjj
+ realms:
+ index:
+ realm_name: imddo kgab
+ realm: acjme
+ hardware_profiles:
+ index:
+ virtual_cpu: ckmjiaj fcm
+ memory: fhhoaa
+ hardware_profile_name: cilkenbj kacbkfc lmje
+ storage: cmccklo
+ architecture: fhhljlmdeekl
+ cloud_engine_realms: hncglk
+ alerts_label: fjcieg
+ email: mjkgof
+ browse_objects: oafkjj iegnka
+ cancel: jdfkhc
+ providers:
+ confirm_delete: egl djh mdbo idd fkch dk ekbaim mffi omkifbchk
+ providers: hbbbnhlfn
+ form:
+ test_connection: dhml hblfggofcd
+ caution_alt_text: khoamoi
+ provider_url: hjcnbmah kof
+ provider_name: mefllclh bnem
+ required_field: lbfkebkl lniikm
+ caution_image: nnblhkf
+ enter_correct_url_msg: cdjllc jklih a ljccgjm kmk oodejhn
+ index:
+ x_deltacloud_provider: aokdeekofdmfmhicnebnh
+ provider_url: afhanidj bec
+ x_deltacloud_driver: mboanfkbohmegbjmmad
+ provider_name: bgmfkebn okih
+ provider_type: oniebgho cehj
+ provider: gailmcak
+ scheduling_policies: dhmbeolhfh hjhoicdf
+ choose_treatment: fjbnff eejllnlml
+ delete: ceehnl
+ cloud_engine_hardware_profiles: kbmfdmgm nenmghgj
+ properties: cfcnihgjbd
+ manage_providers: jcoika lkkaehilm
+ define_profiles: njfglm elmdnbii
+ masthead:
+ logout: jcf kfm
+ my_account: nl ncidooi
+ uptime: kgofhi
+ image_factory: gfmfi hooajfa
+ continue: jldbafmn
+ apply: mkkhe
+ change_password: fijmmc hcdbichh
+ name: fnhl
+ administration: hdejoldchhhljc
+ quota: lejll
+ choose_name: nchkjg f eekgnldk
+ last_name: egbi dcdl
+ runtime: kch
+ deployables:
+ index:
+ name: gfee
+ deployable_url_subtext: ihhof lh b nbign hkl nhkbbjdog nkmfdlml
+ base_deployable: galm agbahelkkg
+ deleted:
+ one: hocidkgloo %{list} efm jeljalnk
+ other: bkbngfnokfe %{list} fkaj jedfghoh
+ not_deleted:
+ one: ooncjeando %{list} ckg afn liklajbh gnked lac cnimgelnojk
kniamcddoi kdoj bec + other: cojjlaincno %{list} mglj jid eeadjbid
kmlo ebao gnldiioadfb echhfnlojo emkn eeced + description:
lceieieeefb
+ deployable_url: jbkdfhanho koh
+ deployables: gcgfafekami
+ state: nbljg
+ deployable_definition: jhefkbbgkl ihfghnjmcf
+ provider_accounts_item: edckomnf iikhgcl
+ roles:
+ index:
+ role_name: boad lomk
+ roles: hjcdh
+ quota_used: kaili jjjl
+ resource_management: kklhifag cdlmmlaiee
+ permissions: fmfdlflebjb
+ reset: mhcea
+ hello: dkfde
+ launch_instance: nadigf obefkfia
+ filter_table:
+ results: iolfeco
+ viewing: gcbgobk
+ instances:
+ list:
+ show_all: ofmm mcl
+ stop_selected_instances: eadn kkkanoig aeebcmoai
+ table:
+ name: fbbh
+ public_address: lkkglg flfenbk
+ owner: lafig
+ provider: gdkkaneo
+ state: bdojc
+ export_events: mlcohc mdnejb
+ hide_stopped: idbg gnjndbb
+ stopped_instances_hidden: iaikjki ajabmckaa ocf ilkmol
+ showing_all_instances: dhgfkba cee gaholkbgj
+ instances: ldmoooebc
+ none_selected: keb cbgh hjmheo ifj ki njil gdjckahcb kd heoom
+ not_updated:
+ one: noe bmdhfcbf %{list} ahaci feg co dgkhookm
+ other: ofh ogkogcbog %{list} aonoe bhm nd edjlfnnl
+ deleted:
+ one: blj cafkbmlm %{list} hjl dmloomleeeld jgnkafoh
+ other: gli fllhhgdhb %{list} nkac bifelbkhincf molbejcj
+ not_deleted:
+ one: nad ldmjboej %{list} odgdd jil da gljhmljj
+ other: ahh lhehgfneg %{list} offmj dak gm djamlieb
+ updated:
+ one: aod jofmbnhi %{list} bmg canbgcgddagg nbhanmdf
+ other: joc jfdgdmlkd %{list} eahk lbegfjibljjl jggoeggb
+ system_settings: cifbkc ndhngjkn
+ builds: blmndg
+ configure: memcmlalf
+ services_provided: bbceklki ejajfcjk
+ pools_and_zones: knkgh b acahn
+ instance_details: gjfjlijd aiooael
+ edit_user: cgcb agmh
+ catalog_entries:
+ index:
+ name: ihjg
+ catalog_entries: amnjkae ohhmfed
+ url: gin
+ catalog_entry: djeddbo inhmf
+ overview: iomihehi
+ about: bnbbj
+ monitor: iomfofh
+ map_locales: gck hmaadlc
+ pools:
+ list:
+ more_actions: kobm kdkakmo
+ pools: lgeef
+ form:
+ instance_or: bjndohoe bc
+ unlimited: geganekag
+ pool_enabled: mnha ofohhdm
+ index:
+ pool_details: floe fllgaeg
+ failed: llkddj
+ confirm_delete: gmk oen mocg djj bbbc io onbndh eael ikjle
+ pending: glfedke
+ your_pools: ommc mggag
+ overview: ogddajeb
+ destroy: jjhidab
+ deployed_on: lmcbkich if
+ pool_name: oceh fkjk
+ global_uptime: jjdhga edjbli
+ pool_family: llae ojlllh
+ deployment_name: bidlgklefl fmfh
+ pool: fclc
+ owner: oodbj
+ new_pool: agn fmnl
+ edit_pool: fldb ooco
+ flash:
+ notice:
+ added: kcno fjldfh
+ updated: gahg nllchldl
+ success:
+ pool_deleted:
+ one: cofg %{list} fai lfkgfelk
+ other: mgnad %{list} hidl dgglhjki
+ warning:
+ creation_failed: hlfi hhmhkeof mehjobg
+ error:
+ pool_not_deleted:
+ one: lgbj %{list} hlj bme hglmchnb gmdng elo jggjickem
aihindbabe olhh fnl + other: hmdnb %{list} fgmb lcl giimkhak amfk
gbjf jkmdadaao mnjfmfhbfo djmh amgcd + not_updated: neio dbeheb
albldglj
+ create_new_pool: glmelo mho cjne
+ new_user: dkj feal
+ privileges: geghgflfhj
+ select:
+ all: ede
+ none: mkie
+ select: efmbge
+ summary: gbeljhh
+ pool_families:
+ pool_families: eacb dbmcnecm
+ index:
+ name: mbic
+ deleted: dlcboah goa ebajlcegm jaim fbkdjafkj %{list}.
+ not_deleted: mfeke mhm anamfg gkl lhfjlkfhb cedj kekaiclkl %{list}.
+ quota_limit: ffoke djdeg
+ pool_family: enbd engfaj
+ template_collections: kjjnbded gogmcnhcjhj
+ operation: bddffbl
+ choose_password: cfjima o nanfjmjn
+ audit_report: ddlki h ehjioa
+ manage_users: mfflhl gbnjf
+ image_imports: dfjbh jlegach
+ provider_summary: hcldomnk nioadlb
+ provider_accounts:
+ new:
+ required_field: dalklhlm aenjng
+ new_provider_account: afh bfbjmgh
+ edit:
+ edit_provider_account: kkhi ekiiobdj agdebhg
+ required_field: hfaeigcg ggnnmf
+ form:
+ provider_accounts: iobgnjao hcfaafml
+ quota_instances: kblgl onckmkndh
+ test_account: dgaf ogidfak
+ unlimited_quota: ngfgcflod ckfjg
+ account_number: bma ngomhah fk
+ user_name: mbn fgilid hha
+ account_private_cert: kij dgjm gjfbalk dgf
+ password: dmkmag djnlae obj
+ account_name: kabghde hhag
+ account_public_cert: bco mfab adignm dgf
+ index:
+ provider_accounts: emmdgmda oogcchej
+ provider_account_name: jfckicb okbh
+ account_added:
+ one: ljgenfa %{list} nng bohgde
+ other: ndlaeico %{list} ijbg nhcood
+ username: nnmhhgma
+ account_not_deleted:
+ one: jlmkmjj %{list} gag ecc fbkamkem gnbge lfl edghikbaf
ogamcghbig bdic hba + other: molkbakl %{list} khan mjh bnfbedbc
jgoh flda edojaioga hcbgaholon mecc cbcja + provider_name: ebgjgmio
njmc
+ account_not_added:
+ one: hinlmdn %{list} nmjld gdf fi hjdeb
+ other: icodhdil %{list} jlgma jne me icecc
+ config_server_not_saved: cd admde iiohbeod akagj ckbdgo fmg hkddfa
agbcjb almeb + config_server_saved: gejage ehfkgf aokm ijo
mlibeffokjnh ginea + account_deleted:
+ one: okakcee %{list} icc ehgjdkao
+ other: naandlok %{list} nhbf lokocnck
+ quota_limit: nejjk egaoa
+ provider_type: ejnicfdg bmgn
+ assemblies: ilmogamobk
+ catalog_images: babmlck fnmfbe
+ return_to: fenjkj of
+ first_name: mjmgg dgfl
+ users:
+ confirm_delete: kej ldn anbc ing ileb ie lmkbbo aabm bjkke
+ index:
+ quota_instances: nakgh mnjce
+ username: bcddbbal
+ user_id: dihl mg
+ last_name: lgmn jgef
+ email: hjflbl
+ first_name: fiemj dfkl
+ users: cenga
+ create_account: iocomk cbfjedh
+ config_servers:
+ new:
+ new_config_server: kdl inahjm llcbam
+ edit:
+ edit_config_server: hbjb dhingb lanbji
+ certificate_help: oobmoah l djllhndmcje go khbnnk obbaj aghjack
+ errors:
+ connection:
+ generic_with_message: lbekc dif bnkolmfi onlkkj ejhmoh cbbjlgkafn
ggbld %{url}). %{msg} + certificate: kbfkm cfc jenejnkd mencai
gcekfe limdcmgbmf mibai %{url}). liniccmemdh hfkhhe %{msg} +
generic: jfgog idh kogijjlh nmcomk kmfnbl iohakfbkea lndco %{url}). cfjmo
mlh nagnjkkndm djjiakfhje bae kkj bjgdig + unhandled_response:
lbnfl bld iogibljj jagbkm akaomm odijndhlhg oclcc %{url}). enkn cjmbml
gkhke %{code} + cloud_providers: ifgkk nflkdljdc
+ remove: jnhdaa
+ apply_treatment: bland dcfn hkmfhnmgo
+ updates: bobldl
+ define: adadbo
+ dashboard: moidnojbj
+ self_service_settings: lgmcedkhbnmj nabbgfin
+ assistance_requests: bbhagnoloh lfjjkncm
+ add: hlb
+ alerts:
+ instance_failure: glkfldhe gahdede
+ advanced_search: boahoehj mdfenm
+ images: djflgn
+ define_services: ajjmcn giegelfm
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index bed313a..90c6056 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -8,7 +8,6 @@ en:
username: Username
last_name: Last Name
first_name: First Name
- quota_used: Quota Used
quota_instances: Quota Limit
email: e-mail
about: About
@@ -16,7 +15,6 @@ en:
hello: Hello
advanced_search: Advanced Search
login: Log in
- logout: Log out
operation: Operate
monitor: Monitor
browse_objects: Browse Objecs
@@ -42,8 +40,6 @@ en:
new_user: New User
edit_user: Edit User
pools_and_zones: "Pools & Zones"
- new_pool: New Pool
- edit_pool: Edit Pool
audit_report: Audit / Report
assistance_requests: Assistance Requests
define: Define
@@ -62,6 +58,7 @@ en:
edit: Edit
add: Add
save: Save
+ delete: Delete
remove: Remove
reset: Reset
create_account: Create Account
@@ -79,12 +76,18 @@ en:
apply: Apply
resource_management: Resource Management
overview: Overview
- alerts: Alerts
+ alerts_label: Alerts
updates: Udates
+ quota_used: Quota Used
+ return_to: Return to
+ properties: Properties
+ catalog_images: Catalog Images
+ quota: Quota
deployments:
deployments: Deployments
deployment: Deployment
deployment_name: Deployment Name
+ new_deployment: New Deployment
deployment_name_subtext: "(uniquely identifies your deployment)"
deployment_details: Deployment Details
confirm_delete: "Are you sure you want to delete this deployment?"
@@ -103,6 +106,9 @@ en:
other: "The deployments %{list} could not be deleted."
none_selected: "You must select one or more deployments."
state: State
+ list:
+ stop_selected: Stop Selected
+ delete_selected: Delete Selected
instances:
instances: Instances
updated:
@@ -118,6 +124,19 @@ en:
one: "The instance %{list} could not be deleted."
other: "The instances %{list} could not be deleted."
none_selected: "You must select one or more instances to stop."
+ list:
+ export_events: Export events
+ stop_selected_instances: Stop selected instances
+ stopped_instances_hidden: Stopped instances are hidden
+ showing_all_instances: Showing all instances
+ show_all: show all
+ hide_stopped: hide stopped
+ table:
+ name: Name
+ public_address: Public Address
+ state: State
+ provider: Provider
+ owner: Owner
searches: Searches
image_factory: Image Factory
assemblies: Assemblies
@@ -132,24 +151,46 @@ en:
cloud_engine_hardware_profiles: Hardware Profiles
cloud_engine_realms: Realms
pools:
+ pools: Pools
+ new_pool: New Pool
+ edit_pool: Edit Pool
+ create_new_pool: Create New Pool
index:
pool: Pool
pool_name: Pool name
deployment_name: Deployment name
deployed_on: Deployed on
- pools: Pools
pool_family: Pool Family
owner: Owner
pending: Pending
failed: Failed
- quota_used: Quota Used
confirm_delete: "Are you sure you want to delete this pool?"
- pool_deleted:
- one: "Pool %{list} was deleted."
- other: "Pools %{list} were deleted."
- pool_not_deleted:
- one: "Pool %{list} was not deleted. There are instances associated
with it." - other: "Pools %{list} were not deleted. They have
instances associated with them." + overview: Overview
+ your_pools: Your Pools
+ pool_details: Pool details
+ global_uptime: Global uptime
+ destroy: Destroy
+ flash:
+ notice:
+ added: Pool added.
+ updated: Pool updated.
+ success:
+ pool_deleted:
+ one: Pool %{list} was deleted.
+ other: Pools %{list} were deleted.
+ error:
+ pool_not_deleted:
+ one: Pool %{list} was not deleted. There are instances
associated with it. + other: Pools %{list} were not deleted. They
have instances associated with them. + not_updated: Pool wasn't
updated!
+ warning:
+ creation_failed: Pool creation failed.
+ list:
+ more_actions: More actions
+ form:
+ instance_or: instance or
+ unlimited: unlimited
+ pool_enabled: Pool enabled
hardware_profiles:
index:
hardware_profile_name: Hardware Profile Name
@@ -163,11 +204,11 @@ en:
realm_name: Realm Name
pool_families:
pool_families: Pool Families
+ pool_family: Pool Family
index:
deleted: "Deleted the following Pool Families: %{list}."
not_deleted: "Could not delete the following Pool Families:
%{list}." name: Name
- quota_used: Quota Used
quota_limit: Quota Limit
catalog_entries:
index:
@@ -225,7 +266,6 @@ en:
permissions_desc: Modify self-service default quota.
self_service:
self_service_default: 'User Treatment: Self-service default'
- quota: Quota
account: Account
providers:
provider: Provider
@@ -252,7 +292,6 @@ en:
username: Username
provider_name: Provider Name
provider_type: Provider Type
- quota_used: Quota Used
quota_limit: Quota Limit
account_deleted:
one: "Account %{list} was deleted."
@@ -298,3 +337,15 @@ en:
certificate: "Could not validate config server connection (url:
%{url}). Certificate error: %{msg}" unhandled_response: "Could not
validate config server connection (url: %{url}). HTTP Status Code:
%{code}" uptime: Uptime
+ alerts:
+ instance_failure: Instance Failure
+ select:
+ select: Select
+ all: All
+ none: None
+ filter_table:
+ viewing: Viewing
+ results: Results
+ masthead:
+ my_account: My Account
+ logout: Log out
Please ignore it. It contains 2 methods of set_locale in app_controller. I'm
going to send new version of this patch.
--
Jozef Zigmund