Config locale via I18n.locale

Author: yorkxin

app.rb

@@ -1,6 +1,8 @@
 require 'sinatra'
 require 'digest/md5'
 require 'erector'
+require 'i18n'
+require 'i18n/backend/fallbacks'
 
 #require 'wrong'
 #include Wrong::D
@@ -22,15 +24,28 @@
 class InstallFest < Sinatra::Application   # todo: use Sinatra::Base instead, with more explicit config
   include Erector::Mixin
 
+  # Set available locales in Array of Strings; this is also used when
+  # checking availability in dynamic locale assigment, so must be as Strings.
+  AVAILABLE_LOCALES = %w(en es)
+
+  configure do
+    I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+    I18n.load_path = Dir[File.join(settings.root, 'locales', '*.yml')]
+    I18n.backend.load_translations
+
+    I18n.available_locales = AVAILABLE_LOCALES
+    I18n.enforce_available_locales = true
+    I18n.default_locale = :en
+  end
+
   def initialize
     super
     @here = File.expand_path(File.dirname(__FILE__))
     @default_sites = {en: "docs", es: "hola"}
-    @default_locale = "en"
   end
 
-  attr_reader :here, :default_locale
-  attr_writer :default_site, :default_locale
+  attr_reader :here
+  attr_writer :default_site
 
   # todo: test
   # returns the most-specific hostname component, e.g. "foo" for "foo.example.com"
@@ -42,7 +57,7 @@ def default_site
     if host && sites.include?(site = subdomain)
       site
     else
-      @default_sites[locale.to_sym]
+      @default_sites[I18n.locale.to_sym] # no symbol DoS because it's whitelisted
     end
   end
 
@@ -55,7 +70,7 @@ def site_dir
   end
 
   def sites_dir
-    Site.sites_dir(locale)
+    Site.sites_dir(I18n.locale)
   end
 
   def sites
@@ -68,11 +83,18 @@ def redirect_sites
     }
   end
 
-  def locale
+  before do
+    begin
+      I18n.locale = dynamic_locale
+    rescue I18n::InvalidLocale
+      I18n.locale = I18n.default_locale
+    end
+  end
+
+  def dynamic_locale
     (params && (params[:locale] or params[:l])) or
-      (host && subdomain =~ /^..$/ && subdomain) or   # note: only allows 2-char locales for now -- should check against a list of locales
-      (ENV['SITE_LOCALE']) or
-      default_locale
+      (host && AVAILABLE_LOCALES.include?(subdomain) && subdomain) or
+      (ENV['SITE_LOCALE'])
   end
 
   def src
@@ -103,7 +125,7 @@ def render_page
         doc_path: doc_path,
         back: params[:back],
         src: src,
-        locale: locale,
+        locale: I18n.locale,
       }
 
       case ext

lib/site.rb

@@ -3,7 +3,7 @@ class Site
   @@project_root = File.dirname(@@here)
 
   def self.sites_dir locale = "en"
-    sites_dir = File.join(["sites", locale].compact)
+    sites_dir = File.join(["sites", locale.to_s].compact)
     File.expand_path(sites_dir, @@project_root)
   end
 

spec/app_spec.rb

@@ -68,23 +68,23 @@ def get! *args
     describe "learns the locale from" do
       it "the locale parameter" do
         true_app.params = {locale: 'es'}
-        assert { true_app.locale == 'es' }
+        assert { true_app.dynamic_locale == 'es' }
       end
 
       it "the l parameter" do
         true_app.params = {l: 'es'}
-        assert { true_app.locale == 'es' }
+        assert { true_app.dynamic_locale == 'es' }
       end
 
       it "the subdomain" do
         true_app.request = Rack::Request.new({"HTTP_HOST" => "es.example.com"})
-        assert { true_app.locale == 'es' }
+        assert { true_app.dynamic_locale == 'es' }
       end
 
       it "the SITE_LOCALE environment var" do
         begin
           ENV["SITE_LOCALE"] = "es"
-          assert { true_app.locale == 'es' }
+          assert { true_app.dynamic_locale == 'es' }
         ensure
           ENV["SITE_LOCALE"] = nil
         end

spec/site_syntax_spec.rb

@@ -18,7 +18,7 @@ def app
         describe "#{site.name} pages..." do
           site.docs.each do |doc|
             it "renders #{doc.filename}" do
-              path = "/#{site.name}/#{doc.name}"
+              path = URI.escape "/#{site.name}/#{doc.name}"
               get path, locale: locale
               if (last_response.status != 200)
                 errors = last_response.errors

spec/step_page_spec.rb

@@ -3,6 +3,7 @@
 require "step_page"
 
 describe StepPage do
+  before { I18n.locale = :en }
 
   # functional test -- brittle
   it "renders a step file" do

spec/step_spec.rb

@@ -3,6 +3,7 @@
 require "step_page"
 
 describe Step do
+  before { I18n.locale = :en }
 
   def to_html nokogiri_node
     nokogiri_node.serialize(:save_with => 0).chomp