From 73bb8bbfa4755f10563c0548639482f37b6821d3 Mon Sep 17 00:00:00 2001
From: Iain Hecker <github@iain.nl>
Date: Tue, 26 Aug 2008 01:42:30 +0200
Subject: [PATCH] Scaffold using I18n

---
 .../components/scaffold/templates/controller.rb    |    4 ++--
 .../scaffold/templates/view_edit.html.erb          |    8 ++++----
 .../scaffold/templates/view_index.html.erb         |   12 ++++++------
 .../scaffold/templates/view_new.html.erb           |    6 +++---
 .../scaffold/templates/view_show.html.erb          |    4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb b/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb
index cbfd88f..8c83a75 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb
@@ -44,7 +44,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= file_name %>.save
-        flash[:notice] = '<%= class_name %> was successfully created.'
+        flash[:notice] = I18n.t(:created_success, :default => '{{model}} was successfully created.', :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold])
         format.html { redirect_to(@<%= file_name %>) }
         format.xml  { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
       else
@@ -61,7 +61,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= file_name %>.update_attributes(params[:<%= file_name %>])
-        flash[:notice] = '<%= class_name %> was successfully updated.'
+        flash[:notice] = I18n.t(:updated_success, :default => '{{model}} was successfully updated.', :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold])
         format.html { redirect_to(@<%= file_name %>) }
         format.xml  { head :ok }
       else
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
index e289975..449114c 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
@@ -1,4 +1,4 @@
-<h1>Editing <%= singular_name %></h1>
+<h1><%% t(:editing, :default => "Editing {{model}}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
 
 <%% form_for(@<%= singular_name %>) do |f| %>
   <%%= f.error_messages %>
@@ -10,9 +10,9 @@
   </p>
 <% end -%>
   <p>
-    <%%= f.submit "Update" %>
+    <%%= f.submit t(:update, :default => "Update", :scope => [:railties, :scaffold]) %>
   </p>
 <%% end %>
 
-<%%= link_to 'Show', @<%= singular_name %> %> |
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to t(:show, :default => 'Show', :scope => [:railties, :scaffold]), @<%= singular_name %> %> |
+<%%= link_to t(:back, :default => 'Back', :scope => [:railties, :scaffold]), <%= plural_name %>_path %>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
index e89757e..7b5c94c 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
@@ -1,9 +1,9 @@
-<h1>Listing <%= plural_name %></h1>
+<h1><%%= t(:listing, :default => "Listing {{model}}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
 
 <table>
   <tr>
 <% for attribute in attributes -%>
-    <th><%= attribute.column.human_name %></th>
+    <th><%%= <%= class_name %>.human_attribute_name('<%= attribute.column.name %>') %></th>
 <% end -%>
   </tr>
 
@@ -12,13 +12,13 @@
 <% for attribute in attributes -%>
     <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
 <% end -%>
-    <td><%%= link_to 'Show', <%= singular_name %> %></td>
-    <td><%%= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
-    <td><%%= link_to 'Destroy', <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%%= link_to t(:show, :default => 'Show', :scope => [:railties, :scaffold]), <%= singular_name %> %></td>
+    <td><%%= link_to t(:edit, :default => 'Edit', :scope => [:railties, :scaffold]), edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
+    <td><%%= link_to t(:destroy, :default => 'Destroy', :scope => [:railties, :scaffold]), <%= singular_name %>, :confirm => t(:confirmation, :default => 'Are you sure?', :scope => [:railties, :scaffold]), :method => :delete %></td>
   </tr>
 <%% end %>
 </table>
 
 <br />
 
-<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %>
+<%%= link_to t(:new, :default => "New {{model}}", :model => <%= class_name %>.human_name, :scope => [:railtes, :scaffold]), new_<%= singular_name %>_path %>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
index c47e811..d248503 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
@@ -1,4 +1,4 @@
-<h1>New <%= singular_name %></h1>
+<h1><%%= t(:new, :default => "New {{model}}", :model => <%= class_name %>.human_name, :scope => [:railtes, :scaffold]) %></h1>
 
 <%% form_for(@<%= singular_name %>) do |f| %>
   <%%= f.error_messages %>
@@ -10,8 +10,8 @@
   </p>
 <% end -%>
   <p>
-    <%%= f.submit "Create" %>
+    <%%= f.submit t(:create, :default => "Create", :scope => [:railties, :scaffold]) %>
   </p>
 <%% end %>
 
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to t(:back, :default => 'Back', :scope => [:railties, :scaffold]), <%= plural_name %>_path %>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
index 9b6b11b..dce37c8 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
@@ -6,5 +6,5 @@
 
 <% end -%>
 
-<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to t(:edit, :default => 'Edit', :scope => [:railties, :scaffold]), edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
+<%%= link_to t(:edit, :default => 'Back', :scope => [:railties, :scaffold]), <%= plural_name %>_path %>
-- 
1.5.4.3


From 73c3a46f0f04c5254fa200db83e2c33b66e5e70d Mon Sep 17 00:00:00 2001
From: Iain Hecker <github@iain.nl>
Date: Tue, 26 Aug 2008 08:27:39 +0200
Subject: [PATCH] improved translations in scaffold

---
 .../scaffold/templates/view_edit.html.erb          |    8 ++++----
 .../scaffold/templates/view_index.html.erb         |   10 +++++-----
 .../scaffold/templates/view_new.html.erb           |    6 +++---
 .../scaffold/templates/view_show.html.erb          |    6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
index 449114c..d1619aa 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
@@ -1,4 +1,4 @@
-<h1><%% t(:editing, :default => "Editing {{model}}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
+<h1><%% translate(:editing, :default => "Editing {{model}}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
 
 <%% form_for(@<%= singular_name %>) do |f| %>
   <%%= f.error_messages %>
@@ -10,9 +10,9 @@
   </p>
 <% end -%>
   <p>
-    <%%= f.submit t(:update, :default => "Update", :scope => [:railties, :scaffold]) %>
+    <%%= f.submit translate(:update, :default => "Update", :scope => [:railties, :scaffold]) %>
   </p>
 <%% end %>
 
-<%%= link_to t(:show, :default => 'Show', :scope => [:railties, :scaffold]), @<%= singular_name %> %> |
-<%%= link_to t(:back, :default => 'Back', :scope => [:railties, :scaffold]), <%= plural_name %>_path %>
+<%%= link_to translate(:show, :default => 'Show', :scope => [:railties, :scaffold]), @<%= singular_name %> %> |
+<%%= link_to translate(:back, :default => 'Back', :scope => [:railties, :scaffold]), <%= plural_name %>_path %>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
index 7b5c94c..a20e64a 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
@@ -1,4 +1,4 @@
-<h1><%%= t(:listing, :default => "Listing {{model}}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
+<h1><%%= translate(:listing, :default => "Listing {{model}}", :model => <%= class_name %>.human_name(:count => @<%= plural_name %>.size), :count => @<%= plural_name %>.size, :scope => [:railties, :scaffold]) %></h1>
 
 <table>
   <tr>
@@ -12,13 +12,13 @@
 <% for attribute in attributes -%>
     <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
 <% end -%>
-    <td><%%= link_to t(:show, :default => 'Show', :scope => [:railties, :scaffold]), <%= singular_name %> %></td>
-    <td><%%= link_to t(:edit, :default => 'Edit', :scope => [:railties, :scaffold]), edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
-    <td><%%= link_to t(:destroy, :default => 'Destroy', :scope => [:railties, :scaffold]), <%= singular_name %>, :confirm => t(:confirmation, :default => 'Are you sure?', :scope => [:railties, :scaffold]), :method => :delete %></td>
+    <td><%%= link_to translate(:show, :default => 'Show', :scope => [:railties, :scaffold]), <%= singular_name %> %></td>
+    <td><%%= link_to translate(:edit, :default => 'Edit', :scope => [:railties, :scaffold]), edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
+    <td><%%= link_to translate(:destroy, :default => 'Destroy', :scope => [:railties, :scaffold]), <%= singular_name %>, :confirm => translate(:confirmation, :default => 'Are you sure?', :scope => [:railties, :scaffold]), :method => :delete %></td>
   </tr>
 <%% end %>
 </table>
 
 <br />
 
-<%%= link_to t(:new, :default => "New {{model}}", :model => <%= class_name %>.human_name, :scope => [:railtes, :scaffold]), new_<%= singular_name %>_path %>
+<%%= link_to translate(:new, :default => "New {{model}}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]), new_<%= singular_name %>_path %>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
index d248503..d1326bb 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
@@ -1,4 +1,4 @@
-<h1><%%= t(:new, :default => "New {{model}}", :model => <%= class_name %>.human_name, :scope => [:railtes, :scaffold]) %></h1>
+<h1><%%= translate(:new, :default => "New {{model}}", :model => <%= class_name %>.human_name, :scope => [:railties, :scaffold]) %></h1>
 
 <%% form_for(@<%= singular_name %>) do |f| %>
   <%%= f.error_messages %>
@@ -10,8 +10,8 @@
   </p>
 <% end -%>
   <p>
-    <%%= f.submit t(:create, :default => "Create", :scope => [:railties, :scaffold]) %>
+    <%%= f.submit translate(:create, :default => "Create", :scope => [:railties, :scaffold]) %>
   </p>
 <%% end %>
 
-<%%= link_to t(:back, :default => 'Back', :scope => [:railties, :scaffold]), <%= plural_name %>_path %>
+<%%= link_to translate(:back, :default => 'Back', :scope => [:railties, :scaffold]), <%= plural_name %>_path %>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
index dce37c8..cb12079 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
@@ -1,10 +1,10 @@
 <% for attribute in attributes -%>
 <p>
-  <b><%= attribute.column.human_name %>:</b>
+  <b><%%= <%= class_name %>.human_attribute_name('<%= attribute.column.name %>') %>:</b>
   <%%=h @<%= singular_name %>.<%= attribute.name %> %>
 </p>
 
 <% end -%>
 
-<%%= link_to t(:edit, :default => 'Edit', :scope => [:railties, :scaffold]), edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
-<%%= link_to t(:edit, :default => 'Back', :scope => [:railties, :scaffold]), <%= plural_name %>_path %>
+<%%= link_to translate(:edit, :default => 'Edit', :scope => [:railties, :scaffold]), edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
+<%%= link_to translate(:back, :default => 'Back', :scope => [:railties, :scaffold]), <%= plural_name %>_path %>
-- 
1.5.4.3