Remove i18n code

app/presenters/date_question_presenter.rb

@@ -3,9 +3,9 @@ class DateQuestionPresenter < QuestionPresenter
 
   def response_label(value)
     if only_display_day_and_month?(value)
-      I18n.localize(value, format: :day_and_month)
+      value.strftime("%e %B")
     else
-      I18n.localize(value, format: :long)
+      value.strftime("%e %B %Y")
     end
   end
 

app/presenters/flow_registration_presenter.rb

@@ -2,7 +2,6 @@ class FlowRegistrationPresenter
 
   def initialize(flow)
     @flow = flow
-    @i18n_prefix = "flow.#{@flow.name}"
   end
 
   def slug
@@ -44,14 +43,9 @@ def method_missing(method, *args, &block)
   def indexable_content
     HTMLEntities.new.decode(
       text = @flow.questions.inject([start_node.body]) { |acc, node|
-        pres = QuestionPresenter.new(@i18n_prefix, node, nil, helpers: [MethodMissingHelper])
+        pres = QuestionPresenter.new(node, nil, helpers: [MethodMissingHelper])
         acc.concat(NODE_PRESENTER_METHODS.map { |method|
-          begin
-            pres.send(method)
-          rescue I18n::MissingInterpolationArgument
-            # We can't do much about this, so we ignore these text nodes
-            nil
-          end
+          pres.send(method)
         })
       }.compact.join(" ").gsub(/(?:<[^>]+>|\s)+/, " ")
     )
@@ -65,6 +59,6 @@ def state
 
   def start_node
     node = SmartAnswer::Node.new(@flow, @flow.name.underscore.to_sym)
-    StartNodePresenter.new(@i18n_prefix, node)
+    StartNodePresenter.new(node)
   end
 end

app/presenters/node_presenter.rb

@@ -2,8 +2,7 @@ class NodePresenter
   extend Forwardable
   delegate [:outcome?] => :@node
 
-  def initialize(i18n_prefix, node, state = nil)
-    @i18n_prefix = i18n_prefix
+  def initialize(node, state = nil)
     @node = node
     @state = state || SmartAnswer::State.new(nil)
   end

app/presenters/outcome_presenter.rb

@@ -1,6 +1,6 @@
 class OutcomePresenter < NodePresenter
-  def initialize(i18n_prefix, node, state = nil, options = {})
-    super(i18n_prefix, node, state)
+  def initialize(node, state = nil, options = {})
+    super(node, state)
     @renderer = options[:renderer] || SmartAnswer::ErbRenderer.new(
       template_directory: @node.template_directory.join('outcomes'),
       template_name: @node.name.to_s,

app/presenters/question_presenter.rb

@@ -1,98 +1,53 @@
 class QuestionPresenter < NodePresenter
-  extend Forwardable
-  delegate [
-    :translate!,
-    :translate_and_render,
-    :translate_option
-  ] => :@renderer
-
-  delegate use_erb_template?: :@node
-
-  def initialize(i18n_prefix, node, state = nil, options = {})
-    super(i18n_prefix, node, state)
+  def initialize(node, state = nil, options = {})
+    super(node, state)
     @renderer = options[:renderer]
     helpers = options[:helpers] || []
-    if use_erb_template?
-      @renderer ||= SmartAnswer::ErbRenderer.new(
-        template_directory: @node.template_directory.join('questions'),
-        template_name: @node.filesystem_friendly_name,
-        locals: @state.to_hash,
-        helpers: [SmartAnswer::FormattingHelper] + helpers
-      )
-    else
-      @renderer ||= SmartAnswer::I18nRenderer.new(
-        i18n_prefix: @i18n_prefix,
-        node: @node,
-        state: @state
-      )
-    end
+    @renderer ||= SmartAnswer::ErbRenderer.new(
+      template_directory: @node.template_directory.join('questions'),
+      template_name: @node.filesystem_friendly_name,
+      locals: @state.to_hash,
+      helpers: [SmartAnswer::FormattingHelper] + helpers
+    )
   end
 
   def title
-    if use_erb_template?
-      @renderer.single_line_of_content_for(:title)
-    else
-      translate!('title', rescue_exception: false)
-    end
+    @renderer.single_line_of_content_for(:title)
   end
 
   def error
     if @state.error.present?
-      error_message_for(@state.error) || error_message_for('error_message') || I18n.translate('flow.defaults.error_message')
+      error_message_for(@state.error) || error_message_for('error_message') || default_error_message
     end
   end
 
   def error_message_for(key)
-    if use_erb_template?
-      message = @renderer.single_line_of_content_for(key.to_sym)
-      message.blank? ? nil : message
-    else
-      translate!(key)
-    end
+    message = @renderer.single_line_of_content_for(key.to_sym)
+    message.blank? ? nil : message
   end
 
   def hint
-    if use_erb_template?
-      @renderer.single_line_of_content_for(:hint)
-    else
-      translate!('hint')
-    end
+    @renderer.single_line_of_content_for(:hint)
   end
 
   def label
-    if use_erb_template?
-      @renderer.single_line_of_content_for(:label)
-    else
-      translate!('label')
-    end
+    @renderer.single_line_of_content_for(:label)
   end
 
   def suffix_label
-    if use_erb_template?
-      @renderer.single_line_of_content_for(:suffix_label)
-    else
-      translate!('suffix_label')
-    end
+    @renderer.single_line_of_content_for(:suffix_label)
   end
 
   def has_labels?
     label.present? || suffix_label.present?
   end
 
   def body(html: true)
-    if use_erb_template?
-      @renderer.content_for(:body, html: html)
-    else
-      translate_and_render('body', html: html)
-    end
+    @renderer.content_for(:body, html: html)
   end
 
   def post_body
-    if use_erb_template?
-      @renderer.content_for(:post_body, html: true)
-    else
-      translate_and_render('post_body', html: true)
-    end
+    @renderer.content_for(:post_body, html: true)
   end
 
   def options
@@ -102,11 +57,7 @@ def options
   end
 
   def render_option(key)
-    if use_erb_template?
-      @renderer.option_text(key.to_sym)
-    else
-      translate_option(key)
-    end
+    @renderer.option_text(key.to_sym)
   end
 
   def to_response(input)
@@ -124,4 +75,8 @@ def partial_template_name
   def multiple_responses?
     false
   end
+
+  def default_error_message
+    "Please answer this question"
+  end
 end

app/presenters/smart_answer_presenter.rb

@@ -22,10 +22,6 @@ def artefact
     {}
   end
 
-  def i18n_prefix
-    "flow.#{@flow.name}"
-  end
-
   def title
     start_node.title
   end
@@ -80,7 +76,7 @@ def presenter_for(node)
                         OutcomePresenter
                       else NodePresenter
                       end
-    presenter_class.new(i18n_prefix, node, current_state)
+    presenter_class.new(node, current_state)
   end
 
   def current_question_number
@@ -97,7 +93,7 @@ def current_node
 
   def start_node
     node = SmartAnswer::Node.new(@flow, @flow.name.underscore.to_sym)
-    StartNodePresenter.new(i18n_prefix, node)
+    StartNodePresenter.new(node)
   end
 
   def change_collapsed_question_link(question_number)

app/presenters/start_node_presenter.rb

@@ -1,6 +1,6 @@
 class StartNodePresenter < NodePresenter
-  def initialize(i18n_prefix, node, state = nil, options = {})
-    super(i18n_prefix, node, state)
+  def initialize(node, state = nil, options = {})
+    super(node, state)
     @renderer = options[:renderer] || SmartAnswer::ErbRenderer.new(
       template_directory: @node.template_directory,
       template_name: @node.name.to_s

config/application.rb

@@ -31,7 +31,6 @@ class Application < Rails::Application
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     config.i18n.enforce_available_locales = false
-    config.i18n.load_path += Dir[Rails.root.join(*%w{lib smart_answer_flows locales * *.{rb,yml}}).to_s]
     config.i18n.default_locale = :"en-GB"
 
     # Configure the default encoding used in templates for Ruby 1.9.

config/initializers/flow_preview.rb

@@ -9,4 +9,3 @@
 # Uncomment the following to run smartanswers with the test flows instead of the real ones
 #
 #FLOW_REGISTRY_OPTIONS[:load_path] = Rails.root.join('test', 'fixtures', 'flows')
-#I18n.load_path += Dir[Rails.root.join(*%w{test fixtures flows locales * *.{rb,yml}})]

config/locales/en.yml

@@ -2,14 +2,3 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en-GB:
-  date:
-    formats:
-      day_and_month: "%e %B"
-      long: "%e %B %Y"
-  flow:
-    defaults:
-      error_message: Please answer this question
-  holiday_pay:
-    error_messages:
-      invalid_hours: Please enter a valid amount of hours per week.
-      invalid_days: Please enter a valid amount of days per week.

lib/graph_presenter.rb

@@ -1,7 +1,6 @@
 class GraphPresenter
   def initialize(flow)
     @flow = flow
-    @i18n_prefix = "flow.#{@flow.name}"
   end
 
   def labels
@@ -79,7 +78,7 @@ def method_missing(method, *args, &block)
   end
 
   def node_title(node)
-    presenter = QuestionPresenter.new(@i18n_prefix, node, {}, helpers: [MethodMissingHelper])
+    presenter = QuestionPresenter.new(node, {}, helpers: [MethodMissingHelper])
     presenter.title
   end
 

lib/smart_answer/flow.rb

@@ -48,10 +48,6 @@ def status(s = nil)
       @status
     end
 
-    def use_erb_templates_for_questions
-      @use_erb_templates_for_questions = true
-    end
-
     def multiple_choice(name, options = {}, &block)
       add_question(Question::MultipleChoice, name, options, &block)
     end
@@ -136,7 +132,6 @@ class InvalidStatus < StandardError; end
     private
 
     def add_question(klass, name, options = {}, &block)
-      options.reverse_merge!(use_erb_template: @use_erb_templates_for_questions)
       add_node klass.new(self, name, options, &block)
     end