Commit 3521ee5

authored

Merge pull request #60 from robdaemon/handle-locales-for-formatters

Clojureifying names breaks under exotic locales

2 parents cc50f80 + c7e9711 commit 3521ee5Copy full SHA for 3521ee5

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,14 @@`
`4`	`4`	`[java-time.core :as jt.c]`
`5`	`5`	`[java-time.util :as jt.u])`
`6`	`6`	`(:import [java.time.temporal TemporalAccessor]`
`7`		`- [java.time.format DateTimeFormatter DateTimeFormatterBuilder ResolverStyle]))`
	`7`	`+ [java.time.format DateTimeFormatter DateTimeFormatterBuilder ResolverStyle]`
	`8`	`+ java.util.Locale))`
`8`	`9`
`9`	`10`	`(def predefined-formatters`
`10`	`11`	`(->> (jt.u/get-static-fields-of-type DateTimeFormatter DateTimeFormatter)`
`11`	`12`	`(jt.u/map-kv`
`12`		`- (fn [^String n fmt]`
`13`		`- [(string/lower-case (.replace n \_ \-)) fmt]))))`
	`13`	`+ (fn [^String n fmt]`
	`14`	`+ [(.. (.replace n \_ \-) toString (toLowerCase (Locale/US))) fmt]))))`
`14`	`15`
`15`	`16`	`(defn- get-resolver-style [s]`
`16`	`17`	`(if (instance? ResolverStyle s) s`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`(ns java-time-test`
`2`	`2`	`(:require [clojure.test :refer :all]`
`3`	`3`	`[java-time.util :as jt.u]`
`4`		`- [java-time :as j]))`
	`4`	`+ [java-time :as j])`
	`5`	`+ (:import java.util.Locale))`
`5`	`6`
`6`	`7`	`(def clock (j/fixed-clock "2015年11月26日T10:20:30.000000040Z" "UTC"))`
`7`	`8`
`@@ -846,3 +847,14 @@`
`846`	`847`	`(is (= (j/offset-time joda-clock)`
`847`	`848`	`(j/offset-time (DateTime. 2015 11 26 10 20 30 40 (DateTimeZone/forID "UTC"))))))))`
`848`	`849`
	`850`	`+(deftest locale-test`
	`851`	`+ (let [current-locale (Locale/getDefault)`
	`852`	`+ test-langs ["en" "tr" "cn"]]`
	`853`	`+ (testing "locale specific rules for lower-case can cause formatters to not be found"`
	`854`	`+ (doseq [lang test-langs]`
	`855`	`+ (testing lang`
	`856`	`+ (try`
	`857`	`+ (Locale/setDefault (Locale/forLanguageTag lang))`
	`858`	`+ (is (some? (j/formatter :rfc-1123-date-time)))`
	`859`	`+ (finally`
	`860`	`+ (Locale/setDefault current-locale))))))))`

Comments

(0)