hobo 1.3.0.pre19 → 1.3.0.pre20

data/lib/hobo/model/lifecycles/lifecycle.rb

@@ -198,7 +198,7 @@ module Hobo
           timestamp = record.read_attribute(key_timestamp_field)
           if timestamp
             timestamp = timestamp.getutc
-            Digest::SHA1.hexdigest("#{record.id}-#{state_name}-#{timestamp}")
+            Digest::SHA1.hexdigest("#{record.id}-#{state_name}-#{timestamp}-#{Rails.application.config.secret_token}")
           end
         end
 
@@ -211,6 +211,10 @@ module Hobo
           provided_key && provided_key == key && !key_expired?
         end
 
+        def clear_key
+          record.write_attribute key_timestamp_field, nil
+        end
+
         def invariants_satisfied?
           self.class.invariants.all? { |i| record.instance_eval(&i) }
         end

data/lib/hobo/model/lifecycles/transition.rb

@@ -34,6 +34,7 @@ module Hobo
 
 
         def change_state(record)
+          record.lifecycle.clear_key unless options[:new_key] || options[:keep_key]
           record.lifecycle.become(get_state(record, end_state))
         end
 

data/lib/hobo/rapid/generators/rapid/cards.dryml.erb

@@ -19,7 +19,7 @@ has_body    = (!show_link && description_attribute) || creator_link || creator_a
 
 show_title = !show_link && (name_attribute || !has_body)
 
-model_key = model.name.pluralize.underscore
+model_key = model.to_s.underscore
 -%>
 <def tag="card" for="<%= model.name %>">
   <card class="<%= model_class %>" param="default" merge>
@@ -53,7 +53,7 @@ model_key = model.name.pluralize.underscore
       <view:<%= creator_attribute %> param="creator"/>
 <% end -%>
 <% if primary_collection -%>
-      <ht key="<%= primary_collection.to_s.pluralize.underscore %>.collection.count" count="&this.<%= primary_collection %>.size">
+      <ht key="<%= primary_collection.to_s.underscore %>.collection.count" count="&this.<%= primary_collection %>.size">
          <count:<%= primary_collection%> param/>
       </ht>
 <% end -%>

data/lib/hobo/rapid/generators/rapid/forms.dryml.erb

@@ -4,7 +4,7 @@ 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.tableize
+model_key = model.to_s.underscore
 -%>
 <def tag="form" for="<%= model.name %>">
   <form merge param="default">
@@ -43,4 +43,4 @@ model_key = model.name.tableize
 </def>
 <% end -%>
 
-<% end # of each_model do -%>
+<% end # of each_model do -%>

data/lib/hobo/rapid/generators/rapid/pages.dryml.erb

@@ -4,7 +4,7 @@
   <navigation class="main-nav" merge-attrs param="default">
     <nav-item href="#{base_url}/">Home</nav-item>
 <% models.select { |m| linkable?(m, :index) }[0..4].each do |m| -%>
-    <nav-item with="&<%= m.name %>"><ht key="<%= m.name.tableize %>.nav_item" count="100"><model-name-human count="100"/></ht></nav-item>
+    <nav-item with="&<%= m.name %>"><ht key="<%= m.to_s.underscore %>.nav_item" count="100"><model-name-human count="100"/></ht></nav-item>
 <% end -%>
   </navigation>
 </def>
@@ -17,7 +17,7 @@
 <%
 new_link = linkable?(:new)
 new_form = !new_link && linkable?(model, :create, :method => :post)
-model_key = model.name.tableize
+model_key = model.to_s.underscore
 -%>
 
 <def tag="index-page" for="<%= model.name %>">
@@ -177,7 +177,7 @@ end
 <% if collection -%>
             <section param="collection-section">
               <h3 param="collection-heading">
-                <ht key="<%= collection.to_s.tableize %>.collection.heading" count="&this.<%= collection.to_s %>.count" >
+                <ht key="<%= collection.to_s.underscore %>.collection.heading" count="&this.<%= collection.to_s %>.count" >
                   <human-collection-name collection="<%= collection %>" your/>
                 </ht>
               </h3>
@@ -190,7 +190,7 @@ end
 <%   if add_link -%>
 
               <a:<%= collection %> action="new" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)" param="new-link">
-                <ht key="<%= collection.to_s.tableize %>.actions.new" count="1">
+                <ht key="<%= collection.to_s.underscore %>.actions.new" count="1">
                   New <%= collection.to_s.singularize.titleize %>
                 </ht>
               </a:<%= collection %>>
@@ -198,13 +198,13 @@ end
 
               <section param="add-to-collection" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)">
                 <h3 param="add-form-heading">
-                  <ht key="<%= collection.to_s.pluralize %>.collection.add_form_heading" count="1">
+                  <ht key="<%= collection.to_s.underscore %>.collection.add_form_heading" count="1">
                     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="#{ht '<%= sq_escape collection.to_s.pluralize %>.actions.add', :default=>['Add'] }"/>
+                  <submit: label="#{ht '<%= sq_escape collection.to_s.underscore %>.actions.add', :default=>['Add'] }"/>
                 </form>
               </section>
 <%   end -%>
@@ -223,7 +223,7 @@ end
 <%     else -%>
           <section param="<%= refl.name %>-collection-section">
             <h3 param="<%= refl.name %>-collection-heading">
-              <ht key="<%= refl.name.to_s.tableize %>.collection.heading" count="&this.<%= refl.name.to_s %>.count" >
+              <ht key="<%= refl.klass.to_s.underscore %>.collection.heading" count="&this.<%= refl.name.to_s %>.count" >
                 <human-collection-name collection="<%= refl.name %>" your/>
               </ht>
             </h3>

data/lib/hobo/rapid/taglibs/rapid.dryml

@@ -1,6 +1,6 @@
 <!--
 
-The Rapid tag library makes web development go fast. The Rapid tag library is your friend.  
+The Rapid tag library makes web development go fast. The Rapid tag library is your friend.
 
 (This taglib defines no tags - it just includes all the other taglibs. Move along. Nothing to see here.)
 

data/lib/hobo/rapid/taglibs/rapid_core.dryml

@@ -493,7 +493,7 @@ Assuming the context is a blog post...
 %></def>
 
 <!-- Renders 'Yes' for true and 'No' for false -->
-<def tag="view" for="boolean"><%= this ? I18n.t('hobo.boolean_yes', :default => 'Yes') : I18n.t('hobo.boolean_no', :default => 'No') %></def>
+<def tag="view" for="boolean"><%= this ? t('hobo.boolean_yes', :default => 'Yes') : t('hobo.boolean_no', :default => 'No') %></def>
 
 <!-- Renders a link (`<a>`) to `this` -->
 <def tag="view" for="ActiveRecord::Base"><a merge-attrs/></def>
@@ -591,7 +591,7 @@ You can pass a summary attribute, which will generate a complete localized sente
     else
       key = summary.kind_of?(String) ? summary : "default"
       default = c == 1 ? "There is 1 #{label}" : "There are #{c} #{label}"
-      I18n.t "tags.count.#{key}", {:count=>c, :label=>label, :default=>default}.merge(attributes)
+      t "tags.count.#{key}", {:count=>c, :label=>label, :default=>default}.merge(attributes)
     end
   end
 %></span></def>
@@ -661,12 +661,12 @@ The "titleize" attribute is deprecated: use "capitalize" instead.
          when attributes[:do] then 'do'
          end -%>
   <if test="&this == current_user">
-    <%= s = I18n.t("tags.you.current_user.#{k || attributes.keys.first || 'default'}",:default=>"you #{k}")
+    <%= s = t("tags.you.current_user.#{k || attributes.keys.first || 'default'}",:default=>"you #{k}")
        (titleize||capitalize) ? s.sub(/^./){|c| c.upcase} : s %>
   </if>
   <else>
     <do param="default">
-      <%= s = I18n.t("tags.you.other_user.#{k || attributes.keys.first || 'default'}", :name=>this.name,
+      <%= s = t("tags.you.other_user.#{k || attributes.keys.first || 'default'}", :name=>this.name,
           :default=>"#{this.name} #{'has' if attributes[:have]}#{'is' if attributes[:are]}#{'does' if attributes[:do]}")
           (titleize||capitalize) ? s.sub(/^./){|c| c.upcase} : s %>
     </do>
@@ -738,14 +738,14 @@ Notes
    options = {:default=>[d], :count=>(attrs[:count]||1), :name=>this.name}
    your_key = key.split('.').last
    unless key.eql?(your_key) || attrs.has_key?(your_key.to_sym)
-     options[your_key.to_sym] = I18n.t(key, :count=>options[:count], :default=>your_key.titleize)
+     options[your_key.to_sym] = t(key, :count=>options[:count], :default=>your_key.titleize)
    end
    s = if this == current_user
          options[:default].unshift :"tags.your.default.current_user"
-         I18n.t("tags.your.#{your_key}.current_user", options.merge(attrs))
+         t("tags.your.#{your_key}.current_user", options.merge(attrs))
        else
          options[:default].unshift :"tags.your.default.other_user"
-         I18n.t("tags.your.#{your_key}.other_user", options.merge(attrs))
+         t("tags.your.#{your_key}.other_user", options.merge(attrs))
        end
    capitalize ? s.sub(/^./){|c| c.upcase} : s
 %></def>
@@ -774,7 +774,7 @@ Notes
 <def tag="dev-user-changer">
   <set user="&Hobo::Model::User.default_user_model"/>
   <select-menu if="&user && Rails.env.development?"
-               first-option="#{I18n.t('hobo.dev_user_changer.guest', {:default=>'Guest'})}" options="&user.all(:limit => 30).*.login"
+               first-option="#{t('hobo.dev_user_changer.guest', {:default=>'Guest'})}" options="&user.all(:limit => 30).*.login"
                onchange="location.href = '#{dev_support_path :action=>:set_current_user}?login=' + encodeURIComponent(this.options[this.selectedIndex].value)"
                selected="#{current_user.login}"
                class="dev-user-changer"

data/lib/hobo/rapid/taglibs/rapid_document_tags.dryml

@@ -1,6 +1,6 @@
 <!-- Extra tags for semantic markup -->
 
-<!-- Used as a semantic wrapper around a group of sections and asides. CSS layouts can be provided based on this structure. 
+<!-- Used as a semantic wrapper around a group of sections and asides. CSS layouts can be provided based on this structure.
 
 ### Usage
 
@@ -13,7 +13,7 @@
 <def tag="section-group"><div class="section-group"><div class="section-group-inner" merge-attrs param="default"></div></div></def>
 
 <!-- A proposed HTML 5 tag for representing a generic document or application section. Slightly more semantic than `<div>` for indicating document structure. For the time being, `<section>` is output as `<div class="section">`. In Hobo, `<section>` also has one other important behaviour which is different to using `<div>` directly, when the content of the section is empty, the wrapper tag will disappear. e.g.
-  
+
     <section>My Section</section> -> <div class="section">My Section</div>
     <section><% # empty %></section> -> (nothing is generated)
 -->

data/lib/hobo/rapid/taglibs/rapid_forms.dryml

@@ -575,8 +575,8 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
                                   else
                                     { :type => "button" }
                                   end)
-    label ||= I18n.t("hobo.actions.remove", :default=>"Remove")
-    confirm = I18n.t("hobo.messages.confirm", :default=>"Are you sure?") if confirm.nil?
+    label ||= t("hobo.actions.remove", :default=>"Remove")
+    confirm = t("hobo.messages.confirm", :default=>"Are you sure?") if confirm.nil?
 
     add_classes!(attributes,
                  image ? "image-button" : "button",
@@ -623,7 +623,7 @@ All of the standard ajax attributes are supported (see the main taglib documenti
   new = class_or_assoc.new(fields)
   new.set_creator(current_user)
   if can_create?(new)
-    label ||= ht("#{new.class.name.tableize}.actions.new", :default=>"New #{new.class.model_name.human}")
+    label ||= ht("#{new.class.to_s.underscore}.actions.new", :default=>"New #{new.class.model_name.human}")
     ajax_attributes = { :message => message }
     class_name = new.class.name.underscore
     ajax_attributes[:params] = { class_name => fields } unless fields.empty?
@@ -652,7 +652,7 @@ For situations where there are too many target records to practically include in
 
   -->
 <def tag="select-one" attrs="include-none, blank-message, options, sort, limit, text-method"><%
-  raise Hobo::PermissionDeniedError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit? 
+  raise Hobo::PermissionDeniedError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit?
   blank_message ||= ht("#{this_type.name.tableize}.message.no", :default=>"(No #{this_type.model_name.human})")
   limit ||= 100
 
@@ -783,7 +783,7 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
     <h2 param="heading"><t key="activerecord.errors.template.header" model="&this.class.model_name.human" count="&this.errors.size"/></h2>
     <t key="activerecord.errors.template.body"></t>
     <ul param>
-      <% this.errors.each_full do |message| -%>
+      <% this.errors.to_a.each do |message| -%>
       <li param><%= message %></li>
       <% end -%>
     </ul>
@@ -797,12 +797,12 @@ An input for `has_many :through` associations that lets the user chose the items
 To use this tag, the model of the items the user is chosing *must* have unique names, and the
 -->
 <def tag="select-many" attrs="options, targets, remove-label, prompt, disabled, name"><%
-  prompt ||= ht("#{this_field.tableize}.form.select_many.prompt", :default=>"Add #{this_field.titleize.singularize}")
+  prompt ||= ht("#{this_field.underscore}.form.select_many.prompt", :default=>"Add #{this_field.titleize.singularize}")
   options ||= this_field_reflection.klass.all(:conditions =>this.send(:conditions)).select {|x| can_view?(x)}
   name ||= param_name_for_this
 
   values = this
-  remove_label ||= I18n.t("hobo.actions.remove", :default=>'Remove')
+  remove_label ||= t("hobo.actions.remove", :default=>'Remove')
   -%>
   <div class="input select-many" merge-attrs>
     <div style="display:none" class="item-proto">
@@ -883,7 +883,7 @@ Use the `uri` option to specify a redirect location:
 <def tag="select-menu" attrs="options, selected, first-option, first-value, key">
 <% key ||= 'default'
    %w[options first_option first_value].each do |a|
-     str = I18n.t("tags.select_menu.#{key}.#{a}", :default=>'')
+     str = t("tags.select_menu.#{key}.#{a}", :default=>'')
      eval "#{a} = str unless str.blank?"
    end
 -%>
@@ -1026,7 +1026,7 @@ end
       <input type="hidden" class="empty-input" id="#{underize param_name_for_this}" name="#{param_name_for_this}" value="" disabled="&(!this.empty? || minimum>0)" />
       <fake-field-context fake-field="-1" context="&template">
         <div param="empty-message">
-          <ht key="#{this.class.name.tableize}.collection.empty_message">
+          <ht key="#{this.class.to_s.underscore}.collection.empty_message">
             No <%= this.class.name.titleize.downcase.pluralize %>.
           </ht>
         </div>

data/lib/hobo/rapid/taglibs/rapid_generics.dryml

@@ -20,7 +20,7 @@
 <def tag="empty-collection-message">
   <unless test="&this.member_class.nil?">
     <div class="empty-collection-message" style="#{'display:none' if !this.empty?}" param="default">
-      <ht key="#{this.member_class.name.tableize}.collection.empty_message">
+      <ht key="#{this.member_class.to_s.underscore}.collection.empty_message">
         No <collection-name/> to display
       </ht>
     </div>

data/lib/hobo/rapid/taglibs/rapid_i18n.dryml

@@ -1,22 +1,5 @@
 <!-- Rapid i18n provides tags related with the Rails-I18n project -->
 
-<!-- Simple wrapper around I18n.t.
-The tag content is used as the :default option. It is overridden by an explicit 'default' attribute.
-There is a default :count => 1
-
-### Attributes
-
- - key: the key to lookup
- - all the attributes accepted by the wrapped method
-
--->
-<def tag="t"><%=
-  options = {}
-  all_attributes.each_pair{|k,v| options[k.to_sym] = h(v)}
-  k = options.delete(:key)
-  I18n.t(k, {:default=>all_parameters.default}.merge(options)).html_safe
-%></def>
-
 <!-- Wrapper around ActiveModel::Name#human
 
 #### Attributes

data/lib/hobo/rapid/taglibs/rapid_lifecycles.dryml

@@ -1,14 +1,14 @@
 <!-- Contains view-layer support for Hobo's lifecycles. Note that lifecycle forms are generated automatically in `app/views/taglibs/auto/rapid/forms.dryml` - this library contains only lifecycle push-buttons. -->
 
 <!-- A push-button to invoke a lifecycle transition either as a page-reload or as an ajax call.
-  
+
 ### Attributes
 
  - `transition` - the name of the transition to invoke. Required
  - `update` - one or more DOM IDs of ajax parts to update after the transition
  - `label` - the label on the button. Defaults to the name of the transition
 
-All of the [standard ajax attributes](/api_taglibs/rapid_forms) are also supported. 
+All of the [standard ajax attributes](/api_taglibs/rapid_forms) are also supported.
 
 ### Warning
 
@@ -25,7 +25,7 @@ Transitions with parameters are implemented using a form.  HTML does not allow f
 
     html_attributes[:method] ||= has_params ? :get : :put
     add_classes!(html_attributes, "transition-button #{transition_name}-button")
-    label = ht("#{this.class.name.tableize}.actions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
+    label = ht("#{this.class.to_s.underscore}.actions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
     url = object_url(this, transition_name, :method => html_attributes[:method])
 
     if (update || !ajax_attributes.empty?) && !has_params
@@ -48,7 +48,7 @@ For example, you could use this on a `Friendship` card: the person invited to ha
 This tag behaves similarly to repeat: an else tag may be used to handle the case of no buttons:
 
     <transition-buttons/><else>Sorry, no buttons to press.</else>
-  -->  
+  -->
 <def tag="transition-buttons">
   <% ajax_attrs, html_attrs = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS) %>
   <div merge-attrs="&html_attrs" class="transitions">
@@ -59,4 +59,4 @@ This tag behaves similarly to repeat: an else tag may be used to handle the case
       <% end %>
     </if>
   </div>
-</def>
+</def>

data/lib/hobo/rapid/taglibs/rapid_navigation.dryml

@@ -89,7 +89,7 @@ This is a simple tag - just look at the source if you need to know more detail.
     <ul class="navigation account-nav" param>
       <li if="&Rails.env.development?" param="dev-user-changer"><dev-user-changer/></li>
       <if test="&logged_in?">
-        <li class='nav-item' param="logged-in-as"><a to="&current_user"><t key="hobo.actions.logged_in_as" name="&name.html_safe">Logged in as <name/></t></a></li>
+        <li class='nav-item' param="logged-in-as"><a to="&current_user"><t key="hobo.actions.logged_in_as_html" name="&name">Logged in as <name/></t></a></li>
         <li class='nav-item' param="account"><a action="account"><t key="hobo.actions.account">Account</t></a></li>
         <li class='nav-item' param="log-out"><a href="&logout_url"><t key="hobo.actions.logout">Log out</t></a></li>
       </if>

data/lib/hobo/rapid/taglibs/rapid_plus.dryml

@@ -17,7 +17,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
           <hidden-fields for-query-string skip="page, search"/>
           <span><t key="hobo.table_plus.search">Search</t></span>
           <input class="search" type="search" name="search" value="&params[:search]"/>
-          <submit label="&I18n.t('hobo.table_plus.submit_label', :default=>'Go')" class="search-button" param="search-submit"/>
+          <submit label="&t('hobo.table_plus.submit_label', :default=>'Go')" class="search-button" param="search-submit"/>
         </form>
       </div>
     </div>
@@ -105,16 +105,16 @@ This tag assumes the controller has a `reorder` action and the model has a `posi
      name ||= model_class.name.downcase.pluralize -%>
   <section class="#{name.dasherize} collection-preview" param="default">
     <h3 param="heading">
-      <ht key="#{name.to_s.tableize}.collection.heading" count="&this.size">
+      <ht key="#{model_class.to_s.underscore}.collection.heading" count="&this.size">
         <do param="heading-content"><%= name.pluralize.titleize %></do>
       </ht>
     </h3>
     <a with="&model_class" action="new" if="&can_create?(model_class.new)" param="new-link">
-      <ht key="#{model_class.to_s.tableize}.actions.new">New <%= model_class.model_name.human %></ht>
+      <ht key="#{model_class.to_s.underscore}.actions.new">New <%= model_class.model_name.human %></ht>
     </a>
     <collection param/>
     <unless test="&this.empty? || this.size <= model_class.count">
-      <a param="show-all"><ht key="#{model_class.to_s.tableize}.actions.show_all" count="100">Show all <%= name.pluralize.titleize %>...</ht></a>
+      <a param="show-all"><ht key="#{model_class.to_s.underscore}.actions.show_all" count="100">Show all <%= name.pluralize.titleize %>...</ht></a>
     </unless>
   </section>
 </def>
@@ -210,9 +210,9 @@ Besides the "tags.filter_menu.default.no_filter" key is used as default of the a
 
   -->
 <def tag="filter-menu" attrs="param-name, options, no-filter, id">
-  <% opt = I18n.t("tags.filter_menu.#{param_name}.options", :default=>'')
+  <% opt = t("tags.filter_menu.#{param_name}.options", :default=>'')
      options = opt unless opt.blank?
-     no_filter = I18n.t("tags.filter_menu.#{param_name}.no_filter", :default=>[:"tags.filter_menu.default.no_filter", no_filter, "All"]) %>
+     no_filter = t("tags.filter_menu.#{param_name}.no_filter", :default=>[:"tags.filter_menu.default.no_filter", no_filter, "All"]) %>
   <form action="&request.fullpath" method="get" class="filter-menu" merge-attrs="id">
     <div>
       <% opt = options.first.kind_of?(Array) ? options.*.last : options

data/lib/hobo/rapid/taglibs/rapid_user_pages.dryml

@@ -39,7 +39,7 @@
       </labelled-item>
     </labelled-item-list>
     <div param="actions">
-      <submit label="#{I18n.t 'hobo.actions.login', :default=>['Log in'] }" param/><if test="&signup_url" class='nav-item'>
+      <submit label="#{t 'hobo.actions.login', :default=>['Log in'] }" param/><if test="&signup_url" class='nav-item'>
       <t key="hobo.support.or">or</t> <a param="signup" href="&signup_url"><t key="hobo.login.signup">Sign up</t></a></if>
     </div>
   </form>
@@ -48,7 +48,7 @@
 <!-- Simple log-in page  -->
 <def tag="login-page">
   <% remember_me = true if remember_me.nil? %>
-  <simple-page title="#{I18n.t 'hobo.login.title', :default=>['Log in'] }" merge>
+  <simple-page title="#{t 'hobo.login.title', :default=>['Log in'] }" merge>
 
     <body: class="login-page" param/>
 
@@ -69,7 +69,7 @@
 <!-- The page that initiates the forgotten password process. Contains a single text-input where the user can provide
  their email address -->
 <def tag="forgot-password-page">
-  <simple-page title="#{I18n.t 'hobo.forgot_password.title', :default=>['Forgotten Password'] }" merge>
+  <simple-page title="#{t 'hobo.forgot_password.title', :default=>['Forgotten Password'] }" merge>
 
     <body: class="forgot-password-page" param/>
 
@@ -92,7 +92,7 @@
             </labelled-item>
           </labelled-item-list>
           <div param="actions">
-            <submit label="#{I18n.t 'hobo.actions.send', :default=>['Send'] }" param/>
+            <submit label="#{t 'hobo.actions.send', :default=>['Send'] }" param/>
           </div>
         </form>
       </section>
@@ -105,7 +105,7 @@
 entered is in our records". This is to avoid a privacy concern that the forgotten-password mechanism can be otherwise used to tell
 if a given email is associated with an account or not. -->
 <def tag="forgot-password-email-sent-page">
-  <simple-page title="#{I18n.t 'hobo.forgot_password_sent.title', :default=>['Forgotten Password - Sent'] }" merge>
+  <simple-page title="#{t 'hobo.forgot_password_sent.title', :default=>['Forgotten Password - Sent'] }" merge>
     <body: class="forgot-password-page" param/>
 
     <content: param>
@@ -132,7 +132,7 @@ if a given email is associated with an account or not. -->
 <!-- The page that is displayed on attempting to log in to an account that has been disabled. -->
 <def tag="account-disabled-page">
 
-  <simple-page title="#{I18n.t 'hobo.account_disabled_page.title', :default=>['Account Disabled'] }" merge>
+  <simple-page title="#{t 'hobo.account_disabled_page.title', :default=>['Account Disabled'] }" merge>
 
     <body: class="account-disabled-page" param/>
 
@@ -153,7 +153,7 @@ if a given email is associated with an account or not. -->
 <!-- Basic account page that provides the ability for the user to change their email address and password. -->
 <def tag="account-page">
 
-  <page title="#{I18n.t 'hobo.account_page.title', :default=>['Your Account'] }" merge>
+  <page title="#{t 'hobo.account_page.title', :default=>['Your Account'] }" merge>
 
     <body: class="user-account-page #{type_name}" param/>
 
@@ -171,7 +171,7 @@ if a given email is associated with an account or not. -->
           </field-list>
 
           <div class="actions" param="actions">
-            <submit label="#{I18n.t 'hobo.actions.save_account', :default=>'Save'}" param/>
+            <submit label="#{t 'hobo.actions.save_account', :default=>'Save'}" param/>
           </div>
         </form>
       </section>