Skip to content
This repository has been archived by the owner on Nov 16, 2020. It is now read-only.

1.1 #4

Merged
merged 2 commits into from
Oct 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions Config/clients.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"tls": {
"verifyHost": true,
"verifyCertificates": true,
"certificates": "mozilla"
}
}
21 changes: 21 additions & 0 deletions Config/droplet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"server": "engine",
"client": "engine",
"console": "terminal",
"log": "console",
"hash": "crypto",
"cipher": "crypto",
"middleware": {
"server": [
"file",
"abort",
"validation",
"type-safe",
"date",
"sessions"
],
"client": [

]
}
}
13 changes: 0 additions & 13 deletions Config/middleware.json

This file was deleted.

File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PackageDescription
let package = Package(
name: "VaporApp",
dependencies: [
.Package(url: "https://github.com/vapor/vapor.git", majorVersion: 1, minor: 0)
.Package(url: "https://github.com/vapor/vapor.git", majorVersion: 1, minor: 1)
],
exclude: [
"Config",
Expand Down
3 changes: 1 addition & 2 deletions Sources/App/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ import Vapor
let drop = Droplet()

drop.get { req in
let lang = req.headers["Accept-Language"]?.string ?? "en"
return try drop.view.make("welcome", [
"message": Node.string(drop.localization[lang, "welcome", "title"])
"message": drop.localization[req.lang, "welcome", "title"]
])
}

Expand Down