<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>vendor/plugins/polyglot/languages/es.yml</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -22,9 +22,9 @@ class ArticlesController &lt; ApplicationController
                  :only =&gt; [:new, :edit])
   
   def index
-    @articles       = @user.articles.find(:all, :order =&gt; 'created_at DESC') 
+    @articles = @user.articles.all_articles(params[:page])
     if admin?
-      @all_articles = Article.find(:all, :conditions =&gt; [&quot;user_id &lt;&gt; ?&quot;, @user.id], :order =&gt; 'created_at DESC')
+      @all_articles_from_others = Article.all_articles_from_others(params[:page], @user.id)
     end
   end
   </diff>
      <filename>app/controllers/articles_controller.rb</filename>
    </modified>
    <modified>
      <diff>@@ -59,5 +59,13 @@ class Article &lt; ActiveRecord::Base
   def article_tags_with_comma
     self.tags.collect(&amp;:name).join(&quot;, &quot;)
   end
+  
+  def self.all_articles(page)
+    paginate(:page =&gt; page, :order =&gt; 'created_at DESC', :per_page =&gt; 10)
+  end
+  
+  def self.all_articles_from_others(page, user_id)
+    paginate(:page =&gt; page, :conditions =&gt; [&quot;user_id &lt;&gt; ?&quot;, user_id], :order =&gt; 'created_at DESC', :per_page =&gt; 10)
+  end
 
 end</diff>
      <filename>app/models/article.rb</filename>
    </modified>
    <modified>
      <diff>@@ -21,13 +21,16 @@
   &lt;/tr&gt;
 	
 &lt;/table&gt;
+
 &lt;% end -%&gt;
 
+&lt;%= will_paginate @articles %&gt;
+
 &lt;% if admin? -%&gt;
   
   &lt;h1&gt;&lt;%= other_articles %&gt;&lt;/h1&gt;
 
-  &lt;% if @all_articles.blank? -%&gt;
+  &lt;% if @all_articles_from_others.blank? -%&gt;
     &lt;p&gt;&lt;%= no_articles %&gt;&lt;/p&gt;
 
   &lt;% else -%&gt;
@@ -39,9 +42,11 @@
         &lt;th&gt;&lt;%= article_date   %&gt;&lt;/th&gt;
       &lt;/tr&gt;
 
-    	&lt;%= render :partial =&gt; 'article', :collection =&gt; @all_articles %&gt;
+    	&lt;%= render :partial =&gt; 'article', :collection =&gt; @all_articles_from_others %&gt;
 
     &lt;/table&gt;
   &lt;% end -%&gt;
   
-&lt;% end -%&gt;
\ No newline at end of file
+&lt;% end -%&gt;
+
+&lt;%= will_paginate @all_articles_from_others %&gt;
\ No newline at end of file</diff>
      <filename>app/views/articles/index.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -15,7 +15,7 @@
     &lt;%= f.select :theme, Profile.themes %&gt;&lt;/td&gt;
     &lt;label for=&quot;theme&quot;&gt;&lt;%= choose_theme %&gt;&lt;/label&gt;
   &lt;/p&gt;
-  
+
   &lt;p&gt;
     &lt;label for=&quot;header&quot;&gt;&lt;%= edit_header %&gt;&lt;/label&gt; &lt;br /&gt; 
     &lt;%= f.text_area :header, :rows =&gt; 15, :cols =&gt; 60 %&gt;</diff>
      <filename>app/views/profiles/show.html.erb</filename>
    </modified>
    <modified>
      <diff>@@ -58,5 +58,5 @@ Rails::Initializer.run do |config|
 end
 
 require 'will_paginate'
-WillPaginate::ViewHelpers.pagination_options[:prev_label] = '&amp;laquo; Inapoi'
-WillPaginate::ViewHelpers.pagination_options[:next_label] = 'Inainte &amp;raquo;'
\ No newline at end of file
+WillPaginate::ViewHelpers.pagination_options[:prev_label] = '&amp;laquo;'
+WillPaginate::ViewHelpers.pagination_options[:next_label] = '&amp;raquo;'
\ No newline at end of file</diff>
      <filename>config/environment.rb</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,7 @@ homepage_pubbers: pubbers
 homepage_articles: articles
 homepage_magazine: magazine
 homepage_caffee: morning coffee
-homepage_theme: caffee
+homepage_theme: coffee
 please_log_in: please log in
 specify_name: please fill out the username
 already_taken_username: this username is already taken. please choose another one
@@ -51,8 +51,8 @@ article_written_by: written by
 add_a_new_article: add a new article
 confirm_article_deletion: are you sure you want to delete this article?
 read_entire_article: read all
-specify_title: specifica titlul articolului
-specify_body: specifica continutul articolului
+specify_title: specify the article title
+specify_body: specify the article body
 add_new_category: add a new category
 administer_existing_articles: modify existing articles
 administer_comments: administer comments</diff>
      <filename>vendor/plugins/polyglot/languages/en.yml</filename>
    </modified>
    <modified>
      <diff>@@ -103,4 +103,3 @@ choose_theme: alege tema pentru blog
 notify_by_mail_for_comments: anunta-ma pe mail cand cineva posteaza un comentariu la articolele mele
 profile_updated: profilul a fost modificat
 error_updating_profile: profilul nu a putut fi modificat. te rog asigura-te ca ai ales o poza uploadata in sistem
- 
\ No newline at end of file</diff>
      <filename>vendor/plugins/polyglot/languages/ro.yml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>451b493bee980cc2ea2fa2caddd1ac11fae81749</id>
    </parent>
  </parents>
  <author>
    <name>sergiu truta</name>
    <email>sergiutruta@gmail.com</email>
  </author>
  <url>http://github.com/sergiutruta/blogpub/commit/7df2f83acc423f2ff07a63d54ea44bebb8f2dd31</url>
  <id>7df2f83acc423f2ff07a63d54ea44bebb8f2dd31</id>
  <committed-date>2008-06-29T00:57:11-07:00</committed-date>
  <authored-date>2008-06-29T00:57:11-07:00</authored-date>
  <message>added pagination for administrator articles index; also added the spanish localization file</message>
  <tree>bf8b21d380be648eff8befbc912b7c6890ef21c7</tree>
  <committer>
    <name>sergiu truta</name>
    <email>sergiutruta@gmail.com</email>
  </committer>
</commit>
