Merge branch 'release/0.9' into rails-3-develop

Conflicts:
    Gemfile.lock
    app/controllers/public_body_controller.rb
    app/mailers/track_mailer.rb
    app/views/request/_hidden_correspondence.html.erb
    app/views/request/_sidebar.html.erb
    app/views/request/hidden.html.erb
    app/views/request/new_please_describe.html.erb
    app/views/request/preview.html.erb
    app/views/user/show.html.erb
    config/environment.rb
    config/routes.rb
    spec/controllers/public_body_controller_spec.rb

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/i18n_fixes.rb b/lib/i18n_fixes.rb
index a85faddcb..82d1b2c3a 100644
--- a/lib/i18n_fixes.rb
+++ b/lib/i18n_fixes.rb
@@ -14,6 +14,17 @@ def _(key, options = {})
   gettext_interpolate(translation, options)
 end
 
+def n_(*keys)
+  # The last parameter should be the values to do the interpolation with
+  if keys.count > 3
+    options = keys.pop 
+  else
+    options = {}
+  end
+  translation = FastGettext.n_(*keys).html_safe
+  gettext_interpolate(translation, options)
+end
+
 MATCH = /\{\{([^\}]+)\}\}/
 
 def gettext_interpolate(string, values)