From fab37d56836cd9ecbc828874c8c1165139d7fee8 Mon Sep 17 00:00:00 2001
From: simon <simon@journeyman.cc>
Date: Fri, 8 Sep 2017 16:04:08 +0100
Subject: [PATCH] #25: Fix (awaiting tidy up)

This is a fix, but it's a fix against the `develop` branch of [internationalisation](https://github.com/simon-brooke/internationalisation), so I need to do a new release of internationalisation before I call this a full fix.
---
 project.clj                           |  2 +-
 resources/{public => }/i18n/en-GB.edn |  0
 resources/{public => }/i18n/en.edn    |  0
 src/smeagol/handler.clj               | 18 +++++++++---------
 src/smeagol/layout.clj                |  2 +-
 src/smeagol/routes/wiki.clj           | 12 ++++++------
 src/smeagol/util.clj                  |  6 ++++--
 7 files changed, 21 insertions(+), 19 deletions(-)
 rename resources/{public => }/i18n/en-GB.edn (100%)
 rename resources/{public => }/i18n/en.edn (100%)

diff --git a/project.clj b/project.clj
index 98d4e2a..7818363 100644
--- a/project.clj
+++ b/project.clj
@@ -8,7 +8,7 @@
                  [org.clojure/core.memoize "0.5.9"]
                  [org.clojure/data.json "0.2.6"]
                  [org.clojure/tools.logging "0.4.0"]
-                 [org.clojars.simon_brooke/internationalisation "1.0.1-SNAPSHOT"]
+                 [org.clojars.simon_brooke/internationalisation "1.0.3-SNAPSHOT"]
                  [clj-jgit "0.8.9"]
                  [clj-yaml "0.4.0"]
                  [com.cemerick/url "0.1.1"]
diff --git a/resources/public/i18n/en-GB.edn b/resources/i18n/en-GB.edn
similarity index 100%
rename from resources/public/i18n/en-GB.edn
rename to resources/i18n/en-GB.edn
diff --git a/resources/public/i18n/en.edn b/resources/i18n/en.edn
similarity index 100%
rename from resources/public/i18n/en.edn
rename to resources/i18n/en.edn
diff --git a/src/smeagol/handler.clj b/src/smeagol/handler.clj
index fba89d9..9cfd6a0 100644
--- a/src/smeagol/handler.clj
+++ b/src/smeagol/handler.clj
@@ -2,19 +2,19 @@
       :author "Simon Brooke"}
   smeagol.handler
   (:require [compojure.core :refer [defroutes]]
+            [compojure.route :as route]
+            [cronj.core :as cronj]
+            [environ.core :refer [env]]
+            [noir.response :refer [redirect]]
+            [noir.session :as session]
+            [noir.util.middleware :refer [app-handler]]
+            [ring.middleware.defaults :refer [site-defaults]]
+            [selmer.parser :as parser]
             [smeagol.routes.wiki :refer [wiki-routes]]
             [smeagol.middleware :refer [load-middleware]]
             [smeagol.session-manager :as session-manager]
-            [noir.response :refer [redirect]]
-            [noir.util.middleware :refer [app-handler]]
-            [noir.session :as session]
-            [ring.middleware.defaults :refer [site-defaults]]
-            [compojure.route :as route]
             [taoensso.timbre :as timbre]
-            [taoensso.timbre.appenders.3rd-party.rotor :as rotor]
-            [selmer.parser :as parser]
-            [environ.core :refer [env]]
-            [cronj.core :as cronj]))
+            [taoensso.timbre.appenders.3rd-party.rotor :as rotor]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;
diff --git a/src/smeagol/layout.clj b/src/smeagol/layout.clj
index e9fe63d..5caeb7b 100644
--- a/src/smeagol/layout.clj
+++ b/src/smeagol/layout.clj
@@ -46,7 +46,7 @@
     (let [messages (:i18n context-map)
           default (or (second args) (first args))]
       (timbre/info (str "i18n: key is " (first args) " messages map is " messages))
-      (if (map? messages) (get messages (keyword (first args)) default) default))))
+      (if (map? messages) (or (messages (keyword (first args))) default) default))))
 
 
 (deftype RenderableTemplate [template params]
diff --git a/src/smeagol/routes/wiki.clj b/src/smeagol/routes/wiki.clj
index 771aef0..d951000 100644
--- a/src/smeagol/routes/wiki.clj
+++ b/src/smeagol/routes/wiki.clj
@@ -1,25 +1,25 @@
 (ns ^{:doc "Render all the main pages of a very simple Wiki engine."
       :author "Simon Brooke"}
   smeagol.routes.wiki
-  (:require [clojure.walk :refer :all]
+  (:require [cemerick.url :refer (url url-encode url-decode)]
+            [clj-jgit.porcelain :as git]
             [clojure.java.io :as cjio]
             [clojure.string :as cs]
-            [cemerick.url :refer (url url-encode url-decode)]
+            [clojure.walk :refer :all]
             [compojure.core :refer :all]
-            [clj-jgit.porcelain :as git]
             [noir.io :as io]
             [noir.response :as response]
             [noir.util.route :as route]
             [noir.session :as session]
-            [taoensso.timbre :as timbre]
             [smeagol.authenticate :as auth]
             [smeagol.diff2html :as d2h]
             [smeagol.formatting :refer [md->html]]
+            [smeagol.history :as hist]
             [smeagol.layout :as layout]
+            [smeagol.routes.admin :as admin]
             [smeagol.util :as util]
             [smeagol.uploads :as ul]
-            [smeagol.history :as hist]
-            [smeagol.routes.admin :as admin]))
+            [taoensso.timbre :as timbre]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;
diff --git a/src/smeagol/util.clj b/src/smeagol/util.clj
index 5dad171..2059881 100644
--- a/src/smeagol/util.clj
+++ b/src/smeagol/util.clj
@@ -58,9 +58,11 @@
   (merge
     (i18n/get-messages
       ((:headers request) "accept-language")
-      (cjio/file (io/resource-path) "i18n")
+;;      (cjio/file (io/resource-path) "i18n")
+      "i18n"
       "en-GB")
-    config))
+    config)
+  )
 
 
 (def get-messages (memoize raw-get-messages))