typus 1.0.0.pre5 → 1.0.0.pre6

data/README.rdoc

@@ -29,16 +29,19 @@ enough to match lots of use cases.
 
 == Installing
 
-Install from GitHub the latest version which it's compatible with
-<tt>Rails 3.0.0</tt>.
+Add *Typus* to your <tt>Gemfile</tt>.
 
-    $ rails plugin install git://github.com/fesplugas/typus.git
+    gem 'typus', :git => 'git://github.com/fesplugas/typus.git'
 
-Once installed, run the generator to create required files.
+Update your bundle.
+
+    $ bundle install
+
+Run the *Typus* generator.
 
     $ rails generate typus
 
-Start the application server and go to {http://0.0.0.0:3000/admin}[http://0.0.0.0:3000/admin].
+Start the application server and go to {http://0.0.0.0:3000/admin}[http://0.0.0.0:3000/admin]http://0.0.0.0:3000/admin.
 
 == License
 

data/Rakefile

@@ -33,9 +33,13 @@ end
 desc 'Build and release the gem.'
 task :release => :build do
   version = Typus::VERSION
+
   system "git commit -m 'Bump version to #{Typus::VERSION}' lib/typus/version.rb"
   system "git tag v#{version}"
-  system "git push origin v#{version}"
+  system "git push"
+  system "git push --tags"
+
   system "gem push typus-#{version}.gem"
+
   system "git clean -fd"
 end

data/app/controllers/admin/account_controller.rb

@@ -10,7 +10,7 @@ class Admin::AccountController < Admin::BaseController
   before_filter :new?, :only => [:forgot_password]
 
   def new
-    flash[:notice] = _("Enter your email below to create the first user.")
+    flash[:notice] = _t("Enter your email below to create the first user.")
   end
 
   def create
@@ -25,7 +25,7 @@ class Admin::AccountController < Admin::BaseController
     if user = Typus.user_class.find_by_email(params[:typus_user][:email])
       url = admin_account_url(user.token)
       Admin::Mailer.reset_password_link(user, url).deliver
-      notice = _("Password recovery link sent to your email.")
+      notice = _t("Password recovery link sent to your email.")
       path = new_admin_session_path
     else
       render :action => :forgot_password and return
@@ -35,7 +35,7 @@ class Admin::AccountController < Admin::BaseController
   end
 
   def show
-    flash[:notice] = _("Please set a new password.")
+    flash[:notice] = _t("Please set a new password.")
     typus_user = Typus.user_class.find_by_token!(params[:id])
     session[:typus_user_id] = typus_user.id
     redirect_to :controller => "admin/#{Typus.user_class.to_resource}", :action => "edit", :id => typus_user.id

data/app/controllers/admin/resources_controller.rb

@@ -94,7 +94,7 @@ class Admin::ResourcesController < Admin::BaseController
 
   def destroy
     @item.destroy
-    notice = _("%{model} successfully removed.", :model => @resource.model_name.human)
+    notice = _t("%{model} successfully removed.", :model => @resource.model_name.human)
     redirect_to set_path, :notice => notice
   end
 
@@ -102,7 +102,7 @@ class Admin::ResourcesController < Admin::BaseController
     @item.toggle(params[:field])
     @item.save!
 
-    notice = _("%{model} %{attribute} changed.",
+    notice = _t("%{model} %{attribute} changed.",
                :model => @resource.model_name.human,
                :attribute => params[:field].humanize.downcase)
 
@@ -120,7 +120,7 @@ class Admin::ResourcesController < Admin::BaseController
   #
   def position
     @item.send(params[:go])
-    notice = _("Record moved %{to}.", :to => params[:go].gsub(/move_/, '').humanize.downcase)
+    notice = _t("Record moved %{to}.", :to => params[:go].gsub(/move_/, '').humanize.downcase)
     redirect_to set_path, :notice => notice
   end
 
@@ -133,11 +133,11 @@ class Admin::ResourcesController < Admin::BaseController
     resource_tableized = params[:related][:model].tableize
 
     if @item.send(resource_tableized) << resource_class.find(params[:related][:id])
-      flash[:notice] = _("%{model_a} related to %{model_b}",
+      flash[:notice] = _t("%{model_a} related to %{model_b}",
                          :model_a => resource_class.model_name.human,
                          :model_b => @resource.model_name.human)
     else
-      flash[:alert] = _("%{model_a} cannot be related to %{model_b}",
+      flash[:alert] = _t("%{model_a} cannot be related to %{model_b}",
                          :model_a => resource_class.model_name.human,
                          :model_b => @resource.model_name.human)
     end
@@ -178,11 +178,11 @@ class Admin::ResourcesController < Admin::BaseController
     end
 
     if saved_succesfully
-      flash[:notice] = _("%{model_a} unrelated from %{model_b}",
+      flash[:notice] = _t("%{model_a} unrelated from %{model_b}",
                          :model_a => resource_class.model_name.human,
                          :model_b => @resource.model_name.human)
     else
-      flash[:alert] = _("%{model_a} cannot be unrelated from %{model_b}",
+      flash[:alert] = _t("%{model_a} cannot be unrelated from %{model_b}",
                         :model_a => resource_class.model_name.human,
                         :model_b => @resource.model_name.human)
     end
@@ -202,7 +202,7 @@ class Admin::ResourcesController < Admin::BaseController
               end
 
     attachment = @resource.human_attribute_name(params[:attachment])
-    notice = _(message, :attachment => attachment)
+    notice = _t(message, :attachment => attachment)
 
     redirect_to set_path, :notice => notice
   end
@@ -244,7 +244,7 @@ class Admin::ResourcesController < Admin::BaseController
     when "create"
       path = { :action => action }
       path.merge!(:id => @item.id) unless action.eql?("index")
-      notice = _("%{model} successfully created.", :model => @resource.model_name.human)
+      notice = _t("%{model} successfully created.", :model => @resource.model_name.human)
     when "update"
       path = case action
              when "index"
@@ -254,7 +254,7 @@ class Admin::ResourcesController < Admin::BaseController
                  :id => @item.id,
                  :back_to => params[:back_to] }
              end
-      notice = _("%{model} successfully updated.", :model => @resource.model_name.human)
+      notice = _t("%{model} successfully updated.", :model => @resource.model_name.human)
     end
 
     redirect_to path, :notice => notice
@@ -285,13 +285,13 @@ class Admin::ResourcesController < Admin::BaseController
       @item.send(params[:resource]) << resource
     when :has_many
       @item.save
-      message = _("%{model} successfully created.", :model => @resource.model_name.human)
+      message = _t("%{model} successfully created.", :model => @resource.model_name.human)
       path = "#{params[:back_to]}?#{params[:selected]}=#{@item.id}"
     when :polymorphic
       resource.send(@item.class.to_resource).create(params[@object_name])
     end
 
-    flash[:notice] = message || _("%{model_a} successfully assigned to %{model_b}.",
+    flash[:notice] = message || _t("%{model_a} successfully assigned to %{model_b}.",
                                   :model_a => @item.class.model_name.human,
                                   :model_b => resource_class.model_name.human)
 

data/app/controllers/admin/session_controller.rb

@@ -16,7 +16,7 @@ class Admin::SessionController < Admin::BaseController
       session[:typus_user_id] = user.id
       path = params[:back_to] || admin_dashboard_path
     else
-      alert = _("The email and/or password you entered is invalid.")
+      alert = _t("The email and/or password you entered is invalid.")
       path = new_admin_session_path(:back_to => params[:back_to])
     end
 

data/app/helpers/admin/base_helper.rb

@@ -39,7 +39,7 @@ module Admin
                                      :action => 'edit',
                                      :id => user.id }
 
-      message = _("Are you sure you want to sign out and end your session?")
+      message = _t("Are you sure you want to sign out and end your session?")
 
       user_details = if user.can?('edit', Typus.user_class_name)
                        link_to user.name, admin_edit_typus_user_path

data/app/helpers/admin/filters_helper.rb

@@ -44,36 +44,36 @@ module Admin
       values_labelized = values.map { |v| v.to_label }
       items = values.map(&:id).to_hash_with(values_labelized)
 
-      message = _("View all %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase.pluralize)
+      message = _t("View all %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase.pluralize)
 
       return filter, items, message
     end
 
     def date_filter(request, filter)
       values  = %w(today last_few_days last_7_days last_30_days)
-      values_humanized = values.map { |v| _(v.humanize) }
+      values_humanized = values.map { |v| _t(v.humanize) }
       items   = values.to_hash_with(values_humanized)
-      message = _("Show all dates")
+      message = _t("Show all dates")
       return filter, items, message
     end
 
     def boolean_filter(request, filter)
       items   = @resource.typus_boolean(filter)
-      message = _("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase)
+      message = _t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase)
       return filter, items, message
     end
 
     def string_filter(request, filter)
       values  = @resource::const_get(filter.to_s.upcase)
       items   = values.kind_of?(Hash) ? values : values.to_hash_with(values)
-      message = _("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase)
+      message = _t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase)
       return filter, items, message
     end
 
     def remove_filter_link(filter = request.env['QUERY_STRING'])
       return unless filter && !filter.blank?
       message = params.compact.include?(:search) ? "search" : "filter"
-      link_to _("Remove #{message}")
+      link_to _t("Remove #{message}")
     end
 
   end

data/app/helpers/admin/relationships_helper.rb

@@ -91,7 +91,7 @@ module Admin
 
       return unless set_condition && @current_user.can?("create", @model_to_relate)
 
-      link_to _("Add new"), default_options.merge(options)
+      link_to _t("Add new"), default_options.merge(options)
     end
 
     def set_condition
@@ -138,7 +138,7 @@ module Admin
                            options,
                            association)
       else
-        message = _("There are no %{records}.",
+        message = _t("There are no %{records}.",
                     :records => model_to_relate.model_name.human.downcase)
         html << <<-HTML
   <div id="flash" class="notice"><p>#{message}</p></div>
@@ -164,11 +164,11 @@ module Admin
       related = @resource.reflect_on_association(attribute.to_sym).class_name.constantize
       related_fk = @resource.reflect_on_association(attribute.to_sym).primary_key_name
 
-      confirm = [ _("Are you sure you want to leave this page?"),
-                  _("If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost."),
-                  _("Click OK to continue, or click Cancel to stay on this page.") ]
+      confirm = [ _t("Are you sure you want to leave this page?"),
+                  _t("If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost."),
+                  _t("Click OK to continue, or click Cancel to stay on this page.") ]
 
-      message = link_to _("Add"), { :controller => "admin/#{related.to_resource}",
+      message = link_to _t("Add"), { :controller => "admin/#{related.to_resource}",
                                     :action => 'new',
                                     :back_to => back_to,
                                     :selected => related_fk },

data/app/helpers/admin/resources_helper.rb

@@ -43,7 +43,7 @@ module Admin
                 else
                   "You're adding a new %{resource_from}."
                 end
-      message = _(message,
+      message = _t(message,
                   :resource_from => options[:resource_from],
                   :resource_to => options[:resource_to])
 
@@ -62,7 +62,7 @@ module Admin
       options = { :controller => klass.to_resource }
       items = klass.typus_actions_on("index").map do |action|
         if @current_user.can?(action, klass)
-          (link_to _(action.humanize), options.merge(:action => action))
+          (link_to _t(action.humanize), options.merge(:action => action))
         end
       end
     end

data/app/helpers/admin/sidebar_helper.rb

@@ -21,11 +21,11 @@ module Admin
 
       if @current_user.can?("create", klass)
         options = { :controller => klass.to_resource }
-        message = _("Add new")
+        message = _t("Add new")
         actions << (link_to_unless_current message, options.merge(:action => "new"))
       end
 
-      message = _("List")
+      message = _t("List")
       options = { :controller => klass.to_resource }
       actions << (link_to_unless_current message, options)
 
@@ -36,7 +36,7 @@ module Admin
       options = { :controller => klass.to_resource }
       klass.typus_actions_on("index").map do |action|
         if @current_user.can?(action, klass)
-          (link_to_unless_current _(action.humanize), options.merge(:action => action))
+          (link_to_unless_current _t(action.humanize), options.merge(:action => action))
         end
       end
     end
@@ -45,7 +45,7 @@ module Admin
       return [] unless params[:action] == "index"
 
       klass.typus_export_formats.map do |format|
-        link_to _("Export as %{format}", :format => format.upcase), params.merge(:format => format)
+        link_to _t("Export as %{format}", :format => format.upcase), params.merge(:format => format)
       end
     end
 

data/app/helpers/admin/table_helper.rb

@@ -76,7 +76,7 @@ module Admin
                   :action => action,
                   :id => item.id }
 
-      link_to _(action.capitalize), options
+      link_to _t(action.capitalize), options
     end
 
     #--
@@ -100,7 +100,7 @@ module Admin
         options = { :action => 'unrelate', :id => params[:id], :resource => model, :resource_id => item.id }
       end
 
-      title = _(action.titleize)
+      title = _t(action.titleize)
 
       case params[:action]
       when 'index'
@@ -111,10 +111,10 @@ module Admin
                     else
                       @current_user.can?('destroy', model)
                     end
-        confirm = _("Remove %{resource}?", :resource => item.class.model_name.human)
+        confirm = _t("Remove %{resource}?", :resource => item.class.model_name.human)
       when 'edit'
         # If we are editing content, we can relate and unrelate always!
-        confirm = _("Unrelate %{unrelate_model} from %{unrelate_model_from}?",
+        confirm = _t("Unrelate %{unrelate_model} from %{unrelate_model_from}?",
                     :unrelate_model => model.model_name.human,
                     :unrelate_model_from => @resource.model_name.human)
       when 'show'
@@ -125,12 +125,12 @@ module Admin
         condition = if @resource.typus_user_id? && @current_user.is_not_root?
                       @item.owned_by?(@current_user)
                     end
-        confirm = _("Unrelate %{unrelate_model} from %{unrelate_model_from}?",
+        confirm = _t("Unrelate %{unrelate_model} from %{unrelate_model_from}?",
                     :unrelate_model => model.model_name.human,
                     :unrelate_model_from => @resource.model_name.human)
       end
 
-      message = %(<div class="sprite #{action}">#{_(action.titleize)}</div>)
+      message = %(<div class="sprite #{action}">#{_t(action.titleize)}</div>)
 
       if condition
         link_to raw(message), options, :title => title, :confirm => confirm, :method => method
@@ -203,7 +203,7 @@ module Admin
       { :move_higher => "Up", :move_lower => "Down" }.each do |key, value|
         options = { :controller => item.class.to_resource, :action => "position", :id => item.id, :go => key }
         first_or_last = (item.respond_to?(:first?) && (key == :move_higher && item.first?)) || (item.respond_to?(:last?) && (key == :move_lower && item.last?))
-        html_position << link_to_unless(first_or_last, _(value), params.merge(options)) do |name|
+        html_position << link_to_unless(first_or_last, _t(value), params.merge(options)) do |name|
           %(<span class="inactive">#{name}</span>)
         end
       end
@@ -226,12 +226,12 @@ module Admin
       content = if status.nil?
                   Typus::Resources.human_nil
                 else
-                  message = _(boolean_hash["#{status}".to_sym])
+                  message = _t(boolean_hash["#{status}".to_sym])
                   options = { :controller => "admin/#{item.class.to_resource}",
                               :action => "toggle",
                               :id => item.id,
                               :field => attribute.gsub(/\?$/,'') }
-                  confirm = _("Change %{attribute}?",
+                  confirm = _t("Change %{attribute}?",
                               :attribute => item.class.human_attribute_name(attribute).downcase)
                   link_to message, options, :confirm => confirm
                 end

data/app/mailers/admin/mailer.rb

@@ -7,7 +7,7 @@ class Admin::Mailer < ActionMailer::Base
     @url = url
 
     mail :to => user.email,
-         :subject => "[#{Typus.admin_title}] #{_("Reset password")}"
+         :subject => "[#{Typus.admin_title}] #{_t("Reset password")}"
   end
 
 end

data/app/views/admin/account/forgot_password.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = _("Forgot password")
+  page_title = _t("Forgot password")
   title(page_title)
 %>
 
@@ -13,7 +13,7 @@
     </li>
 
     <li>
-      <%= submit_tag _("Submit"), :class => "button" %> <%= link_to _("I remember my password"), new_admin_session_path %>
+      <%= submit_tag _t("Submit"), :class => "button" %> <%= link_to _t("I remember my password"), new_admin_session_path %>
     </li>
 
   </ul>

data/app/views/admin/account/new.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = _("Sign up")
+  page_title = _t("Sign up")
   title(page_title)
 %>
 
@@ -13,7 +13,7 @@
     </li>
 
     <li>
-      <%= submit_tag _("Sign up"), :class => "button" %>
+      <%= submit_tag _t("Sign up"), :class => "button" %>
     </li>
 
   </ul>

data/app/views/admin/dashboard/show.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = _("Dashboard")
+  page_title = _t("Dashboard")
   title(page_title)
 %>
 

data/app/views/admin/helpers/_apps.html.erb

@@ -1,6 +1,6 @@
 <ul>
-  <li><%= link_to _("Dashboard"), admin_dashboard_path %></li>
+  <li><%= link_to _t("Dashboard"), admin_dashboard_path %></li>
   <% Typus.applications.each do |app| %>
-    <li><%= link_to _(app), :controller => Typus.application(app).sort {|a,b| a.constantize.model_name.human <=> b.constantize.model_name.human}.first.tableize %></li>
+    <li><%= link_to _t(app), :controller => Typus.application(app).sort {|a,b| a.constantize.model_name.human <=> b.constantize.model_name.human}.first.tableize %></li>
   <% end %>
 </ul>

data/app/views/admin/helpers/_header.html.erb

@@ -1,6 +1,6 @@
 <h1 class="logo">
   <% if Rails.application.routes.routes.map(&:name).include?(:root) %>
-    <%= link_to Typus.admin_title, root_path, :title => _("View site") %>
+    <%= link_to Typus.admin_title, root_path, :title => _t("View site") %>
   <% else %>
     <%= Typus.admin_title %>
   <% end %>

data/app/views/admin/helpers/_login_info.html.erb

@@ -1,4 +1,4 @@
 <ul>
-  <li><%= _("Logged as") %> <%= user_details %></li>
-  <li><%= link_to _("Sign out"), admin_session_path, :confirm => message, :method => :delete %></li>
+  <li><%= _t("Logged as") %> <%= user_details %></li>
+  <li><%= link_to _t("Sign out"), admin_session_path, :confirm => message, :method => :delete %></li>
 </ul>

data/app/views/admin/helpers/dashboard/_applications.html.erb

@@ -4,7 +4,7 @@
 
     <thead>
       <tr>
-        <th colspan="2"><%= _(app) %></th>
+        <th colspan="2"><%= _t(app) %></th>
       </tr>
     </thead>
 
@@ -21,7 +21,7 @@
           <%= link_to klass_human_name, admin_items_path %>
         </td>
         <td class="right">
-          <%= link_to_if @current_user.can?("create", klass), _("Add"), admin_items_path.merge(:action => "new") %>
+          <%= link_to_if @current_user.can?("create", klass), _t("Add"), admin_items_path.merge(:action => "new") %>
         </td>
       </tr>
 

data/app/views/admin/helpers/dashboard/_resources.html.erb

@@ -2,13 +2,13 @@
 
   <thead>
     <tr>
-      <th colspan="2"><%= _("Resources") %></th>
+      <th colspan="2"><%= _t("Resources") %></th>
     </tr>
   </thead>
 
   <% resources.each do |resource| %>
     <tr class="<%= cycle("even", "odd") %>">
-    <td><%= link_to _(resource.titleize.capitalize), :controller => "admin/#{resource.underscore}" %></td>
+    <td><%= link_to _t(resource.titleize.capitalize), :controller => "admin/#{resource.underscore}" %></td>
     <td align="right" style="vertical-align: bottom;"></td>
     </tr>
   <% end %>

data/app/views/admin/helpers/filters/_filters.html.erb

@@ -21,7 +21,7 @@
     <%= hidden_field_tag :search, params[:search] %>
 
     <li>
-      <%= submit_tag _("Filter"), :name => nil %>
+      <%= submit_tag _t("Filter"), :name => nil %>
     </li>
 
     <% end %>

data/app/views/admin/helpers/resources/_display_link_to_previous.html.erb

@@ -1,3 +1,3 @@
 <div id="flash" class="notice">
-  <%= message %> <%= link_to _("Do you want to cancel it?"), params[:back_to] %>
+  <%= message %> <%= link_to _t("Do you want to cancel it?"), params[:back_to] %>
 </div>

data/app/views/admin/helpers/resources/_pagination.html.erb

@@ -1,8 +1,8 @@
 <div id="pagination">
 
   <%
-    previous_text = "&larr; " + _("Previous")
-    next_text = _("Next") + " &rarr;"
+    previous_text = "&larr; " + _t("Previous")
+    next_text = _t("Next") + " &rarr;"
   %>
 
   <div class="left">

data/app/views/admin/helpers/search/_search.html.erb

@@ -2,7 +2,7 @@
 
   <%= form_tag url_for(:controller => params[:controller]), :method => :get do %>
     <ul>
-      <li><input id="quicksearch" name="search" type="text" title="<%= params[:search] || _("Search") %>"/></li>
+      <li><input id="quicksearch" name="search" type="text" title="<%= params[:search] || _t("Search") %>"/></li>
     </ul>
     <% hidden_params.each do |field| %>
       <%= field %>

data/app/views/admin/helpers/sidebar/_sidebar.html.erb

@@ -3,7 +3,7 @@
   <% resource = "/admin/#{key.constantize.to_resource}" %>
 
   <%= link_to :controller => resource, :action => "index" do %>
-    <h3><%= _(key.constantize.model_name.human.pluralize) %></h3>
+    <h3><%= _t(key.constantize.model_name.human.pluralize) %></h3>
   <% end %>
 
   <% if @resource.name.eql?(key) %>

data/app/views/admin/mailer/reset_password_link.text.erb

@@ -1,6 +1,6 @@
 
-<%= _("You can update your password at") %>:
+<%= _t("You can update your password at") %>:
 
     <%= @url %>
 
-<%= _("If you didn't request a password update, you can ignore this message") %>
+<%= _t("If you didn't request a password update, you can ignore this message") %>

data/app/views/admin/resources/_form.html.erb

@@ -19,7 +19,7 @@
 
   <fieldset class="buttons">
     <ol>
-      <li><%= submit_tag button , :class => "commit" %> or <%= link_to _("Cancel and go back").downcase, :action => "index" %></li>
+      <li><%= submit_tag button , :class => "commit" %> or <%= link_to _t("Cancel and go back").downcase, :action => "index" %></li>
     </ol>
   </fieldset>
 

data/app/views/admin/resources/edit.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = _("Edit %{resource}", :resource => @resource.model_name.human)
+  page_title = _t("Edit %{resource}", :resource => @resource.model_name.human)
   title(page_title)
 %>
 
@@ -20,7 +20,7 @@
               :back_to => params[:back_to],
               :resource => params[:resource],
               :resource_id => params[:resource_id] }
-  button = _("Save %{resource}", :resource => @resource.model_name.human)
+  button = _t("Save %{resource}", :resource => @resource.model_name.human)
 %>
 
 <%= render form_partial, :options => options, :button => button %>

data/app/views/admin/resources/index.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = _("%{resources}", :resources => @resource.model_name.human.pluralize)
+  page_title = _t("%{resources}", :resources => @resource.model_name.human.pluralize)
   title(page_title)
 %>
 
@@ -26,12 +26,12 @@
 <% else %>
   <% if @resource.count.zero? %>
     <p>
-      <%= _("There are no %{records}.", :records => @resource.model_name.human.pluralize.downcase) %>
-      <%= link_to _("Create one now."), { :action => "new" } if @current_user.can?('create', @resource) %>
+      <%= _t("There are no %{records}.", :records => @resource.model_name.human.pluralize.downcase) %>
+      <%= link_to _t("Create one now."), { :action => "new" } if @current_user.can?('create', @resource) %>
     </p>
   <% else %>
     <div class="flash notice">
-      <%= _("There are no %{records} under this filter.", :records => @resource.model_name.human.pluralize.downcase) %>
+      <%= _t("There are no %{records} under this filter.", :records => @resource.model_name.human.pluralize.downcase) %>
     </div>
   <% end %>
 <% end %>

data/app/views/admin/resources/new.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = _("New %{resource}", :resource => @resource.model_name.human)
+  page_title = _t("New %{resource}", :resource => @resource.model_name.human)
   title(page_title)
 %>
 
@@ -18,7 +18,7 @@
               :selected => params[:selected],
               :resource => params[:resource],
               :resource_id => params[:resource_id] }
-  button = _("Create %{resource}", :resource => @resource.model_name.human)
+  button = _t("Create %{resource}", :resource => @resource.model_name.human)
 %>
 
 <%= render form_partial, :options => options, :button => button %>

data/app/views/admin/resources/show.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = _("Show %{resource}", :resource => @resource.model_name.human)
+  page_title = _t("Show %{resource}", :resource => @resource.model_name.human)
   title(page_title)
 %>
 

data/app/views/admin/session/new.html.erb

@@ -1,5 +1,5 @@
 <%
-  page_title = _("Sign in")
+  page_title = _t("Sign in")
   title(page_title)
 %>
 
@@ -18,7 +18,7 @@
     </li>
 
     <li>
-      <%= submit_tag _("Sign in"), :class => "button" %> <%= link_to _("Recover password"), forgot_password_admin_account_index_path if Typus.mailer_sender %>
+      <%= submit_tag _t("Sign in"), :class => "button" %> <%= link_to _t("Recover password"), forgot_password_admin_account_index_path if Typus.mailer_sender %>
     </li>
 
   </ul>

data/app/views/admin/templates/_file.html.erb

@@ -3,12 +3,12 @@
   # attachment = attribute.split('_file_name').first
 
   if !@item.class.validators.map { |i| i.class }.include?(ActiveModel::Validations::PresenceValidator) && @item.send(attribute).exists?
-    message = _("Remove %{attribute}", :attribute => @item.class.human_attribute_name(attribute).downcase)
+    message = _t("Remove %{attribute}", :attribute => @item.class.human_attribute_name(attribute).downcase)
     label_text << <<-HTML
  <small>#{link_to message, { :action => 'detach',
                              :id => @item,
                              :attachment => attribute },
-                             :confirm => _("Are you sure?")}</small>
+                             :confirm => _t("Are you sure?")}</small>
     HTML
   end
 

data/app/views/admin/templates/_has_many.html.erb

@@ -4,7 +4,7 @@
   <h2>
     <%= link_to model_to_relate.model_name.human.pluralize,
                 { :controller => "admin/#{model_to_relate_as_resource}", foreign_key => @item.id },
-                :title => _("%{model} filtered by %{filtered_by}",
+                :title => _t("%{model} filtered by %{filtered_by}",
                             :model => model_to_relate.model_name.human.pluralize,
                             :filtered_by => @item.to_label) %>
     <%= add_new %>
@@ -17,7 +17,7 @@
     <%= pagination(:anchor => model_to_relate.to_resource) %>
   <% else %>
     <div id="flash" class="notice">
-      <p><%= _("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
+      <p><%= _t("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
     </div>
   <% end %>
 

data/app/views/admin/templates/_has_n.html.erb

@@ -11,7 +11,7 @@
     <%= table %>
     <%= pagination(:anchor => model_to_relate.to_resource) %>
   <% else %>
-    <p><%= _("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
+    <p><%= _t("There are no %{records}.", :records => model_to_relate.model_name.human.pluralize.downcase) %></p>
   <% end %>
 
 </div>

data/app/views/admin/templates/_relate_form.html.erb

@@ -1,4 +1,4 @@
 <%= form_tag :action => :relate, :id => @item.id do %>
   <%= hidden_field :related, :model, :value => model_to_relate %>
-  <p><%= select :related, :id, items_to_relate.collect { |f| [f.to_label, f.id] }.sort_by { |e| e.first } %> &nbsp; <%= submit_tag _("Add"), :class => "button" %></p>
+  <p><%= select :related, :id, items_to_relate.collect { |f| [f.to_label, f.id] }.sort_by { |e| e.first } %> &nbsp; <%= submit_tag _t("Add"), :class => "button" %></p>
 <% end %>

data/app/views/admin/templates/_string.html.erb

@@ -3,13 +3,13 @@
   # Read only fields.
   if @resource.typus_field_options_for(:read_only).to_s.include?(attribute)
     custom = { :readonly => 'readonly' }
-    label_text << " <small>#{_("Read only")}</small>"
+    label_text << " <small>#{_t("Read only")}</small>"
   end
 
   # Auto generated fields.
   if @resource.typus_field_options_for(:auto_generated).include?(attribute)
     custom = { :auto_generated => true }
-    label_text << " <small>#{_("Auto generated")}</small>"
+    label_text << " <small>#{_t("Auto generated")}</small>"
   end
 
   options.merge!(custom) if custom

data/lib/support/object.rb

@@ -6,13 +6,13 @@ class Object
   #
   # We define this method to define the value only once:
   #
-  #     _("Hello World!")
+  #     _t("Hello World!")
   #
   # Note that interpolation still works ...
   #
-  #     _("Hello %{world}!", :world => @world)
+  #     _t("Hello %{world}!", :world => @world)
   #
-  def _(msg, *args)
+  def _t(msg, *args)
     options = args.extract_options!
     options[:default] = msg
     I18n.t(msg, options)

data/lib/typus/authentication.rb

@@ -49,12 +49,12 @@ module Typus
       @current_user = Typus.user_class.find(session[:typus_user_id])
 
       unless Typus::Configuration.roles.has_key?(@current_user.role)
-        raise _("Role does no longer exists.")
+        raise _t("Role does no longer exists.")
       end
 
       unless @current_user.status
         back_to = (request.env['REQUEST_URI'] == admin_dashboard_path) ? nil : request.env['REQUEST_URI']
-        raise _("Typus user has been disabled.")
+        raise _t("Typus user has been disabled.")
       end
 
       I18n.locale = @current_user.preferences[:locale]
@@ -81,32 +81,32 @@ module Typus
 
                   # Only admin and owner of Typus User can edit.
                   if @current_user.is_not_root? && !current_user
-                    _("As you're not the admin or the owner of this record you cannot edit it.")
+                    _t("As you're not the admin or the owner of this record you cannot edit it.")
                   end
 
                 when 'update'
 
                   # current_user cannot change her role.
                   if current_user && !(@item.role == params[@object_name][:role])
-                    _("You can't change your role.")
+                    _t("You can't change your role.")
                   end
 
                 when 'toggle'
 
                   # Only admin can toggle typus user status, but not herself.
                   if @current_user.is_root? && current_user
-                    _("You can't toggle your status.")
+                    _t("You can't toggle your status.")
                   elsif @current_user.is_not_root?
-                    _("You're not allowed to toggle status.")
+                    _t("You're not allowed to toggle status.")
                   end
 
                 when 'destroy'
 
                   # Admin can remove anything except herself.
                   if @current_user.is_root? && current_user
-                    _("You can't remove yourself.")
+                    _t("You can't remove yourself.")
                   elsif @current_user.is_not_root?
-                    _("You're not allowed to remove Typus Users.")
+                    _t("You're not allowed to remove Typus Users.")
                   end
 
                 end
@@ -135,7 +135,7 @@ module Typus
                   "%{current_user_role} can't perform action. (%{action})"
                 end
 
-      message = _(message,
+      message = _t(message,
                   :current_user_role => @current_user.role.capitalize,
                   :action => params[:action])
 
@@ -179,7 +179,7 @@ module Typus
       condition_typus_user_id = @item.respond_to?(Typus.user_fk) && !@item.owned_by?(@current_user)
 
       if condition_typus_users || condition_typus_user_id
-         alert = _("You don't have permission to access this item.")
+         alert = _t("You don't have permission to access this item.")
          redirect_to set_path, :alert => alert
       end
 

data/lib/typus/version.rb

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "1.0.0.pre5"
+  VERSION = "1.0.0.pre6"
 end

data/test/fixtures/rails_app/app/views/admin/mailer/reset_password_link.text.erb

@@ -1,6 +1,6 @@
 
-<%= _("You can update your password at") %>:
+<%= _t("You can update your password at") %>:
 
     <%= @url %>
 
-<%= _("If you didn't request a password update, you can ignore this message") %>
+<%= _t("If you didn't request a password update, you can ignore this message") %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: typus
 version: !ruby/object:Gem::Version 
-  hash: -1876988180
+  hash: -1876988179
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - pre5
-  version: 1.0.0.pre5
+  - pre6
+  version: 1.0.0.pre6
 platform: ruby
 authors: 
 - Francesc Esplugas
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 +02:00
+date: 2010-09-15 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -270,7 +270,6 @@ files:
 - test/fixtures/rails_app/config/typus/typus_roles.yml
 - test/fixtures/rails_app/config.ru
 - test/fixtures/rails_app/db/seeds.rb
-- test/fixtures/rails_app/db/test.sqlite3
 - test/fixtures/rails_app/public/404.html
 - test/fixtures/rails_app/public/422.html
 - test/fixtures/rails_app/public/500.html
@@ -287,37 +286,6 @@ files:
 - test/fixtures/rails_app/Rakefile
 - test/fixtures/rails_app/README
 - test/fixtures/rails_app/script/rails
-- test/fixtures/rails_app/tmp/export-posts-20100913124503.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913124524.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913124638.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913124717.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913125425.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913125626.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913125651.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913125741.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913125827.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913125856.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913125928.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913130119.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913130159.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913130319.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913130339.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913131400.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913131915.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913132022.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913132844.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913171700.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913172044.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913172118.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913174300.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913174322.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913174959.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913175019.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913175116.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913175204.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913175228.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913175254.csv
-- test/fixtures/rails_app/tmp/export-posts-20100913180324.csv
 - test/functional/admin/account_controller_test.rb
 - test/functional/admin/dashboard_controller_http_basic_test.rb
 - test/functional/admin/dashboard_controller_none_test.rb
@@ -360,9 +328,6 @@ files:
 - test/unit/admin/mailer_test.rb
 - test/unit/typus_user_roles_test.rb
 - test/unit/typus_user_test.rb
-- typus-1.0.0.pre2.gem
-- typus-1.0.0.pre3.gem
-- typus-1.0.0.pre4.gem
 - typus-1.0.0.pre5.gem
 - typus.gemspec
 has_rdoc: true

data/test/fixtures/rails_app/tmp/export-posts-20100913124503.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913124524.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913124638.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913124717.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125425.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125626.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125651.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125741.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125827.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125856.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913125928.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913130119.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913130159.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913130319.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913130339.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913131400.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913131915.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913132022.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913132844.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913171700.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913172044.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913172118.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913174300.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913174322.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913174959.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913175019.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913175116.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913175204.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913175228.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913175254.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published

data/test/fixtures/rails_app/tmp/export-posts-20100913180324.csv

@@ -1,2 +0,0 @@
-title;status
-Post;published