CHANGES-5.0.3 @@ -26,7 +26,7 @@ module ApplicationHelper # The '5 comments' link from the bottom of articles def comments_link(article) - link_to_permalink(article,pluralize(article.published_comments.size, 'comment'),'comments') + link_to_permalink(article,pluralize(article.published_comments.size, _('comment')),'comments') end def trackbacks_link(article) app/helpers/application_helper.rb @@ -93,7 +93,7 @@ class Blog < CachedModel setting :send_outbound_pings, :boolean, true setting :email_from, :string, 'typo@example.com' setting :editor, :integer, 2 - setting :cache_option, :string, 'caches_action_with_params' + setting :cache_option, :string, 'caches_page' # Jabber config setting :jabber_address, :string, '' app/models/blog.rb @@ -9,12 +9,12 @@ if (article.published_at.month != currentmonth || article.published_at.year != currentyear) currentmonth = article.published_at.month currentyear = article.published_at.year -%> - <h3 class="archivemonth"><%= Date::MONTHNAMES[article.published_at.month] %> <%= article.published_at.year %></h3> + <h3 class="archivemonth"><%= _(Date::MONTHNAMES[article.published_at.month]) %> <%= article.published_at.year %></h3> <% end -%> <div class="archivepost"> <%= article.published_at.mday %> - <%= link_to_permalink(article,h(article.title)) %> - <% if !article.categories.empty? %> posted in + <% if !article.categories.empty? %> <%= _("posted in") %> <%= article.categories.collect {|c| link_to_permalink c,c.name }.join(", ") -%> <% end -%> </div> app/views/articles/archives.html.erb @@ -1 +1 @@ -62 \ No newline at end of file +66 \ No newline at end of file db/schema_version @@ -611,4 +611,8 @@ Localization.define('fr_FR') do |l| l.store "leave url/email", "laissez votre url/courriel" l.store "No comments", "Pas de commentaires" l.store "From", "De" + l.store "Meta", "Méta" + l.store "comment", "commentaire" + l.store "comments", "commentaires" + l.store "posted in", "publié dans" end lang/fr_FR.rb @@ -1,7 +1,7 @@ require 'rake/gempackagetask' require 'rake/contrib/rubyforgepublisher' -PKG_VERSION = "5.0.2" +PKG_VERSION = "5.0.3" PKG_NAME = "typo" PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" RUBY_FORGE_PROJECT = 'typo' @@ -39,7 +39,7 @@ spec = Gem::Specification.new do |s| end Rake::GemPackageTask.new(spec) do |p| - p.gem_spec = spec +# p.gem_spec = spec p.need_tar = true p.need_zip = true end lib/tasks/release.rake @@ -2,8 +2,8 @@ require File.dirname(__FILE__) + "/../spec_helper" require 'dns_mock' -class CommentTest < Test::Unit::TestCase - def setup +describe Comment do + before(:each) do CachedModel.cache_reset end @@ -125,7 +125,7 @@ class CommentTest < Test::Unit::TestCase # Test each filter to make sure that we don't allow scripts through. # Yes, this is ugly. ['','textile','markdown','smartypants','markdown smartypants'].each do |filter| - this_blog.comment_text_filter = filter + Blog.default.comment_text_filter = filter assert c.save assert c.errors.empty? spec/models/comment_spec.rb @@ -1,7 +1,4 @@ --colour ---format -progress ---loadby -mtime +--format progress +--loadby mtime --reverse ---backtrace \ No newline at end of file spec/spec.opts @@ -26,7 +26,7 @@ <ul class="meta"> <%= content_tag(:li, category_links(article), :class => 'categories') unless article.categories.empty? %> <%= content_tag(:li, tag_links(article), :class => 'tags') unless article.tags.empty? %> - <li>Meta + <li><%= _("Meta") %> <%= trackbacks_link(article) << ',' if article.allow_pings? %> <%= comments_link(article) << ',' if article.allow_comments? %> <a href="<%= article.permalink_url %>" rel="bookmark"><%=_("permalink")%></a>, themes/scribbish/views/articles/_article.html.erb @@ -29,7 +29,7 @@ </p> <p class="links"> <%= link_to_permalink(article, _("Read full article"), nil, 'more') if controller.action_name != 'permalink' %> - <%= link_to_permalink(article,pluralize(article.published_comments.size, 'comment'),'comments', 'comments') %> + <%= link_to_permalink(article,pluralize(article.published_comments.size, _('comment')),'comments', 'comments') %> </p> <% end %> <br style="clear:both;" /> themes/standard_issue/views/articles/_article.html.erb @@ -1,15 +1,11 @@ class StaticSidebar < Sidebar DEFAULT_TEXT = %q{ <ul> - <li><a href="http://www.typosphere.org" title="Typo">Typo</a></li> - <li><a href="http://blog.leetsoft.com" title="too-biased">too-biased</a></li> - <li><a href="http://blog.remor.com/" title="seth hall">Seth Hall</a></li> - <li><a href="http://scottstuff.net" title="Scottstuff">scottstuff.net</a></li> + <li><a href="http://www.typosphere.org" title="Typo">Typosphere</a></li> <li><a href="http://www.bofh.org.uk" title="Just a Summary">Just A Summary</a></li> - <li><a href="http://nubyonrails.com" title="Topfunky">Topfunky</a></li> + <li><a href="http://fredericdevillamil.com" title="Frédéric de Villamil">Ergonomie, Rails et Architecture de l'information web</a></li> <li><a href="http://planettypo.com" title="PlanetTypo">PlanetTypo</a></li> <li><a href="http://typoforums.org" title="Typo Forums">Typo Forums</a></li> - <li><a href="http://fredericdevillamil.com" title="Frédéric de Villamil">Frédéric de Villamil</a></li> </ul> } description "Static content, like links to other sites, advertisements, or blog meta-information" vendor/plugins/static_sidebar/lib/static_sidebar.rb spec/helpers/comments_helper_spec.rb b517762842dc2cc756b92c2974b1ca6810afa44f a6d42e623e22bc23250578396a41c844a1c25057 Frédéric de Villamil frederic@de-villamil.com http://github.com/fdv/typo/commit/fc9f2f0d5bed5884f56f66b7c35944214728799b fc9f2f0d5bed5884f56f66b7c35944214728799b 2008-02-24T05:28:40-08:00 2008-02-24T05:28:40-08:00 Tagging 5.0.3 git-svn-id: http://svn.typosphere.org/typo/tags/release_5_0_3@1659 820eb932-12ee-0310-9ca8-eeb645f39767 388439fdf9808aad4ac8a4939b88e60c11258689 Frédéric de Villamil frederic@de-villamil.com