typo 5.1.3 → 5.1.98

data/db/migrate/028_rename_redirect_to.rb

@@ -2,7 +2,11 @@ class RenameRedirectTo < ActiveRecord::Migration
   def self.up
     # The original version of the redirects table used 'to' as a column name
     # Postgres is okay with that, but not mysql.
-    rename_column :redirects, :to, :to_path rescue nil
+    # You need test if rename needed, because with migration transaction, all
+    # failed if rename failed
+    if Redirect.columns_hash.has_key? 'to'
+      rename_column :redirects, :to, :to_path
+    end
   end
 
   def self.down

data/db/migrate/057_add_categorization_model.rb

@@ -15,14 +15,20 @@ class AddCategorizationModel < ActiveRecord::Migration
     end
 
     unless $schema_generator
-      ArticlesCategory.find(:all).each do |ac|
-        Categorization.create!(:article_id => ac.article_id,
-                               :category_id => ac.category_id,
-                               :is_primary => (ac.is_primary == 1))
-      end rescue nil
+      # You need test if ArticlesCategory object exist because if
+      # exception raise even rescue in migration and migration failed and stop
+      # :(
+      if Object.constants.include? 'ArticlesCategory'
+        ArticlesCategory.find(:all).each do |ac|
+          Categorization.create!(:article_id => ac.article_id,
+                                 :category_id => ac.category_id,
+                                 :is_primary => (ac.is_primary == 1))
+        end
+      end
     end
 
-    drop_table :articles_categories rescue nil
+    # The ArticleCategories table is doesn't create
+    #drop_table :articles_categories rescue nil
   end
 
   def self.down

data/db/migrate/072_add_remember_token.rb

@@ -0,0 +1,9 @@
+class AddRememberToken < ActiveRecord::Migration
+  def self.up
+    add_column :users, :remember_token, :string
+  end
+
+  def self.down
+    remove_column :users, :remember_token
+  end
+end

data/db/migrate/073_add_meta_and_subcategories.rb

@@ -0,0 +1,13 @@
+class AddMetaAndSubcategories < ActiveRecord::Migration
+  def self.up
+    add_column :categories, :keywords, :text
+    add_column :categories, :description, :text
+    add_column :categories, :parent_id, :integer
+  end
+
+  def self.down
+    remove_column :categories, :keywords
+    remove_column :categories, :description
+    remove_column :categories, :parent_id
+  end
+end

data/db/migrate/074_add_remember_token_expires_at.rb

@@ -0,0 +1,9 @@
+class AddRememberTokenExpiresAt < ActiveRecord::Migration
+  def self.up
+    add_column :users, :remember_token_expires_at, :datetime
+  end
+
+  def self.down
+    remove_column :users, :remember_token_expires_at
+  end
+end

data/db/migrate/075_move_editor_to_user.rb

@@ -0,0 +1,20 @@
+class MoveEditorToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :editor, :integer, :default => 2
+    
+    unless $schema_generator
+      blog = Blog.default
+      editor = blog.editor
+      users = User.find(:all)
+      users.each do |user|
+        user.editor = editor.to_i
+        user.save!
+      end
+    end
+    
+  end
+
+  def self.down
+    remove_column :users, :editor
+  end
+end

data/db/migrate/076_fix_users_empty_email.rb

@@ -0,0 +1,15 @@
+class FixUsersEmptyEmail < ActiveRecord::Migration
+  def self.up
+      users = User.find(:all)
+      users.each do |user|
+        if user.email.empty?
+          user.email = "typo@typo"
+          user.save!
+        end
+      end
+  end
+
+  def self.down
+
+  end
+end

data/db/migrate/077_fix_userless_articles.rb

@@ -0,0 +1,20 @@
+class FixUserlessArticles < ActiveRecord::Migration
+  def self.up
+    unless $schema_generator
+      articles = Article.find(:all)
+      STDERR.puts "Fixing articles with empty user_id"
+      
+      articles.each do |article|
+        if article.user.nil?
+          STDERR.puts "Fixing article #{article.id} having empty user"
+          article.user_id = 1
+          article.save!
+        end
+      end
+    end
+  end
+
+  def self.down
+
+  end
+end

data/db/schema.rb

@@ -1,5 +1,5 @@
 # This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of ActiveRecord to incrementally modify your database, and
+# please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
 # Note that this schema.rb definition is the authoritative source for your database schema. If you need
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 71) do
+ActiveRecord::Schema.define(:version => 77) do
 
   create_table "articles_tags", :id => false, :force => true do |t|
     t.integer "article_id"
@@ -17,10 +17,12 @@ ActiveRecord::Schema.define(:version => 71) do
   end
 
   create_table "blacklist_patterns", :force => true do |t|
-    t.string "type",    :limit => 15
+    t.string "type"
     t.string "pattern"
   end
 
+  add_index "blacklist_patterns", ["pattern"], :name => "index_blacklist_patterns_on_pattern"
+
   create_table "blogs", :force => true do |t|
     t.text   "settings"
     t.string "base_url"
@@ -28,11 +30,14 @@ ActiveRecord::Schema.define(:version => 71) do
 
   create_table "categories", :force => true do |t|
     t.string  "name"
-    t.integer "position",  :default => 0, :null => false
+    t.integer "position"
     t.string  "permalink"
+    t.text    "keywords"
+    t.text    "description"
+    t.integer "parent_id"
   end
 
-  add_index "categories", ["permalink"], :name => "categories_permalink_index"
+  add_index "categories", ["permalink"], :name => "index_categories_on_permalink"
 
   create_table "categorizations", :force => true do |t|
     t.integer "article_id"
@@ -63,8 +68,8 @@ ActiveRecord::Schema.define(:version => 71) do
     t.string   "state"
   end
 
-  add_index "contents", ["published"], :name => "contents_published_index"
-  add_index "contents", ["text_filter_id"], :name => "contents_text_filter_id_index"
+  add_index "contents", ["published"], :name => "index_contents_on_published"
+  add_index "contents", ["text_filter_id"], :name => "index_contents_on_text_filter_id"
 
   create_table "feedback", :force => true do |t|
     t.string   "type"
@@ -89,8 +94,8 @@ ActiveRecord::Schema.define(:version => 71) do
     t.boolean  "status_confirmed"
   end
 
-  add_index "feedback", ["article_id"], :name => "feedback_article_id_index"
-  add_index "feedback", ["text_filter_id"], :name => "feedback_text_filter_id_index"
+  add_index "feedback", ["article_id"], :name => "index_feedback_on_article_id"
+  add_index "feedback", ["text_filter_id"], :name => "index_feedback_on_text_filter_id"
 
   create_table "notifications", :force => true do |t|
     t.integer  "content_id"
@@ -100,10 +105,10 @@ ActiveRecord::Schema.define(:version => 71) do
   end
 
   create_table "page_caches", :force => true do |t|
-    t.string "name", :null => false
+    t.string "name"
   end
 
-  add_index "page_caches", ["name"], :name => "name"
+  add_index "page_caches", ["name"], :name => "index_page_caches_on_name"
 
   create_table "pings", :force => true do |t|
     t.integer  "article_id"
@@ -111,7 +116,7 @@ ActiveRecord::Schema.define(:version => 71) do
     t.datetime "created_at"
   end
 
-  add_index "pings", ["article_id"], :name => "article_id"
+  add_index "pings", ["article_id"], :name => "index_pings_on_article_id"
 
   create_table "profiles", :force => true do |t|
     t.string "label"
@@ -152,20 +157,19 @@ ActiveRecord::Schema.define(:version => 71) do
   end
 
   create_table "sessions", :force => true do |t|
-    t.string   "sessid",     :limit => 32
+    t.string   "sessid"
     t.text     "data"
+    t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  add_index "sessions", ["sessid"], :name => "sessid", :unique => true
-  add_index "sessions", ["sessid"], :name => "sessions_sessid_index"
+  add_index "sessions", ["sessid"], :name => "index_sessions_on_sessid"
 
   create_table "sidebars", :force => true do |t|
-    t.integer  "active_position"
-    t.text     "config"
-    t.integer  "staged_position"
-    t.datetime "updated_at"
-    t.string   "type"
+    t.integer "active_position"
+    t.text    "config"
+    t.integer "staged_position"
+    t.string  "type"
   end
 
   create_table "sitealizer", :force => true do |t|
@@ -193,11 +197,6 @@ ActiveRecord::Schema.define(:version => 71) do
     t.text   "params"
   end
 
-  create_table "text_link_ads_rss", :force => true do |t|
-    t.string  "html",    :limit => 1024
-    t.integer "post_id"
-  end
-
   create_table "triggers", :force => true do |t|
     t.integer  "pending_item_id"
     t.string   "pending_item_type"
@@ -206,19 +205,20 @@ ActiveRecord::Schema.define(:version => 71) do
   end
 
   create_table "users", :force => true do |t|
-    t.string  "login",                    :limit => 80
-    t.string  "password",                 :limit => 40
-    t.string  "name",                     :limit => 80
-    t.string  "email",                    :limit => 80
-    t.boolean "notify_via_email"
-    t.boolean "notify_on_new_articles"
-    t.boolean "notify_on_comments"
-    t.boolean "notify_watch_my_articles"
-    t.boolean "notify_via_jabber"
-    t.string  "jabber"
-    t.integer "profile_id"
+    t.string   "login"
+    t.string   "password"
+    t.text     "email"
+    t.text     "name"
+    t.boolean  "notify_via_email"
+    t.boolean  "notify_on_new_articles"
+    t.boolean  "notify_on_comments"
+    t.boolean  "notify_watch_my_articles"
+    t.boolean  "notify_via_jabber"
+    t.string   "jabber"
+    t.integer  "profile_id"
+    t.string   "remember_token"
+    t.datetime "remember_token_expires_at"
+    t.integer  "editor",                    :default => 2
   end
 
-  add_index "users", ["login"], :name => "login", :unique => true
-
 end

data/doc/typo-5.2-release-notes.txt

@@ -0,0 +1,52 @@
+Typo 5.2
+========
+
+Welcome to Typo 5.2.  Typo is a blogging platform, like Movable Typo or 
+Wordpress, written using Ruby on Rails.
+
+This is the first major release since Typo 5.0.  
+
+
+Changes since Typo 5.1
+----------------------
+
+* Migration to Ruby on Rails 2.2
+
+* A complete admin rewriting, faster, easier to use
+
+* Coderay text filter plugin, for more easy syntax highlighting for code
+
+* Performances improved, Typo is not the bloatware it used to be anymore
+
+* Even better theme support. Up to date themes are at http://typogarden.org
+
+* Cleaner migrations.
+
+* A better search with live search moved as a plugin
+
+
+How to Install Typo
+-------------------
+
+There are two ways to install Typo: automatically, using the new Typo installer, or manually, by downloading the source and building a working Rails environment (database, etc) for it.
+
+New users should use the installer wherever possible because it's substantially easier and less trouble-prone.
+
+
+### Installing Typo via the Typo Installer 
+
+The documentation has moved to http://github.com/fdv/typo/wikis/install-typo-with-typo-installer
+
+
+### Installing Typo Manually
+
+The documentation has moved to  http://github.com/fdv/typo/wikis/install-typo-from-sources
+
+
+Support, or where to turn when things break
+-------------------------------------------
+
+Typo development occurs via http://typosphere.org.  If you find a bug, please
+file a bug report via http://typosphere.org/projects/typo/issues
+
+If you have problems, please send mail to typo-list@rubyforge.org.  You can also visit Typo's IRC channel, #typo on irc.freenode.net and ask for help.

data/lang/fr_FR.rb

@@ -47,6 +47,7 @@ Localization.define('fr_FR') do |l|
   l.store "No comments yet", "Aucun commentaire"
   l.store "Nothing to show yet", "Rien à déclarer"
   l.store "No posts yet, why don't you start and write one", "Vous n'avez encore écrit aucun billet, pourquoi ne pas commencer par là"
+  l.store "You have no internet connection", "Vous n'avez pas de connection à internet"
   
   #admin/base/recent_comments.rhtml
   l.store "Recent comments", "Derniers commentaires"
@@ -152,6 +153,7 @@ Localization.define('fr_FR') do |l|
   l.store "Manage pages", "Administrer les pages"
   l.store "Post title", "Titre du billet"
   l.store "Posted at", "Date de publication"
+  l.store "Posted on", "Publié le"
   l.store "%d Comments", ["Un commentaire", "%d Commentaires"]
   l.store "%d Trackbacks", ["Un rétrolien", "%d Rétroliens"]
   l.store "View", "Voir"
@@ -225,6 +227,16 @@ Localization.define('fr_FR') do |l|
   l.store "Blacklist", "Liste noire"
   l.store "Feedback Search", "Rechercher dans les discussions"
   l.store "Comments and Trackbacks for", "Commentaires et rétroliens pour"
+
+  #admin/feedback/index.html.erb
+  l.store "Limit to ham", "Uniquement les commentaires valides"
+  
+  #admin/feedback/article.html.erb
+  l.store "All comments", "Tous les commentaires"
+
+  #admin/feedback/create
+  l.store "Comment was successfully created.", "Commentaire crée avec succès."
+  l.store "Comment was successfully updated.", "Commentaire mis à jour avec succès."
  
   #admin/general/task
   l.store "Basic settings", "Configuration de base"
@@ -593,7 +605,7 @@ Localization.define('fr_FR') do |l|
   l.store "June", "Juin"
   l.store "July", "Juillet"
   l.store "August", "Août"
-  l.store "Septembre", "Septembre"
+  l.store "September", "Septembre"
   l.store "October", "Octobre"
   l.store "November", "Novembre"
   l.store "December", "Décembre"
@@ -610,7 +622,7 @@ Localization.define('fr_FR') do |l|
   l.store "required", "obligatoire"
   l.store "Preview", "Prévisualiser "
   l.store "enabled", "activés"
-  l.store "never displayed", "jamais affichés"
+  l.store "never displayed", "jamais affiché"
   l.store "Comments", "Commentaires"
   l.store "Website", "Votre site"
   l.store "Textile enabled", "Textile activé"
@@ -659,23 +671,31 @@ Localization.define('fr_FR') do |l|
   l.store "Oct", "Oct"
   l.store "Nov", "Nov"
   l.store "Dec", "Déc"
-  l.store "January", "Janvier"    
-  l.store "February", "Février"
-  l.store "March", "Mars"
-  l.store "April", "Avril"
-  l.store "May", "Mai"
-  l.store "June", "Juin"
-  l.store "July", "Juillet"
-  l.store "August", "Août"
-  l.store "September", "September"
-  l.store "October", "Octorbre"
-  l.store "November", "Novembre"
-  l.store "December", "Décembre"
+  l.store "January", "janvier"    
+  l.store "February", "février"
+  l.store "March", "mars"
+  l.store "April", "avril"
+  l.store "May", "mai"
+  l.store "June", "juin"
+  l.store "July", "juillet"
+  l.store "August", "août"
+  l.store "September", "septembre"
+  l.store "October", "octobre"
+  l.store "November", "novembre"
+  l.store "December", "décembre"
   l.store "%%a, %%d %%b %%Y %%H:%%M:%%S GMT", Proc.new {|date|
      sprintf( date.strftime("%%s %d %%s %Y %H:%M:%S GMT"), _(date.strftime("%a")), _(date.strftime("%b")).downcase )
   }
   l.store "%%d. %%b", Proc.new {|date|
      sprintf( date.strftime("%d. %%s"), _(date.strftime("%b")).downcase )
   }
-
+  l.store "Original article writen by", "Article original écrit par" 
+  l.store "and published on", "et publié sur"
+  l.store "direct link to this article", "lien direct vers cet article" 
+  l.store "If you are reading this article elsewhere than", "Si vous lisez cet article ailleurs que sur" 
+  l.store "it has been illegally reproduced and without proper authorization", "c'est qu'il a été reproduit illégalement et sans autorisation"
+  l.store "This will display", "Cela affichera"
+  l.store "at the bottom of each of your post in the RSS feed", "en bas de chacun de vos articles sur le flux RSS"
+  l.store "for", "pour"
+  l.store "everything about", "tout sur"
 end