i18nliner bump, fix pagination link issue

refs CNVS-11947

the scoping tweak ensures that translate call with an explicit :scope
(ohai will_paginate) do not have their keys incorrectly scoped to the
current file

version bump also fixes issue w/ 5 built-in ActiveRecord translations not
resolving (e.g. "1 error prohibited this %{model} from being saved"), due
to the unfortunately named `i18n_scope` stomping an existing method with
a slightly different purpose. it doesn't appear that a user would ever
actually see any of these 5 strings in canvas, but ¯\_(ツ)_/¯

test plan:
0. create a bunch of page errors if necessary
1. go to /error_reports
2. confirm the pagination links say stuff like "Next →" instead of
   "Next Label"

Change-Id: I9ff182863691fbceda44b105ab9bb94d9321b177
Reviewed-on: https://gerrit.instructure.com/43640
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Jennifer Stern <jstern@instructure.com>
Reviewed-by: Jennifer Stern <jstern@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>

Author: jenseng

Gemfile.d/other_stuff.rb

@@ -47,7 +47,7 @@
 gem 'i18n', '0.6.9'
 gem 'i18nema', '0.0.8', :platforms => [:mri_20, :mri_21]
 gem 'i18nema19', '0.0.8', :platform => :mri_19
-gem 'i18nliner', '0.0.8'
+gem 'i18nliner', '0.0.9'
 gem 'icalendar', '1.5.4'
 gem 'ims-lti', '2.0.0.beta.10'
 gem 'jammit', :github => 'documentcloud/jammit', :ref => '98b50a67029c2860717485a72a2ff0ae8ec37840'

config/initializers/i18n.rb

@@ -129,38 +129,38 @@ def qualified_locale
 require "i18n_extraction/i18nliner_scope_extensions"
 
 ActionView::Template.class_eval do
-  def render_with_i18n_scope(view, *args, &block)
-    old_i18n_scope = view.i18n_scope
+  def render_with_i18nliner_scope(view, *args, &block)
+    old_i18nliner_scope = view.i18nliner_scope
     if @virtual_path
-      view.i18n_scope = I18nliner::Scope.new(@virtual_path.gsub(/\/_?/, '.'))
+      view.i18nliner_scope = I18nliner::Scope.new(@virtual_path.gsub(/\/_?/, '.'))
     end
-    render_without_i18n_scope(view, *args, &block)
+    render_without_i18nliner_scope(view, *args, &block)
   ensure
-    view.i18n_scope = old_i18n_scope
+    view.i18nliner_scope = old_i18nliner_scope
   end
-  alias_method_chain :render, :i18n_scope
+  alias_method_chain :render, :i18nliner_scope
 end
 
 ActionView::Base.class_eval do
-  attr_accessor :i18n_scope
+  attr_accessor :i18nliner_scope
 end
 
 ActionController::Base.class_eval do
-  def i18n_scope
-    @i18n_scope ||= I18nliner::Scope.new(controller_path.tr('/', '.'))
+  def i18nliner_scope
+    @i18nliner_scope ||= I18nliner::Scope.new(controller_path.tr('/', '.'))
   end
 end
 
 ActiveRecord::Base.class_eval do
   include I18nUtilities
   extend I18nUtilities
 
-  def i18n_scope
-    self.class.i18n_scope
+  def i18nliner_scope
+    self.class.i18nliner_scope
   end
 
-  def self.i18n_scope
-    @i18n_scope ||= I18nliner::Scope.new(self.class.name.underscore)
+  def self.i18nliner_scope
+    @i18nliner_scope ||= I18nliner::Scope.new(self.class.name.underscore)
   end
 
   class << self
@@ -188,14 +188,14 @@ def validates_locale(*args)
 end
 
 ActionMailer::Base.class_eval do
-  def i18n_scope
-    @i18n_scope ||= I18nliner::Scope.new("#{mailer_name}.#{action_name}")
+  def i18nliner_scope
+    @i18nliner_scope ||= I18nliner::Scope.new("#{mailer_name}.#{action_name}")
   end
 
   def translate(key, default, options = {})
     key, options = I18nliner::CallHelpers.infer_arguments(args)
     options = inferpolate(options) if I18nliner.infer_interpolation_values
-    options[:i18n_scope] = i18n_scope
+    options[:i18nliner_scope] = i18nliner_scope
     I18n.translate(key, options)
   end
   alias :t :translate

gems/i18n_extraction/i18n_extraction.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sexp_processor", "~> 4.2"
   spec.add_dependency "ruby_parser", "~> 3.6"
   spec.add_dependency "activesupport", ">= 3.2", "< 4.2"
-  spec.add_dependency "i18nliner", "0.0.8"
+  spec.add_dependency "i18nliner", "0.0.9"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

gems/i18n_extraction/lib/i18n_extraction/i18nliner_scope_extensions.rb

@@ -3,9 +3,9 @@
 class I18nliner::Scope
   ABSOLUTE_KEY = /\A#/
 
-  def normalize_key(key, inferred_key)
+  def normalize_key(key, inferred_key, explicit_scope_option)
     key = key.to_s
-    return key if key.sub!(ABSOLUTE_KEY, '') || !scope || inferred_key
+    return key if key.sub!(ABSOLUTE_KEY, '') || !scope || inferred_key || explicit_scope_option
     scope + key
   end
 end