Download as
Browse Code »

Commit 2b7b639fabf732e51dfdf11ba7a65c8ed7780d9f

Authored by AntonioTerceiro
1 parent 48468ffa
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem114: still replacing s/favorite/favourite/ 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@845 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 33 additions and 33 deletions   Show diff stats
app/design_blocks/favourite_links/controllers/favorite_links_controller.rb
  Diff comments   View file @2b7b639
1   -class FavoriteLinksController < ApplicationController
  1 +class FavouriteLinksController < ApplicationController
2 2  
3 3  
4 4 # The methods above are specific for noosfero application. I think
... ... @@ -24,7 +24,7 @@ class FavoriteLinksController &lt; ApplicationController
24 24 }
25 25  
26 26 def index
27   - get_favorite_links
  27 + get_favourite_links
28 28 design_render
29 29 end
30 30  
... ... @@ -34,7 +34,7 @@ class FavoriteLinksController &lt; ApplicationController
34 34  
35 35 def save
36 36 if @design_block.update_attributes(params[:design_block])
37   - get_favorite_links
  37 + get_favourite_links
38 38 design_render_on_edit :action => 'manage_links'
39 39 else
40 40 design_render_on_edit :nothing => true
... ... @@ -42,7 +42,7 @@ class FavoriteLinksController &lt; ApplicationController
42 42 end
43 43  
44 44 def manage_links
45   - get_favorite_links
  45 + get_favourite_links
46 46 design_render_on_edit
47 47 end
48 48  
... ... @@ -52,13 +52,13 @@ class FavoriteLinksController &lt; ApplicationController
52 52  
53 53 def remove_link
54 54 @design_block.delete_link(params[:link])
55   - get_favorite_links
  55 + get_favourite_links
56 56 design_render_on_edit :action => 'manage_links'
57 57 end
58 58  
59   - def get_favorite_links
60   - favorite_links = @design_block.favorite_links
61   - @favorite_links_pages, @favorite_links = paginate_by_collection favorite_links
  59 + def get_favourite_links
  60 + favourite_links = @design_block.favourite_links
  61 + @favourite_links_pages, @favourite_links = paginate_by_collection favourite_links
62 62 end
63 63  
64 64 def paginate_by_collection(collection, options = {})
... ...
app/design_blocks/favourite_links/models/favorite_links.rb
  Diff comments   View file @2b7b639
1   -class FavoriteLinks < Design::Block
  1 +class FavouriteLinks < Design::Block
2 2  
3 3 def self.description
4   - _('Favorite Links')
  4 + _('Favourite Links')
5 5 end
6 6  
7 7 def limit_number= value
... ... @@ -12,26 +12,26 @@ class FavoriteLinks &lt; Design::Block
12 12 self.settings[:limit_number] || 5
13 13 end
14 14  
15   - def favorite_links_limited
16   - self.favorite_links.first(self.limit_number)
  15 + def favourite_links_limited
  16 + self.favourite_links.first(self.limit_number)
17 17 end
18 18  
19   - def favorite_links
20   - self.settings[:favorite_links] ||= []
  19 + def favourite_links
  20 + self.settings[:favourite_links] ||= []
21 21 end
22 22  
23 23 def delete_link link
24   - self.settings[:favorite_links].reject!{ |item| item == link }
  24 + self.settings[:favourite_links].reject!{ |item| item == link }
25 25 self.save
26 26 end
27 27  
28   - def favorite_link
  28 + def favourite_link
29 29 nil
30 30 end
31 31  
32   - def favorite_link= link
33   - self.favorite_links.push(link)
34   - self.favorite_links.uniq!
  32 + def favourite_link= link
  33 + self.favourite_links.push(link)
  34 + self.favourite_links.uniq!
35 35 end
36 36  
37 37 end
... ...
app/design_blocks/favourite_links/views/add_link.rhtml
  Diff comments   View file @2b7b639
1   -<h2> <%= _('Editing Favorite Links') %> </h2>
  1 +<h2> <%= _('Editing Favourite Links') %> </h2>
2 2  
3 3 <% design_form_remote_tag( :url => {:action => 'save'}) do %>
4 4  
5 5 <p>
6 6 <label for="design_block_title"> <%= _("Title") %> </label>
7   - <%= text_field 'design_block', 'favorite_link'%>
  7 + <%= text_field 'design_block', 'favourite_link'%>
8 8 </p>
9 9  
10 10 <%= submit_tag _('Save') %>
... ...
app/design_blocks/favourite_links/views/edit.rhtml
  Diff comments   View file @2b7b639
1 1  
2   -<h2> <%= _('Editing Favorite Links') %> </h2>
  2 +<h2> <%= _('Editing Favourite Links') %> </h2>
3 3  
4 4 <% design_form_remote_tag( :url => {:action => 'save'}) do %>
5 5  
... ...
app/design_blocks/favourite_links/views/index.rhtml
  Diff comments   View file @2b7b639
1 1  
2   -<% if @favorite_links_pages.current.previous%>
3   - <%= design_link_to_remote(_('Previous'), :url => {:action => 'index', :page => @favorite_links_pages.current.previous}) %>
  2 +<% if @favourite_links_pages.current.previous%>
  3 + <%= design_link_to_remote(_('Previous'), :url => {:action => 'index', :page => @favourite_links_pages.current.previous}) %>
4 4 <% end %>
5   -<% if @favorite_links_pages.current.next %>
6   - <%= design_link_to_remote(_('Next'), :url => {:action => 'index', :page => @favorite_links_pages.current.next}) %>
  5 +<% if @favourite_links_pages.current.next %>
  6 + <%= design_link_to_remote(_('Next'), :url => {:action => 'index', :page => @favourite_links_pages.current.next}) %>
7 7 <% end %>
8 8  
9   -<% @favorite_links.each do |link| %>
  9 +<% @favourite_links.each do |link| %>
10 10 <ul>
11 11 <li>
12 12 <%= link_to link, link, :popup => true %>
... ...
app/design_blocks/favourite_links/views/manage_links.rhtml
  Diff comments   View file @2b7b639
1 1  
2 2 <h2>
3   - <%= _('Favorite Links') %>
  3 + <%= _('Favourite Links') %>
4 4 <%= design_link_to_remote(_('Add Link'), :url => {:action => 'add_link'} )%>
5 5  
6 6 </h2>
7   -<% if @favorite_links_pages.current.previous%>
8   - <%= design_link_to_remote(_('Previous'), :url => {:action => 'manage_links', :page => @favorite_links_pages.current.previous}) %>
  7 +<% if @favourite_links_pages.current.previous%>
  8 + <%= design_link_to_remote(_('Previous'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.previous}) %>
9 9 <% end %>
10   -<% if @favorite_links_pages.current.next %>
11   - <%= design_link_to_remote(_('Next'), :url => {:action => 'manage_links', :page => @favorite_links_pages.current.next}) %>
  10 +<% if @favourite_links_pages.current.next %>
  11 + <%= design_link_to_remote(_('Next'), :url => {:action => 'manage_links', :page => @favourite_links_pages.current.next}) %>
12 12 <% end %>
13 13  
14   -<% @favorite_links.each do |link| %>
  14 +<% @favourite_links.each do |link| %>
15 15 <ul>
16 16 <li>
17 17 <%= link_to link, link, :popup => true %>
... ...