typo 5.4.4 → 5.5

data/app/models/page_cache.rb

@@ -13,20 +13,17 @@ class PageCache
 
   # Delete all file save in path_cache by page_cache system
   def self.sweep_all
-    if ActiveRecord::Base.connection.table_exists?(:cache_informations)
-      CacheInformation.all.each{|c| c.destroy}
-    else
-      logger.debug "PageCache - OOOOPS table is missing"
-    end
-    self.sweep_theme_cache
+    self.zap_pages(%w{*})
   end
 
-
   def self.sweep_theme_cache
     self.zap_pages(%w{images/theme/* stylesheets/theme/* javascripts/theme/*})
   end
 
   def self.zap_pages(paths)
+    # Ensure no one is going to wipe his own blog public directory
+    # It happened once on a release and was no fun at all
+    return if public_path == "#{RAILS_ROOT}/public"
     srcs = paths.inject([]) { |o,v|
       o + Dir.glob(public_path + "/#{v}")
     }
@@ -36,6 +33,7 @@ class PageCache
     FileUtils.mv(srcs, trash, :force => true)
     FileUtils.rm_rf(trash)
   end
+  
 
   # DEPRECATED
   #
@@ -60,4 +58,5 @@ class PageCache
       self.zap_pages([*1990..2020].collect { |y| "#{y}.*" })
     end
   end
+  
 end

data/app/models/user.rb

@@ -182,6 +182,7 @@ class User < ActiveRecord::Base
   end
 
   validates_uniqueness_of :login, :on => :create
+  validates_uniqueness_of :email, :on => :create
   validates_length_of :password, :within => 5..40, :if => Proc.new { |user|
     user.read_attribute('password').nil? or user.password.to_s.length > 0
   }

data/app/views/admin/content/_form.html.erb

@@ -7,14 +7,16 @@
 
 <div id='editor-right'>
   <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
-    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Publish settings")%></h3>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Publish settings") %></h3>
     <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
       <%= check_box 'article', 'allow_comments' %>
       <label for="article_allow_comments"><%= _("Allow comments") %></label><br />
       <%= check_box 'article', 'allow_pings' %>
-      <label for="article_allow_pings"><%= _("Allow trackbacks")%></label><br />
+      <label for="article_allow_pings"><%= _("Allow trackbacks") %></label><br />
       <%= check_box 'article', 'published'  %>
-      <label for="article_published"><%= _("Published")%></label><br />
+      <label for="article_published"><%= _("Published") %></label><br />
+      <label for="article_password"><%= _("Password:") %></label><br />
+      <%= password_field(:article, :password) %>
       <p class='right'>
         <input id='save_draft' type="submit" value="<%= _('Save as draft') %>" name="article[draft]" class='ui-state-default ui-corner-all' />
         <%= save( _("Publish") + " &raquo;") %><br />
@@ -26,7 +28,7 @@
   </div>
   
   <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
-    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Categories")%></h3>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Categories") %></h3>
     <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
       <%- Category.all.each do |cat| %>
         <%= check_box_tag('categories[]', cat.id, (@article.categories.map(&:id).include? cat.id), :id => "category_#{h(cat.id)}") %>
@@ -38,7 +40,7 @@
 
 <div id='editor-left'>
   <div class='settings'>
-    <h2><label for="article_title"><%= _("Title")%></label></h2>
+    <h2><label for="article_title"><%= _("Title") %></label></h2>
     <p class='input_text'>
       <%= text_field 'article', 'title', :class => 'large' %>
     </p>
@@ -77,15 +79,15 @@
   </div>
 
   <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
-    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Excerpt")%></h3>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Excerpt") %></h3>
     <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
-      <p><%=_("Excerpts are posts summaries that are shown on your blog homepage only but won’t appear on the post itself")%></p>
+      <p><%=_("Excerpts are posts summaries that are shown on your blog homepage only but won’t appear on the post itself") %></p>
       <%= text_area 'article', 'excerpt', {:height => '150', :class => 'large', :rows => '5'} %>
     </div>  
   </div>
   
   <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
-    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Uploads")%></h3>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Uploads") %></h3>
     <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
       <p>Uploads will be displayed as attachments in your RSS feed, but won't appear in your articles.</p>
     
@@ -96,10 +98,10 @@
   </div>
   
   <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
-    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Post settings")%></h3>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Post settings") %></h3>
     <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
       <div class='setting'>
-        <label class='float'><%= _("Publish at")%></label>
+        <label class='float'><%= _("Publish at") %></label>
         <div class='input_text'>
           <%= calendar_date_select 'article', 'published_at' %>
         </div>
@@ -111,7 +113,7 @@
         </div>        
       </div>
     <div class='setting clear'>
-      <label class='float' for="text_filter"><%= _("Article filter")%></label>
+      <label class='float' for="text_filter"><%= _("Article filter") %></label>
       <div class='input_text'>
         <select name="article[text_filter]" id="text_filter">
           <%= options_for_select text_filter_options, @article.text_filter %>

data/app/views/admin/content/_images.html.erb

@@ -1,7 +1,7 @@
 <!--
 <a href="javascript:" class="carousel-control" rel="prev">Previous</a>
 -->
-<div id="carousel-wrapper">
+<div id="carousel-wrapper" <%= 'style="display: none;"' if current_user.editor == 'visual' %>>
     <div id="carousel-content">
       <% @images.each do |image| %>
         <div class="slide">

data/app/views/admin/content/_simple_editor.html.erb

@@ -11,4 +11,5 @@
   $('visual_editor').innerHTML = "";
   $('visual_editor').style.display = 'none';
   $('article_body_and_extended').innerHTML = content;
+  $('carousel-wrapper').style.display = 'block';
 </script>

data/app/views/admin/content/_visual_editor.html.erb

@@ -7,6 +7,7 @@
   $('text_filter').value = 'none';
   html = $('article_body_and_extended').value;
   $('simple_editor').innerHTML = '';
+  $('carousel-wrapper').style.display = 'none';
   
   if (CKEDITOR.instances.article__body_and_extended_editor &&
     typeof(CKEDITOR.instances.article__body_and_extended_editor) == 'object') {

data/app/views/admin/dashboard/_overview.html.erb

@@ -2,17 +2,17 @@
   <div class='ui-state-highlight ui-corner-all' style='padding: 0pt 0.7em;'>
     <p>
       <span class='ui-icon ui-icon-info' style='float: left; margin-right: 0.3em;'></span>
-       <%= _("This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s, %s or %s." , 
-              link_to(_('write a post'), :controller => 'content', :action => 'new'), 
-              link_to(_('write a page'), :controller => 'page', :action => 'new') , 
+       <%= _("This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s, %s or %s." ,
+              link_to(_('write a post'), :controller => 'content', :action => 'new'),
+              link_to(_('write a page'), :controller => 'pages', :action => 'new') ,
               link_to(_("update your profile or change your password"), :controller => 'users', :action => 'edit', :id => session[:user_id]) ) -%>.</p>
     <p> <%= _("You can also do a bit of design, %s or %s." ,
-              link_to(_("change your blog presentation"), :controller => 'themes') , 
+              link_to(_("change your blog presentation"), :controller => 'themes') ,
               link_to(_("enable plugins"), :controller => 'sidebar') ) -%></p>
-              
+
     <p>
-      If you need help, <a href="http://typosphere.org">read our documentation</a>. You can also browse our 
-      <a href="http://typogarden.org">theme catalogue</a> 
+      If you need help, <a href="http://typosphere.org">read our documentation</a>. You can also browse our
+      <a href="http://typogarden.org">theme catalogue</a>
       or <a href='http://plugins.typosphere.org'>download some plugins</a> to customize your Typo blog.
     </p>
   </div>

data/app/views/admin/pages/_form.html.erb

@@ -18,6 +18,7 @@
   <p class='input_text'>
     <%= text_field 'page', 'title', :class => 'large'  %>
   </p>
+  <%= render(:partial => 'images', :object => @images) unless @images.empty? %>
   <div id="editor-menu">
     <span id="f" class="<%= 'active' if current_user.editor == 'visual' %>">
       <%= build_editor_link("Visual", 'insert_editor', 'fck', 'simple_editor', 'visual') %>

data/app/views/admin/pages/_images.html.erb

@@ -0,0 +1,18 @@
+<!--
+<a href="javascript:" class="carousel-control" rel="prev">Previous</a>
+-->
+<div id="carousel-wrapper" <%= 'style="display: none;"' if current_user.editor == 'visual' %>>
+    <div id="carousel-content">
+      <% @images.each do |image| %>
+        <div class="slide">
+          <%= show_thumbnail_for_editor(image) %>
+        </div>
+      <% end %>
+    </div>
+</div>
+<!--
+<a href="javascript:" class="carousel-control" rel="next">Next</a>
+-->
+<script type='text/javascript'>
+new Carousel('carousel-wrapper', $$('#carousel-content .slide'), $$('a.carousel-control', 'a.carousel-jumper'), {duration: 0.4, circular: false});
+</script>

data/app/views/admin/pages/_simple_editor.html.erb

@@ -6,11 +6,10 @@
   $('text_filter').value = $('user_textfilter').value;
   content = CKEDITOR.instances.page__body_editor.getData();
 </script>
-
 <%= text_area('page', 'body', {:class => 'large', :height => '300px', :rows => '20'}) %>
-
 <script type="text/javascript">
   $('visual_editor').innerHTML = "";
   $('visual_editor').style.display = 'none';
   $('page_body').innerHTML = content;
+  $('carousel-wrapper').style.display = 'block';
 </script>

data/app/views/admin/pages/_visual_editor.html.erb

@@ -6,7 +6,8 @@
   $('f').className = 'active';
   $('text_filter').value = 'none';
   html = $('page_body').value;  
-  $('simple_editor').innerHTNK = '';
+  $('simple_editor').innerHTML = '';
+  $('carousel-wrapper').style.display = 'none';
   
   if (CKEDITOR.instances.page__body_editor &&
     typeof(CKEDITOR.instances.page__body_editor) == 'object') {

data/app/views/admin/pages/index.html.erb

@@ -1,5 +1,5 @@
 <% @page_heading = _('Manage pages') %>
-<% @link_to_new = link_to(_("New Page"), {:controller => 'contents', :action => 'new'}, :id => 'dialog-link', :class => 'ui-state-default ui-corner-all') %>
+<% @link_to_new = link_to(_("New Page"), {:controller => 'pages', :action => 'new'}, :id => 'dialog-link', :class => 'ui-state-default ui-corner-all') %>
 <% subtabs_for(:content) %>
 
 <table cellspacing="1" cellpadding="0">

data/app/views/admin/settings/feedback.html.erb

@@ -35,7 +35,7 @@
     <div class='setting clear'>
       <label class="float" for="setting_use_gravatar"><%= _("Enable gravatars")%></label>
       <div class='input_text'>
-        <%= check_box(:setting, :use_gravatar)%><span><%= _("This setting allows you to disable trackbacks for every article in your blog.  It won't remove existing trackbacks, but it will prevent any further attempt to add a trackback anywhere on your blog.")%></span>
+        <%= check_box(:setting, :use_gravatar)%>
       </div>      
     </div>
     <div class='setting clear'>
@@ -82,6 +82,7 @@
       <label class="float" for="setting_global_pings_disable"><%= _("Disable trackbacks site-wide")%></label>
       <div class='input_text'>
         <%= check_box(:setting, :global_pings_disable)%>
+        <span><%= _("This setting allows you to disable trackbacks for every article in your blog.  It won't remove existing trackbacks, but it will prevent any further attempt to add a trackback anywhere on your blog.")%></span>
       </div>      
     </div>
     <div class='setting clear'>

data/app/views/admin/tags/edit.html.erb

@@ -1,7 +1,7 @@
 <% @page_heading =  _("Editing ") + " #{h @tag.display_name}" %>
 
 <% content_for('tasks') do %>
-  <%= subtab _("Back to tags list") + " &raquo;", "", {:controller=>"tags", :action=>"list"} %>
+  <%= subtab _("Back to tags list") + " &raquo;", {:controller=>"tags", :action=>"list"} %>
 <% end %>
 
 <% form_tag :action=>"edit", :id => @tag.id do %>

data/app/views/articles/_article.html.erb

@@ -1,20 +1,24 @@
 <h2><%= link_to_permalink article,article.title %></h2>
 <p class="auth"><%= _("Posted by")%> <%= author_link(article) %>
 <%= js_distance_of_time_in_words_to_now article.published_at %></p>
-<% unless controller.action_name == 'redirect' %>
-  <% if article.excerpt? %>
-    <%= article.excerpt %>
+<% if article.password.nil? or article.password.empty? %>
+  <% unless controller.action_name == 'redirect' %>
+    <% if article.excerpt? %>
+      <%= article.excerpt %>
+    <% else %>
+      <%= article.html(:body) %>
+      <% if article.extended? %>
+        <div class="extended">
+          <p><%= link_to_permalink article, _("Continue reading") + "..." %></p>
+        </div>
+      <% end %>
+    <% end %>
   <% else %>
     <%= article.html(:body) %>
-    <% if article.extended? %>
-      <div class="extended">
-        <p><%= link_to_permalink article, _("Continue reading...") %></p>
-      </div>
-    <% end %>
+    <div class="extended">
+      <%= article.html(:extended) %>
+    </div>
   <% end %>
 <% else %>
-  <%= article.html(:body) %>
-  <div class="extended">
-    <%= article.html(:extended) %>
-  </div>
-<% end %>
+  <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
+<% end %>

data/app/views/articles/_article_content.html.erb

@@ -0,0 +1 @@
+<%= @article.html(:all) %>

data/app/views/articles/_comment_box.html.erb

@@ -16,7 +16,7 @@
   <table cellpadding="4" cellspacing="0" class="frm-tbl">
     <tr>
       <td><p><label for="comment_author"><%= _("Your name")%></label></p></td>
-      <td> <%= text_field "comment", "author", :size => 20 %> <small><%= link_to_function(_("(leave url/email &#187;)"), "Element.toggle('guest_url'); Element.toggle('guest_email')") %></small></td>
+      <td> <%= text_field "comment", "author", :size => 20 %> <small><%= link_to_function("(#{_('leave url/email')} &#187;)", "Element.toggle('guest_url'); Element.toggle('guest_email')") %></small></td>
     </tr>
     <tr id="guest_url" style="display:none;">
       <td><p><label for="comment_url"><%= _("Your blog")%></label></p></td>

data/app/views/articles/_password_form.html.erb

@@ -0,0 +1,10 @@
+<div id='content-<%= article.id %>'>
+  <p>This post is password protected. Please fill in your password or login to view the content</p>
+  <% remote_form_for :articles, article, :url => { :action => 'check_password'}, :update => "content-#{article.id}" do |f| %>
+    <%= password_field(:article, :password) %>
+    <input type='hidden' name='article[id]' value='<%= article.id %>' />
+    <%= submit_to_remote('check_password', _('Submit') + '!',
+                         :update => "content-#{article.id}",
+                         :url    => {:action => 'check_password'}) %>
+  <% end %>
+</div>

data/app/views/articles/groupings.html.erb

@@ -12,4 +12,4 @@
 <p><%= _("There are")%> <%= @grouping_class.to_s.underscore.pluralize %>.</p>
 <% end -%>
 </div>
-<p><%= will_paginate %></p>
+<p><%= will_paginate :next_label => "#{_("Next page")} &raquo;", :previous_label => "&laquo; #{_('Previous page')}" %></p>

data/app/views/articles/index.html.erb

@@ -1,9 +1,8 @@
 <% for article in @articles -%>
   <div class="post">
     <%= render :partial => "articles/article", :object => article %>
-    <%= link_to_permalink article, _("Read more") + "..." if article.extended? %>
     <p class="meta"><%= article_links article %></p>
   </div>
 <% end -%>
 
-<%= will_paginate @articles %>
+<%= will_paginate @articles, :next_label => "#{_("Next page")} &raquo;", :previous_label => "&laquo; #{_('Previous page')}" %>

data/app/views/articles/read.html.erb

@@ -18,10 +18,7 @@
 <div class="post"<%= onhover_show_admin_tools(:article) %>>
   <%= link_to("edit", { :controller => "admin/content", :action => "edit", :id => @article.id },
         :class => "admintools", :style => "display: none", :id => "admin_article") %>
-  <h2><%=h @article.title %></h2>
-  <p class="auth"><%= _("Posted by")%> <%= author_link(@article) %>
-  <%= js_distance_of_time_in_words_to_now @article.published_at.utc %></p>
-  <%= html(@article) %>
+  <%= render :partial => 'articles/article', :locals => { :article => @article } %>
 </div>
 <p class="meta">
   <%= article_links @article %>

data/app/views/articles/search.html.erb

@@ -5,4 +5,4 @@
   </div>
 <% end -%>
 
-<%= will_paginate @articles %>
+<%= will_paginate @articles, :next_label => "#{_("Next page")} &raquo;", :previous_label => "&laquo; #{_('Previous page')}" %>

data/app/views/layouts/administration.html.erb

@@ -7,7 +7,7 @@
   <meta http-equiv="imagetoolbar" content="no" />
   <%= stylesheet_link_tag "growler", "administration", "lightbox" %>
   <%= stylesheet_link_tag "administration_rtl" if ( _("Localization.rtl") == "1") %>
-  <%= javascript_include_tag "prototype", "effects", "builder", "dragdrop", "controls", "typo", "lightbox", "quicktags", "growler", "typo_carousel", "administration", :ckeditor %>
+  <%= javascript_include_tag "prototype", "effects", "builder", "dragdrop", "controls", "typo", "lightbox", "quicktags", "growler", "typo_carousel", "administration", "ckeditor/ckeditor" %>
   <%= calendar_date_select_includes %>  
 </head>
 <body>

data/app/views/shared/_search.html.erb

@@ -1,5 +1,5 @@
 <% form_tag({:controller => 'articles',  :action => 'search'}, {:method => 'get', :id => 'sform'}) do %>
- <label for="q">Live Search:</label><input type="text" id="q" name="q" value="" size="15" />
+  <label for="q"><%=  _('Live Search') %></label><input type="text" id="q" name="q" value="" size="15" />
 <%= image_tag "spinner-blue.gif", :id => 'search_spinner', :style => 'display:none;' %>
 <% end %>
 <%= observe_field "q", :frequency => 1,

data/config/ckeditor.yml

@@ -0,0 +1,14 @@
+default: &default
+  public_path: "#{path_to_your_public_directory}/files"
+  public_uri: /files
+  file_manager_uri: /fm/filemanager
+  file_manager_upload_uri: /ckeditor/upload
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+production:
+  <<: *default

data/config/environment.rb

@@ -4,7 +4,7 @@
 # (Use only when you can't set environment variables through your web/app server)
 # ENV['RAILS_ENV'] = 'production'
 
-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -13,8 +13,10 @@ Rails::Initializer.run do |config|
   # Skip frameworks you're not going to use
   config.frameworks -= [ :active_resource ]
 
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/app/services )
+  # Setup the cache path
+  config.action_controller.page_cache_directory = "#{RAILS_ROOT}/public/cache/"
+  config.cache_store=:file_store, "#{RAILS_ROOT}/public/cache/"
+
 
   # I need the localization plugin to load first
   # Otherwise, I can't localize plugins <= localization
@@ -42,16 +44,13 @@ Rails::Initializer.run do |config|
   config.gem 'calendar_date_select'
   config.gem 'bluecloth', :version => '~> 2.0.5'
   config.gem 'coderay', :version => '~> 0.8'
-  config.gem 'mislav-will_paginate', :version => '~> 2.3.11', :lib => 'will_paginate', 
-          :source => 'http://gems.github.com'
+  config.gem 'will_paginate', :version => '~> 2.3.11'
   config.gem 'RedCloth', :version => '~> 4.2.2'
-  config.gem 'panztel-actionwebservice', :version => '2.3.5', :lib => 'actionwebservice'
+  config.gem 'fdv-actionwebservice', :version => '2.3.8', :lib => 'actionwebservice'
   config.gem 'addressable', :version => '~> 2.1.0', :lib => 'addressable/uri'
   config.gem 'mini_magick', :version => '~> 1.2.5', :lib => 'mini_magick'
   
-  # Use the database for sessions instead of the file system
-  # (create the session table with 'rake create_sessions_table')
-  # config.action_controller.session_store = :active_record_store
+  # Use the filesystem for sessions instead of the database
   config.action_controller.session = { :key => "_typo_session", :secret => "8d7879bd56b9470b659cdcae88792622" }
   
   # Disable use of the Accept header, since it causes bad results with our
@@ -69,37 +68,26 @@ require 'uuidtools'
 
 require 'migrator'
 require 'rails_patch/active_record'
+require 'rails_patch/active_support'
 require 'login_system'
 require 'typo_version'
 $KCODE = 'u'
 require 'jcode'
 require 'transforms'
 
+$FM_OVERWRITE = true
+require 'filemanager'
+
 ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.merge!(
   :long_weekday => '%a %B %e, %Y %H:%M'
 )
 
 ActionMailer::Base.default_charset = 'utf-8'
 
-# I wanted to put this as a "setup" page, but it seems I can't catch the 
-# exception fast enough and get a 500 error
-#if RAILS_ENV != 'test'
-#  begin
-#    ActiveRecord::Base.connection.select_all("select * from sessions")
-#  rescue
-#    begin
-#      ActiveRecord::Base.connection.current_database
-#      Migrator.migrate
-#    rescue
-#      # if there are no database, migrator doesn't no start
-      # use case : rake db:create in rails tasks
-#    end
-#  end
-#end
-
 # Work around interpolation deprecation problem: %d is replaced by
 # {{count}}, even when we don't want them to.
 # FIXME: We should probably fully convert to standard Rails I18n.
+require 'i18n_interpolation_deprecation'
 class I18n::Backend::Simple
   def interpolate(locale, string, values = {})
     interpolate_without_deprecated_syntax(locale, string, values)