On Tuesday 25 October 2011 14:53:38 Tomas Hrcka wrote:
---
src/app/views/pool_families/_form.html.haml | 2 +-
src/app/views/pool_families/_properties.html.haml | 4 +-
.../pool_families/_provider_accounts.html.haml | 4 +-
src/app/views/pool_families/edit.html.haml | 6 ++--
src/app/views/pool_families/index.html.haml | 22
++++++++++---------- src/app/views/pool_families/new.html.haml |
4 +-
src/app/views/pool_families/show.html.haml | 4 +-
src/config/locales/en.yml | 20
++++++++++++++++++ 8 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/src/app/views/pool_families/_form.html.haml
b/src/app/views/pool_families/_form.html.haml index 6724f13..a43e6df
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
- = form.label :name,'Pool Family Name'
+ = form.label :name, t("pool_families.form.pool_family_name")
= form.text_field :name, :title => 'pool_family_name', :value =>
= form.submit "Save", :class => "submit button pill" please
update this w/
t(:save)
@pool_family.name, :class => 'em long'
= form.fields_for :quota do |quota_form|
diff --git a/src/app/views/pool_families/_properties.html.haml
b/src/app/views/pool_families/_properties.html.haml index 41ece12..c15e40e
100644
--- a/src/app/views/pool_families/_properties.html.haml
+++ b/src/app/views/pool_families/_properties.html.haml
@@ -2,11 +2,11 @@
%thead
%tr
%th.show
- Pool Family Details
+ = t("pool_families.pool_family_details")
%th.show
%tbody
%tr
%td
- %label Name
+ %label= t("name")
%td
= @pool_family.name
diff --git a/src/app/views/pool_families/_provider_accounts.html.haml
b/src/app/views/pool_families/_provider_accounts.html.haml index
ac4bdc4..eac64cd 100644
--- a/src/app/views/pool_families/_provider_accounts.html.haml
+++ b/src/app/views/pool_families/_provider_accounts.html.haml
@@ -1,10 +1,10 @@
%h3
- Provider Accounts for
+ = t("pool_families.provider_accounts_for")
= @pool_family.name
- unless @pool_family.provider_accounts.blank?
= form_tag do
- = restful_submit_tag "Remove selected", 'destroy',
multi_destroy_provider_accounts_pool_families_path(:pool_family_id =>
@pool_family.id), 'DELETE', :id => 'delete_button', :class =>
'button
danger' + = restful_submit_tag t("pool_families.remove_selected"),
'destroy',
multi_destroy_provider_accounts_pool_families_path(:pool_family_id =>
@pool_family.id), 'DELETE', :id => 'delete_button', :class =>
'button
danger' = #submit_tag "Remove selected"
%table#provider_accounts_table.checkbox_table
Please update that string in this view = f.submit "Add to
#{(a)pool_family.name}"
diff --git a/src/app/views/pool_families/edit.html.haml
b/src/app/views/pool_families/edit.html.haml index 0faa291..ff9d3e3 100644
--- a/src/app/views/pool_families/edit.html.haml
+++ b/src/app/views/pool_families/edit.html.haml
@@ -3,12 +3,12 @@
%header.admin-page-header
%h1= @pool_family.name
#obj_actions
- Return to:
- = link_to 'Environments', pool_families_path, :class =>
'rounded-link'
+ = t("pool_families.edit.return_to")
+ = link_to t("pool_families.new.environments"), pool_families_path,
:class => 'rounded-link'
%section.admin-content-section.pool_family
%header
- %h2.settings Settings
+ %h2.settings= t("settings.settings")
.content
-form_for @pool_family, :url => pool_family_path(@pool_family), :html
=> { :method => :put, :class => 'generic' } do |f| diff --git
a/src/app/views/pool_families/index.html.haml
b/src/app/views/pool_families/index.html.haml index 3cc1061..92cc5ea
100644
--- a/src/app/views/pool_families/index.html.haml
+++ b/src/app/views/pool_families/index.html.haml
@@ -2,10 +2,10 @@
= #render :partial => 'list'
%section.admin-content-section.pool_families
%header
- %h2.pools Pool Families
+ %h2.pools= t("pool_families.pool_families")
.section-controls
#obj_actions
- = link_to "New Pool Family", new_pool_family_path, :class =>
'button pill', :id => 'new_pool_family_button' + = link_to
t("pool_families.index.new_pool_family"), new_pool_family_path, :class =>
'button pill', :id => 'new_pool_family_button'
.content
- @pool_families.each do |pool_family|
@@ -21,15 +21,15 @@
= link_to "New Pool", new_pool_path, :class =>
'rounded-link' - unless pool_family.pools.blank?
%tr
- %th Pool Name
- %th Deployments
- %th Total Inst.
- %th Pending Inst.
- %th Failed Inst.
- %th Quota Used
- %th Active Inst.
- %th Available Inst.
- %th Catalog
+ %th= t("pool_families.index.pool_name")
+ %th= t("pool_families.index.deployments")
+ %th= t("pool_families.index.total_instancies")
+ %th= t("pool_families.index.pending_instances")
+ %th= t("pool_families.index.failed_instances")
+ %th= t("pool_families.index.quota_used")
+ %th= t("pool_families.index.active_instances")
+ %th= t("pool_families.index.available_instances")
+ %th= t("pool_families.index.catalog")
%th
- pool_family.pools.each do |pool|
%tr
Fix it also here:
= link_to "Edit", edit_pool_family_path(pool_family), :class =>
'rounded-link'
= link_to "New Pool", new_pool_path, :class => 'rounded-link'
= link_to 'Edit', edit_pool_path(pool), :class => 'rounded-link'
diff --git a/src/app/views/pool_families/new.html.haml
b/src/app/views/pool_families/new.html.haml index 8535afa..496f7b6 100644
--- a/src/app/views/pool_families/new.html.haml
+++ b/src/app/views/pool_families/new.html.haml
@@ -1,9 +1,9 @@
= render :partial => 'layouts/admin_nav'
%header.admin-page-header
- %h1 New Pool Family
+ %h1= t("pool_families.index.new_pool_family")
#obj_actions
Return to:
- = link_to "Environments", pool_families_path, :class =>
'rounded-link'
+ = link_to t("pool_families.new.environments"), pool_families_path,
:class => 'rounded-link'
%section.admin-content-section.pool_family
.content
also here line #5: Return to:
diff --git a/src/app/views/pool_families/show.html.haml
b/src/app/views/pool_families/show.html.haml index 103964b..26f335a 100644
--- a/src/app/views/pool_families/show.html.haml
+++ b/src/app/views/pool_families/show.html.haml
@@ -3,8 +3,8 @@
%h1= @pool_family.name
#obj_actions.button-container
.button-group
- = link_to 'Edit', edit_pool_family_path(@pool_family), :class =>
'button pill' - = button_to 'Delete',
pool_family_path(@pool_family),
:method => :delete, :confirm => "Are you sure you want to delete?",
:class
=> "button pill danger", :id => 'delete_pool_family_button' +
=
link_to t('edit'), edit_pool_family_path(@pool_family), :class => 'button
pill' + = button_to t('delete'), pool_family_path(@pool_family),
:method => :delete, :confirm => t("pool_families.confirm_delete"),
:class
=> "button pill danger", :id => 'delete_pool_family_button'
%section.admin-content-section.pool_family
.content
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index b812143..2d5ab14 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -489,9 +489,29 @@ en:
pool_families:
pool_families: Pool Families
pool_family: Pool Family
+ confirm_delete: "Are you sure you want to delete?"
+ pool_family_details: Pool Family Details
+ provider_accounts_for: Provider Accounts for
+ remove_selected: Remove selected
index:
name: Name
quota_limit: Quota Limit
+ new_pool_family: New Pool Family
+ pool_name: Pool Name
+ deployments: Deployments
+ total_instancies: "Total Inst."
+ pending_instances: "Pending Inst."
+ quota_used: "Quota Used"
+ active_instances: "Active Inst."
+ available_instances: "Available Inst."
+ failed_instances: "Failed Inst."
+ catalog: "Catalog"
+ new:
+ environments: Environments
+ edit:
+ return_to: "Return to:"
+ form:
+ pool_family_name: Pool Family Name
flash:
notice:
added: "Pool family was added."
After fix inline notes you can
push it.
--
Jozef Zigmund