simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#25: Fix (awaiting tidy up)

Browse source 
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.
This commit is contained in:
simon 2017-09-08 16:04:08 +01:00
parent 335c2f2329
commit fab37d5683
7 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project.clj
View file

@ -8,7 +8,7 @@
[org.clojure/core.memoize "0.5.9"] [org.clojure/core.memoize "0.5.9"]
[org.clojure/data.json "0.2.6"] [org.clojure/data.json "0.2.6"]
[org.clojure/tools.logging "0.4.0"] [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-jgit "0.8.9"]
[clj-yaml "0.4.0"] [clj-yaml "0.4.0"]
[com.cemerick/url "0.1.1"] [com.cemerick/url "0.1.1"]

0
resources/public/i18n/en-GB.edn → resources/i18n/en-GB.edn
View file

0
resources/public/i18n/en.edn → resources/i18n/en.edn
View file

18
src/smeagol/handler.clj
View file

@ -2,19 +2,19 @@
:author "Simon Brooke"} :author "Simon Brooke"}
smeagol.handler smeagol.handler
(:require [compojure.core :refer [defroutes]] (: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.routes.wiki :refer [wiki-routes]]
[smeagol.middleware :refer [load-middleware]] [smeagol.middleware :refer [load-middleware]]
[smeagol.session-manager :as session-manager] [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 :as timbre]
[taoensso.timbre.appenders.3rd-party.rotor :as rotor] [taoensso.timbre.appenders.3rd-party.rotor :as rotor]))
[selmer.parser :as parser]
[environ.core :refer [env]]
[cronj.core :as cronj]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;; ;;;;

2
src/smeagol/layout.clj
View file

@ -46,7 +46,7 @@
(let [messages (:i18n context-map) (let [messages (:i18n context-map)
default (or (second args) (first args))] default (or (second args) (first args))]
(timbre/info (str "i18n: key is " (first args) " messages map is " messages)) (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] (deftype RenderableTemplate [template params]

12
src/smeagol/routes/wiki.clj
View file

@ -1,25 +1,25 @@
(ns ^{:doc "Render all the main pages of a very simple Wiki engine." (ns ^{:doc "Render all the main pages of a very simple Wiki engine."
:author "Simon Brooke"} :author "Simon Brooke"}
smeagol.routes.wiki 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.java.io :as cjio]
[clojure.string :as cs] [clojure.string :as cs]
[cemerick.url :refer (url url-encode url-decode)] [clojure.walk :refer :all]
[compojure.core :refer :all] [compojure.core :refer :all]
[clj-jgit.porcelain :as git]
[noir.io :as io] [noir.io :as io]
[noir.response :as response] [noir.response :as response]
[noir.util.route :as route] [noir.util.route :as route]
[noir.session :as session] [noir.session :as session]
[taoensso.timbre :as timbre]
[smeagol.authenticate :as auth] [smeagol.authenticate :as auth]
[smeagol.diff2html :as d2h] [smeagol.diff2html :as d2h]
[smeagol.formatting :refer [md->html]] [smeagol.formatting :refer [md->html]]
[smeagol.history :as hist]
[smeagol.layout :as layout] [smeagol.layout :as layout]
[smeagol.routes.admin :as admin]
[smeagol.util :as util] [smeagol.util :as util]
[smeagol.uploads :as ul] [smeagol.uploads :as ul]
[smeagol.history :as hist] [taoensso.timbre :as timbre]))
[smeagol.routes.admin :as admin]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;; ;;;;

6
src/smeagol/util.clj
View file

@ -58,9 +58,11 @@
(merge (merge
(i18n/get-messages (i18n/get-messages
((:headers request) "accept-language") ((:headers request) "accept-language")
(cjio/file (io/resource-path) "i18n") ;; (cjio/file (io/resource-path) "i18n")
"i18n"
"en-GB") "en-GB")
config)) config)
)
(def get-messages (memoize raw-get-messages)) (def get-messages (memoize raw-get-messages))