From 2b7b639fabf732e51dfdf11ba7a65c8ed7780d9f Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Mon, 5 Nov 2007 18:23:31 +0000
Subject: [PATCH] ActionItem114: still replacing s/favorite/favourite/

---
 app/design_blocks/favourite_links/controllers/favorite_links_controller.rb | 16 ++++++++--------
 app/design_blocks/favourite_links/models/favorite_links.rb                 | 22 +++++++++++-----------
 app/design_blocks/favourite_links/views/add_link.rhtml                     |  4 ++--
 app/design_blocks/favourite_links/views/edit.rhtml                         |  2 +-
 app/design_blocks/favourite_links/views/index.rhtml                        | 10 +++++-----
 app/design_blocks/favourite_links/views/manage_links.rhtml                 | 12 ++++++------
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/app/design_blocks/favourite_links/controllers/favorite_links_controller.rb b/app/design_blocks/favourite_links/controllers/favorite_links_controller.rb
index 5bfa74f..ed15add 100644
--- a/app/design_blocks/favourite_links/controllers/favorite_links_controller.rb
+++ b/app/design_blocks/favourite_links/controllers/favorite_links_controller.rb
@@ -1,4 +1,4 @@
-class FavoriteLinksController < ApplicationController
+class FavouriteLinksController < ApplicationController
 
 
   # The methods above are specific for noosfero application. I think 
@@ -24,7 +24,7 @@ class FavoriteLinksController < ApplicationController
   }
 
   def index
-    get_favorite_links
+    get_favourite_links
     design_render
   end
 
@@ -34,7 +34,7 @@ class FavoriteLinksController < ApplicationController
 
   def save
     if @design_block.update_attributes(params[:design_block])
-      get_favorite_links
+      get_favourite_links
       design_render_on_edit :action => 'manage_links'
     else
       design_render_on_edit :nothing => true
@@ -42,7 +42,7 @@ class FavoriteLinksController < ApplicationController
   end
 
   def manage_links
-    get_favorite_links
+    get_favourite_links
     design_render_on_edit
   end
 
@@ -52,13 +52,13 @@ class FavoriteLinksController < ApplicationController
 
   def remove_link
     @design_block.delete_link(params[:link])
-    get_favorite_links
+    get_favourite_links
     design_render_on_edit :action => 'manage_links'
   end
 
-  def get_favorite_links
-    favorite_links = @design_block.favorite_links
-    @favorite_links_pages, @favorite_links = paginate_by_collection favorite_links
+  def get_favourite_links
+    favourite_links = @design_block.favourite_links
+    @favourite_links_pages, @favourite_links = paginate_by_collection favourite_links
   end
 
   def paginate_by_collection(collection, options = {})
diff --git a/app/design_blocks/favourite_links/models/favorite_links.rb b/app/design_blocks/favourite_links/models/favorite_links.rb
index dcfcc9c..c277b38 100644
--- a/app/design_blocks/favourite_links/models/favorite_links.rb
+++ b/app/design_blocks/favourite_links/models/favorite_links.rb
@@ -1,7 +1,7 @@
-class FavoriteLinks < Design::Block
+class FavouriteLinks < Design::Block
 
   def self.description
-    _('Favorite Links')
+    _('Favourite Links')
   end
 
   def limit_number= value
@@ -12,26 +12,26 @@ class FavoriteLinks < Design::Block
     self.settings[:limit_number] || 5
   end
 
-  def favorite_links_limited
-    self.favorite_links.first(self.limit_number)
+  def favourite_links_limited
+    self.favourite_links.first(self.limit_number)
   end
 
-  def favorite_links
-    self.settings[:favorite_links] ||= []
+  def favourite_links
+    self.settings[:favourite_links] ||= []
   end
 
   def delete_link link
-    self.settings[:favorite_links].reject!{ |item| item == link }
+    self.settings[:favourite_links].reject!{ |item| item == link }
     self.save
   end
 
-  def favorite_link
+  def favourite_link
     nil
   end
 
-  def favorite_link= link
-    self.favorite_links.push(link)
-    self.favorite_links.uniq!
+  def favourite_link= link
+    self.favourite_links.push(link)
+    self.favourite_links.uniq!
   end
 
 end
diff --git a/app/design_blocks/favourite_links/views/add_link.rhtml b/app/design_blocks/favourite_links/views/add_link.rhtml
index dce29c9..c1f62a0 100644
--- a/app/design_blocks/favourite_links/views/add_link.rhtml
+++ b/app/design_blocks/favourite_links/views/add_link.rhtml
@@ -1,10 +1,10 @@
-<h2> <%= _('Editing Favorite Links') %> </h2>
+<h2> <%= _('Editing Favourite Links') %> </h2>
 
 <% design_form_remote_tag( :url => {:action => 'save'}) do %>
 
   <p>
     <label for="design_block_title"> <%= _("Title") %> </label>
-    <%= text_field 'design_block', 'favorite_link'%>
+    <%= text_field 'design_block', 'favourite_link'%>
   </p>
 
   <%= submit_tag _('Save') %>
diff --git a/app/design_blocks/favourite_links/views/edit.rhtml b/app/design_blocks/favourite_links/views/edit.rhtml
index e2e9c97..7568086 100644
--- a/app/design_blocks/favourite_links/views/edit.rhtml
+++ b/app/design_blocks/favourite_links/views/edit.rhtml
@@ -1,5 +1,5 @@
 
-<h2> <%= _('Editing Favorite Links') %> </h2>
+<h2> <%= _('Editing Favourite Links') %> </h2>
 
  <% design_form_remote_tag( :url => {:action => 'save'}) do %>
 
diff --git a/app/design_blocks/favourite_links/views/index.rhtml b/app/design_blocks/favourite_links/views/index.rhtml
index e0e50c2..cf003c5 100644
--- a/app/design_blocks/favourite_links/views/index.rhtml
+++ b/app/design_blocks/favourite_links/views/index.rhtml
@@ -1,12 +1,12 @@
 
-<% if @favorite_links_pages.current.previous%>
-  <%= design_link_to_remote(_('Previous'), :url => {:action => 'index', :page => @favorite_links_pages.current.previous}) %>
+<% if @favourite_links_pages.current.previous%>
+  <%= design_link_to_remote(_('Previous'), :url => {:action => 'index', :page => @favourite_links_pages.current.previous}) %>
 <% end %>
-<% if @favorite_links_pages.current.next %>
-  <%= design_link_to_remote(_('Next'), :url => {:action => 'index', :page => @favorite_links_pages.current.next}) %>
+<% if @favourite_links_pages.current.next %>
+  <%= design_link_to_remote(_('Next'), :url => {:action => 'index', :page => @favourite_links_pages.current.next}) %>
 <% end %>
 
-<% @favorite_links.each do |link| %>
+<% @favourite_links.each do |link| %>
   <ul>
     <li>
       <%= link_to link, link, :popup => true %>
diff --git a/app/design_blocks/favourite_links/views/manage_links.rhtml b/app/design_blocks/favourite_links/views/manage_links.rhtml
index 6e5a10b..a5e2a22 100644
--- a/app/design_blocks/favourite_links/views/manage_links.rhtml
+++ b/app/design_blocks/favourite_links/views/manage_links.rhtml
@@ -1,17 +1,17 @@
 
 <h2> 
-  <%= _('Favorite Links') %> 
+  <%= _('Favourite Links') %> 
   <%= design_link_to_remote(_('Add Link'), :url => {:action => 'add_link'} )%>
 
 </h2>
-<% if @favorite_links_pages.current.previous%>
-  <%= design_link_to_remote(_('Previous'), :url => {:action => 'manage_links', :page => @favorite_links_pages.current.previous}) %>
+<% if @favourite_links_pages.current.previous%>
+  <%= design_link_to_remote(_('Previous'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.previous}) %>
 <% end %>
-<% if @favorite_links_pages.current.next %>
-  <%= design_link_to_remote(_('Next'), :url => {:action => 'manage_links', :page => @favorite_links_pages.current.next}) %>
+<% if @favourite_links_pages.current.next %>
+  <%= design_link_to_remote(_('Next'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.next}) %>
 <% end %>
 
-<% @favorite_links.each do |link| %>
+<% @favourite_links.each do |link| %>
   <ul>
     <li> 
       <%= link_to link, link, :popup => true %> 
--
libgit2 0.21.2