hobo 0.8.10 → 0.9.0

data/CHANGES.txt

@@ -1,4 +1,128 @@
-=== Hobo 0.8.10 ==
+=== Upgrading to a new version of Hobo ===
+
+Once you have installed a new version of Hobo, you may wish to run
+
+    rake hobo:run_standard_generators
+
+This will run all of the standard generators, and pull in any bug
+fixes or enhancements to generated code.  Note that this is quite
+likely to cause conflicts, so it is highly recommended that you have
+your code backed up and in a change control system such as git or
+subversion.
+
+=== Hobo 0.9.0 ===
+
+Major enhancements:
+
+  - Internationalization!  Through the hard work of soey and Spiralis,
+    we now have internationalization support in Hobo.   The manual
+    page is on the
+    [cookbook](http://cookbook.hobocentral.net/manual/i18n).   Locales
+    are available on
+    [github](http://github.com/Spiralis/hobo-i18n-locales).
+
+  - Index generation: Matt Jones' automatic index generation code has
+    been merged.  The default Rails index names are very long, so this
+    is unlikely to work well on Oracle, which has a 30 character
+    limit.  Testing against Postgres, Oracle, SQL Server and JDBC has
+    been extremely limited.  To generate indices run script/generate
+    hobo_migration.
+
+  - New projects now have a summary page on /front/summary that
+    provides application information to the administrator.  Current
+    projects may add this action by running the
+    `hobo_front_controller` generator.
+
+  - STI derived classes can add additional fields to their parent
+    class with the fields block.  Note that the "can't generate a
+    migration for STI base and derived classes all at once" issue
+    still applies.  In general, STI handling should now work much
+    better.
+
+  - [Bug 464](https://hobo.lighthouseapp.com/projects/8324/tickets/464-transition-buttons-should-have-a-option-to-link-to-forms-instead-for-transitions-that-take-parameters)
+    The transition-buttons tag now generates buttons that link to the
+    transition page for transitions that require parameters.  
+
+  - [Bug 532](https://hobo.lighthouseapp.com/projects/8324/tickets/532)
+    In previous versions, you had to add the new HTML5 tags to
+    RAILS_ROOT/config/dryml_static_tags.txt.  This version whitelists
+    all HTML5 tags except for aside, section, header and footer, which
+    conflict with existing Rapid tags.
+
+Major bug fixes:
+
+ - [Bug 530](https://hobo.lighthouseapp.com/projects/8324-hobo/tickets/530) 
+   is a critical bug for invite-only projects.  To incorporate the
+   fix, you must rerun your generators or follow the instructions in
+   the [commit](http://github.com/tablatom/hobo/commit/17247eac8a78f8b36dcc3b9684a3e4ec8da32a23)
+
+ - [Bug
+   480](https://hobo.lighthouseapp.com/projects/8324/tickets/480-find_owner_and_association-method-for-has_many-associations)
+   Owner actions now work with has_many associations
+
+ - [Bug 516](https://hobo.lighthouseapp.com/projects/8324/tickets/516-association-name-as-parameter-in-lifecycle-step-almost-works)
+   Specifying a belongs_to association as a lifecycle param works; it appears as a select-one on the generated page.
+
+ - [Bug 515](https://hobo.lighthouseapp.com/projects/8324/tickets/515-virtual-boolean-field-uninitialized-constant-hobobooleancolumn_type)
+   Virtual :boolean fields declared with attr_accessor now work
+
+ - [Bug 484](https://hobo.lighthouseapp.com/projects/8324/tickets/484-transition-actions-with-key-fail-if-model-isnt-visible-to-guests)
+   Transition actions that require a key no longer check if the model is visible to Guest
+
+ - [Bug 485](https://hobo.lighthouseapp.com/projects/8324/tickets/485-make-lifecycles-on-sti-subclasses-behave)
+   Lifecycle support on STI models works now. Note that derived classes DO NOT inherit any of the parent lifecycle implementation.
+
+ - [Bug 387](https://hobo.lighthouseapp.com/projects/8324/tickets/387-inheritance-sti-models-name-not-propagating)
+   STI derived classes now inherit settings like name_attribute correctly.
+
+ - [Bug 533](https://hobo.lighthouseapp.com/projects/8324/tickets/533-remove-id-from-hidden-field-for-check-box)
+   The hidden field generated with a checkbox input shouldn't have an ID.
+
+ - [Bug 526](https://hobo.lighthouseapp.com/projects/8324/tickets/526-routing-error-does-not-render-not-found-page)
+   Routing errors now render not-found-page, rather than the default Rails routing error message.
+
+Minor Enhancements:
+
+ - Aside collections now have a new-link at the bottom (inside the
+   preview-with-more)
+   [#421](https://hobo.lighthouseapp.com/projects/8324/tickets/421-auto_actions_for-doesnt-create-add-button-in-sidebar)
+
+ - the manual now includes a Generators section, and a subsite
+   tutorial has been added.
+
+ - [Bug
+   386](https://hobo.lighthouseapp.com/projects/8324-hobo/tickets/386)
+   and [Bug
+   501](https://hobo.lighthouseapp.com/projects/8324-hobo/tickets/501)
+   have been fixed, reducing the number of extraneous migrations that
+   the hobo_migration generator creates.  These are actually Rails
+   and/or database bugs we're working around.  For instance, MySQL
+   does not allow default values for text columns, so Rails silently
+   ignores them.  SQLite does not allow scale or precision settings on
+   decimal fields.  These types of bugs are good reasons why you
+   should use the same type of database for development, testing and
+   production.
+
+ - A new view_hint, 'inline_booleans', controls whether boolean attributes are displayed in the header (default behavior
+   of Rapid show pages) or inline with the rest of the field-list. You can either pass a list of field names, or 'true'
+   (without quotes) to make all booleans inline.
+
+ - hobo_show now accepts a model instance as a first parameter. This restores symmetry with the other hobo_* actions.
+
+ - on Rails 2.3 and above, routes will be generated with the optional .:format suffix, and the formatted_* routes are skipped.
+
+ - non-required fields that are marked :unique will now allow nil
+   values.
+
+Minor Bug Fixes 
+
+ - [Bug 540](https://hobo.lighthouseapp.com/projects/8324-hobo/tickets/540)
+   Hobo::Permissions::Associations::HasManyThroughAssociations#create!
+   did not save as the "!" implied.
+
+See the [github log](http://github.com/bryanlarsen/hobo/commits/v0.9.0)
+
+=== Hobo 0.8.10 ===
 
 This is a brown paper bag release.   The fix for Bug 473 was not
 properly tested.   Thanks Iain Beeston for quickly sending us a patch.
@@ -35,7 +159,7 @@ Major bug fixes:
 
 Minor bug fixes and enhancements:
 
-See the [github log](http://github.com/bryanlarsen/hobo/commits/v0.8.5)
+See the [github log](http://github.com/bryanlarsen/hobo/commits/v0.8.9)
 
 === Hobo 0.8.8 ===
 

data/Rakefile

@@ -9,6 +9,9 @@ $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/../hobofields/l
 $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '/../hobosupport/lib')
 require 'hobo'
 
+RUBY = ENV['RUBY'] || (defined?(JRUBY_VERSION) ? 'jruby' : 'ruby')
+RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} `which rubydoctest`"
+
 desc "Default Task"
 task :default => [ :test ]
 
@@ -26,7 +29,7 @@ namespace "test" do
   desc "Run the doctests"
   task :doctest do |t|
     # note, tests in doctest/hobo/ are out of date
-    exit(1) if !system("rubydoctest doctest/*.rdoctest")
+    exit(1) if !system("#{RUBYDOCTEST} doctest/*.rdoctest")
   end
 end
 

data/bin/hobo

@@ -17,7 +17,7 @@ Options:
   -d | --database <database>         # e.g. mysql, sqlite
   -r | --rails <version>             # rails version to use
   -n | --no-rails                    # don't run 'rails'.  Assumes app-path=='.'
-  --invite-only                      # add features for an invite-ony website (admin site, no signup)
+  --invite-only                      # add features for an invite-only website (admin site, no signup)
 "
 
 

data/doctest/scopes.rdoctest

@@ -50,12 +50,17 @@ First off we need to configure ActiveSupport for auto-loading
 We also need to get ActiveRecord set up with a database connection
 {.hidden}
 
+    >> mysql_adapter = defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'
+    >> mysql_user = 'root'; mysql_password = ''
+    >> mysql_login = "-u #{mysql_user} --password='#{mysql_password}'"
     >> mysql_database = "hobofields_doctest"
-    >> system "mysqladmin --force drop #{mysql_database} 2> /dev/null"
-    >> system("mysqladmin create #{mysql_database}") or raise "could not create database"
-    >> ActiveRecord::Base.establish_connection(:adapter => "mysql",
+    >> system "mysqladmin #{mysql_login} --force drop #{mysql_database} 2> /dev/null"
+    >> system("mysqladmin #{mysql_login} create #{mysql_database}") or raise "could not create database"
+    >> ActiveRecord::Base.establish_connection(:adapter => mysql_adapter,
                                                :database => mysql_database,
-                                               :host => "localhost")
+                                               :host => "localhost", 
+                                               :username => mysql_user, 
+                                               :password => mysql_password)
 {.hidden}
 
 Some load path manipulation:
@@ -69,6 +74,8 @@ Some load path manipulation:
 And we'll require hobo:
 {.hidden}
 
+    >> require 'will_paginate'
+    >> require 'will_paginate/finder'
     >> require 'hobosupport'
     >> require 'hobofields'
     >> require 'hobo'

data/dryml_generators/rapid/cards.dryml.erb

@@ -18,6 +18,8 @@ has_actions = edit_link || delete_button
 has_body    = (!show_link && description_attribute) || creator_link || creator_attribute || primary_collection
 
 show_title = !show_link && (name_attribute || !has_body)
+
+model_key = model.name.pluralize.underscore
 -%>
 <def tag="card" for="<%= model.name %>">
   <card class="<%= model_name :dashed %>" param="default" merge>
@@ -29,7 +31,9 @@ show_title = !show_link && (name_attribute || !has_body)
 <% if has_actions -%>
       <div param="actions">
 <% if edit_link -%>
-        <a action="edit" if="&can_edit?" param="edit-link">Edit</a>
+        <a action="edit" if="&can_edit?" param="edit-link">
+          <ht key="<%= model_key %>.actions.edit">Edit</ht>
+        </a>
 <% end -%>
 <% if delete_button -%>
         <delete-button label="X" param/>
@@ -49,7 +53,9 @@ show_title = !show_link && (name_attribute || !has_body)
       <view:<%= creator_attribute %> param="creator"/>
 <% end -%>
 <% if primary_collection -%>
-      <count:<%= primary_collection%> param/>
+      <ht key="<%= primary_collection.to_s.pluralize.underscore %>.collection.count" count="&this.<%= primary_collection %>.size">
+         <count:<%= primary_collection%> param/>
+      </ht>
 <% end -%>
     </body:>
 <% end -%>

data/dryml_generators/rapid/forms.dryml.erb

@@ -4,13 +4,14 @@ form_fields = standard_fields :belongs_to, :has_many
 
 cancel_to_show_page  = linkable?(:show)
 cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
+model_key = model_name.pluralize.underscore
 -%>
 <def tag="form" for="<%= model.name %>">
   <form merge param="default">
     <error-messages param/>
     <field-list fields="<%= form_fields * ', ' %>" param/>
     <div param="actions">
-      <submit label="Save" param/><or-cancel param="cancel"/>
+      <submit label="#{ht '<%= model_key %>.actions.save', :default=>['Save']}" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>
@@ -22,7 +23,7 @@ cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
     <error-messages param/>
     <field-list fields="<%= creator.parameters * ', ' %>" param/>
     <div param="actions">
-      <submit label="<%= creator.name.to_s.titleize %>" param/><or-cancel param="cancel"/>
+      <submit label="#{ht '<%= model_key %>.actions.<%= creator.name.to_s %>', :default=>['<%= creator.name.to_s.titleize %>']}" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>
@@ -36,10 +37,10 @@ cancel_to_index_page = !cancel_to_index_page && linkable?(:index)
     <input type="hidden" name="key" value="&this.lifecycle.provided_key" if="&this.lifecycle.provided_key"/>
     <field-list fields="<%= transition.parameters * ', ' %>" param/>
     <div param="actions">
-      <submit label="<%= transition.name.to_s.titleize %>" param/><or-cancel param="cancel"/>
+      <submit label="#{ht '<%= model_key %>.actions.<%= transition.name.to_s %>', :default=>['<%= transition.name.to_s.titleize %>']}" param/><or-cancel param="cancel"/>
     </div>
   </form>
 </def>
 <% end -%>
 
-<% end # of each_model do -%>
+<% end # of each_model do -%>

data/dryml_generators/rapid/pages.dryml.erb

@@ -12,29 +12,38 @@
 
 
 <% each_controller do -%>
-  
+
 <!-- ====== <%= model.name %> Pages ====== -->
 <%
 new_link = linkable?(:new)
 new_form = !new_link && linkable?(model, :create, :method => :post)
+model_key = model_name.pluralize.underscore
 -%>
 
-
 <def tag="index-page" for="<%= model.name %>">
-  <page merge title="<%= model_name :title, :plural %>">
+  <page merge title="#{ht '<%= model_key %>.index.title', :default=>['<%= model_name :title, :plural %>'] }">
     <body: class="index-page <%= model_class %>" param/>
-    
+
     <content: param>
       <header param="content-header">
-        <h2 param="heading"><%= model_name :title, :plural %></h2>
-
-        <p param="count" if>There <count prefix="are"/></p>
+        <h2 param="heading">
+          <ht key="<%= model_key %>.index.heading">
+            <%= model_name :title, :plural %>
+          </ht>
+        </h2>
+
+        <p param="count" if>
+          <ht key="<%= model_key %>.collection.count" count="&this.size">
+            There <count prefix="are"/>
+          </ht>
+        </p>
       </header>
-      
+
       <section param="content-body">
 <% if new_link -%>
-
-        <a action="new" to="&model" param="new-link"/>      
+        <a action="new" to="&model" param="new-link">
+          <ht key="<%= model_key %>.actions.new">New <%=model_name :title %></ht>
+        </a>
 <% end -%>
 
 <% if view_hints.paginate? -%>
@@ -54,7 +63,9 @@ new_form = !new_link && linkable?(model, :create, :method => :post)
 
 <% if new_form -%>
         <div param="new-form">
-          <h3 param="new-form-heading">New <%= model_name :title %></h3>
+          <h3 param="new-form-heading">
+            <ht key="<%= model_key %>.form.new.heading">New <%= model_name :title %></ht>
+          </h3>
           <form with="&@invalid_record || new_for_current_user(<%= model %>)" param/>
         </div>
 
@@ -66,17 +77,21 @@ new_form = !new_link && linkable?(model, :create, :method => :post)
 
 
 <def tag="new-page" for="<%= model.name %>">
-  <page merge title="New <%= model_name :title %>">
+  <page merge title="#{ht '<%= model_key %>.new.title', :default=>['New <%=model_name :title %>'] }">
     <body: class="new-page <%= model_class %>" param/>
-    
+
     <content: param>
       <section param="content-header">
-        <h2 param="heading">New <%= model_name :title %></h2>
+        <h2 param="heading">
+          <ht key="<%= model_key %>.new.heading">
+            New <%= model_name :title %>
+          </ht>
+        </h2>
       </section>
-      
+
       <section param="content-body">
         <form param>
-          <submit: label="Create <%= model_name :title %>"/>
+          <submit: label="#{ht '<%= model_key %>.actions.create', :default=>['Create <%= model_name :title %>']}"/>
         </form>
       </section>
     </content:>
@@ -86,7 +101,7 @@ new_form = !new_link && linkable?(model, :create, :method => :post)
 
 <%
 back_link      = model.dependent_on.detect { |x| !(model.reflections[x].klass < Hobo::User) }
-boolean_fields = model.columns.select { |c| c.type == :boolean }.*.name
+boolean_fields = model.columns.select { |c| c.type == :boolean }.*.name - model.view_hints.inline_booleans
 creator        = model.creator_attribute
 creator_link   = creator && model.reflections[creator] && linkable?(model.reflections[creator].klass, :show)
 edit_link      = linkable?(:edit)
@@ -111,7 +126,7 @@ unless model.view_hints.secondary_children.empty?
 end
 -%>
 <def tag="show-page" for="<%= model.name %>">
-  <page merge title="<%= model_name :title %>">
+  <page merge title="#{ht '<%=model_key %>.show.title', :default=>['<%=model_name :title %>'] }">
 
     <body: class="show-page <%= model_class %>" param/>
 
@@ -121,10 +136,14 @@ end
         <section param="main-content">
 <% end -%>
           <header param="content-header">
-<% if  back_link -%>
-            <a:<%= back_link %> param="parent-link">&laquo; <name/></a:<%= back_link %>>
+<% if back_link -%>
+            <a:<%= back_link %> param="parent-link">&laquo; <ht key="<%= model_key %>.actions.back" to="<%= back_link %>"><name/></ht></a:<%= back_link %>>
 <% end -%>
-            <h2 param="heading"><name/></h2>
+            <h2 param="heading">
+              <ht key="<%= model_key %>.show.heading" name="&this.respond_to?(:name) ? this.name : ''">
+                <name/>
+              </ht>
+            </h2>
 <% if boolean_fields -%>
 
             <record-flags fields="<%= boolean_fields * ', ' %>" param/>
@@ -132,16 +151,20 @@ end
 <% if creator_link -%>
 
             <a:<%= model.creator_attribute %> param="creator-link"/>
-<% elsif creator -%>        
+<% elsif creator -%>
 
             <view:get-creator param="creator-name"/>
 <% end -%>
 <% if edit_link -%>
 
-            <a action="edit" if="&can_edit?" param="edit-link">Edit <%= model_name :title %></a>
+            <a action="edit" if="&can_edit?" param="edit-link">
+              <ht key="<%= model_key %>.actions.edit" name="&this.respond_to?(:name) ? this.name : ''">
+                Edit <%= model_name :title %>
+              </ht>
+            </a>
 <% end -%>
           </header>
-    
+
           <section param="content-body"<%= ' with-flash-messages' if aside_collections %>>
 <% if main_content -%>
             <view:<%= main_content %> param="description"/>
@@ -151,8 +174,12 @@ end
 <% end -%>
 <% if collection -%>
             <section param="collection-section">
-              <h3 param="collection-heading"><%= '<Your/>' if is_user_model %><%= collection.to_s.titleize %></h3>
-              
+              <h3 param="collection-heading">
+                <ht key="<%= model_key %>.collection.heading.<%= (is_user_model ? 'your':'other') %>" >
+                  <%= '<Your/>' if is_user_model %><%= collection.to_s.titleize %>
+                </ht>
+              </h3>
+
 <%   if sortable_collection?(collection) -%>
               <sortable-collection:<%= collection %> param="collection"/>
 <%   else -%>
@@ -160,14 +187,22 @@ end
 <%   end -%>
 <%   if add_link -%>
 
-              <a:<%= collection %> action="new" if="&can_create?(@<%= model_name.underscore %>.<%= collection %>)" param="new-link">New <%= collection.to_s.singularize.titleize %></a:<%= collection %>>
+              <a:<%= collection %> action="new" if="&can_create?(@<%= model_name.underscore %>.<%= collection %>)" param="new-link">
+                <ht key="<%= collection.to_s.pluralize %>.actions.new">
+                  New <%= collection.to_s.singularize.titleize %>
+                </ht>
+              </a:<%= collection %>>
 <%   elsif add_form -%>
 
               <section param="add-to-collection" if="&can_create?(@<%= model_name.underscore %>.<%= collection %>)">
-                <h3 param="add-form-heading">Add <%= a_or_an collection.to_s.singularize.titleize %></h3>
+                <h3 param="add-form-heading">
+                  <ht key="<%= collection.to_s.pluralize %>.collection.add_form_heading">
+                    Add <%= a_or_an collection.to_s.singularize.titleize %>
+                  </ht>
+                </h3>
                 <form with="&@<%= collection_class.name.underscore %> || new_for_current_user(@<%= model_name.underscore %>.<%= collection %>)" owner="<%= owner %>" without-cancel param>
                   <field-list: skip="<%= owner %>"/>
-                  <submit: label="Add"/>
+                  <submit: label="#{ht '<%= collection.to_s.pluralize %>.actions.add', :default=>['Add'] }"/>
                 </form>
               </section>
 <%   end -%>
@@ -176,19 +211,29 @@ end
           </section>
 <% if aside_collections -%>
         </section>
-        
+
         <aside param>
 <%   for refl, reverse_refl in aside_collections -%>
 <%     if linkable?(refl.klass, :"index_for_#{reverse_refl.name}") -%>
           <preview-with-more:<%= refl.name %>.recent param="<%= refl.name %>-preview">
 <%       if is_user_model -%>
-            <heading:><Your with="&@<%= model_name.underscore %>"/> <%= refl.name.to_s.titleize %></heading:>
+            <heading:>
+              <ht key="hobo.undefined">  
+                <Your with="&@<%= model_name.underscore %>"/> <%= refl.name.to_s.titleize %>
+              </ht>
+            </heading:>
 <%       end -%>
-            <more:>more</more:>
+            <more:>
+              <ht key="hobo.actions.more">more</ht>
+            </more:>
           </preview-with-more:<%= refl.name %>.recent>
 <%     else -%>
           <section param="<%= refl.name %>-collection-section">
-            <h3 param="<%= refl.name %>-collection-heading"><%= refl.name.to_s.titleize %></h3>
+            <h3 param="<%= refl.name %>-collection-heading">
+              <ht key="<%= refl.name.to_s.pluralize %>.collection.heading.other" >
+                <%= refl.name.to_s.titleize %>
+              </ht>
+            </h3>
             <collection:<%= refl.name %>  param="<%= refl.name %>-collection"/>
           </section>
 <%     end -%>
@@ -197,7 +242,7 @@ end
       </section-group>
 <% end -%>
     </content:>
-    
+
   </page>
 </def>
 
@@ -206,21 +251,25 @@ end
 name_attribute = model.name_attribute
 -%>
 <def tag="edit-page" for="<%= model.name %>">
-  <page merge title="Edit <%= model_name :title %>">
+  <page merge title="#{ht '<%= model_key %>.edit.title', :default=>['Edit <%=model_name :title %>'] }">
 
     <body: class="edit-page <%= model_class %>" param/>
 
     <content:>
       <section param="content-header">
-        <h2 param="heading">Edit <type-name/></h2>
-        <delete-button label="Remove This <%= model_name :title %>" param/>
+        <h2 param="heading">
+          <ht key="<%= model_key %>.edit.heading" name="&this.respond_to?(:name) ? this.name : ''">
+            Edit <type-name/>
+          </ht>
+        </h2>
+        <delete-button label="#{ht '<%= model_key %>.actions.delete', :default=>['Remove This <%= model_name :title %>']}" param/>
       </section>
 
       <section param="content-body">
         <form param/>
       </section>
     </content:>
-    
+
   </page>
 </def>
 
@@ -241,33 +290,53 @@ new_link = :new.in?(actions)
 -%>
 <def tag="index-for-<%= owner.dasherize %>-page" polymorphic/>
 <def tag="index-for-<%= owner.dasherize %>-page" for="<%= model.name %>">
-  <page merge title="<%= model_name :title, :plural %> for #{name :with => @<%= owner %>, :no_wrapper => true}">
+  <page merge title="#{ht '<%= model_key %>.index_for_owner.title', :default=>['<%=model_name :title, :plural %> for']} #{name :with => @<%= owner %>, :no_wrapper => true}">    
     <body: class="index-for-owner-page <%= owner.dasherize %> <%= model_class %>" param/>
-    
     <content: param>
       <header param="content-header">
 <% if linkable_owner -%>
-        <div param="back-to">Back to <a with="&@<%= owner %>"/></div>
+        <div param="back-to">
+          <ht key="hobo.actions.back">Back to</ht> <a with="&@<%= owner %>"/>
+        </div>
 <% end -%>
 <% if owner_is_user %>
-        <h2 param="heading"><Your with="&@<%= owner %>"/> <%= model_name :title, :plural %></h2>
+        <h2 param="heading">
+          <ht key="<%= model_key %>.index_for_owner.heading.your">
+            <Your with="&@<%= owner %>"/> <%= model_name :title, :plural %>
+          </ht>
+        </h2>
 <% else -%>
-        <h2 param="heading"><%= model_name :title, :plural %></h2>
-        <h3 param="subheading">For: <<%= owner_tag %> with="&@<%= owner %>"/></h3>
+        <h2 param="heading">
+          <ht key="<%= model_key %>.index_for_owner.heading.other">
+            <%= model_name :title, :plural %>
+          </ht>
+        </h2>
+        <h3 param="subheading">
+          <ht key="<%= model_key %>.index_for_owner.subheading">
+            For:
+          </ht>
+          <<%= owner_tag %> with="&@<%= owner %>"/>
+        </h3>
 <% end -%>
-        <p param="count" if>There <count prefix="are"/></p>
+        <p param="count" if>
+          <ht key="<%= model_key %>.collection.count" count="&this.size">
+            There <count prefix="are"/>
+          </ht>
+        </p>
       </header>
-      
+
       <section param="content-body">
 <% if new_link -%>
+        <a action="new" to="&model" param="new-link">
+          <ht key="<%= model_key %>.actions.new" >New <%=model_name :title %></ht>
+        </a>
 
-        <a action="new" to="&model" param="new-link"/>
 <% end -%>
 
         <page-nav param="top-page-nav"/>
-      
+
         <collection param/>
-      
+
         <page-nav param="bottom-page-nav"/>
       </section>
     </content:>
@@ -279,20 +348,28 @@ new_link = :new.in?(actions)
 <% if :new.in? actions -%>
 <def tag="new-for-<%= owner.dasherize %>-page" polymorphic/>
 <def tag="new-for-<%= owner.dasherize %>-page" for="<%= model.name %>">
-  <page merge title="New <%= model_name :title %> for #{name :with => @<%= owner %>}">
-    
+  <page merge title="#{ht '<%=model_key %>.new_for_owner.title', :default=>['New <%=model_name :title %> for']} #{name :with => @<%= owner %>}">
     <body: class="new-for-owner-page <% owner.dasherize %> <%= model_class %>" param/>
-    
+
     <content: param>
       <header param="content-header">
-        <h2 param="heading">New <%= collection_name.singularize.titleize %></h2>
-        <h3 param="subheading">For: <<%= owner_tag %> with="&@<%= owner %>"/></h3>
+        <h2 param="heading">
+          <ht key="<%= model_key %>.new_for_owner.heading">
+            New <%= collection_name.singularize.titleize %>
+          </ht>
+        </h2>
+        <h3 param="subheading">
+          <ht key="<%= model_key %>.new_for_owner.subheading">
+            For:
+          </ht>
+          <<%= owner_tag %> with="&@<%= owner %>"/>
+        </h3>
       </header>
-      
+
       <section param="content-body">
         <form owner="<%= owner %>" method="post" param>
           <field-list: skip="<%= owner %>"/>
-          <submit: label="Create <%= model_name :title %>"/>
+          <submit: label="#{ht '<%=model_key %>.actions.create', :default=>['Create <%= model_name :title %>']}"/>
         </form>
       </section>
     </content:>
@@ -305,14 +382,18 @@ new_link = :new.in?(actions)
 <% creator_names.each do |creator| -%>
 <def tag="<%= creator.dasherize %>-page" polymorphic/>
 <def tag="<%= creator.dasherize %>-page" for="<%= model.name %>">
-
-  <page title="<%= creator.titleize %>" merge>
+  
+  <page title="#{ht '<%=model_key %>.<%= creator.underscore %>.title', :default=>['<%= creator.titleize %>']}" merge>  
 
     <body: class="lifecycle-start-page <%= creator.dasherize %>-page" param/>
 
     <content: param>
       <header param="content-header">
-        <h2 param="heading"><%= creator.titleize %></h2>
+        <h2 param="heading">
+          <ht key="<%= model_key %>.<%= creator.underscore %>.heading">
+            <%= creator.titleize %>
+          </ht>
+        </h2>
       </header>
 
       <section param="content-body">
@@ -327,20 +408,24 @@ new_link = :new.in?(actions)
 <% transition_names.each do |transition| -%>
 <def tag="<%= transition.dasherize %>-page" polymorphic/>
 <def tag="<%= transition.dasherize %>-page" for="<%= model.name %>">
-  <page title="<%= transition.titleize %>" merge>
-    
+  <page title="#{ht '<%=model_key %>.<%= transition.underscore %>.title', :default=>['<%= transition.titleize %>']}" merge>
+
     <body: class="lifecycle-transition-page <%= transition.dasherize -%>-page" param/>
-    
+
     <content:>
       <header param="content-header">
-        <h2 param="heading"><%= transition.titleize %></h2>
+        <h2 param="heading">
+          <ht key="<%= model_key %>.<%= transition.underscore %>.heading">
+            <%= transition.titleize %>
+          </ht>
+        </h2>
       </header>
-      
+
       <section param="content-body">
         <<%= transition.dasherize %>-form param="form"/>
       </section>
     </content:>
-    
+
   </page>
 </def>