Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[VIV-25729] localized configs #13

Merged
merged 2 commits into from Mar 15, 2019
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
16 changes: 14 additions & 2 deletions code/book/CommitOrder.js
@@ -1,10 +1,22 @@
var dates = require('dates')
var config = require('config')
module.exports.function = function (order) {
var console = require('console')
module.exports.function = function (order, $vivContext) {
var relevantHours = getLocalizedRelevantHours($vivContext)
console.info($vivContext.locale, "relevant hours", relevantHours)
return {
$id: "" + Math.floor(Math.random() * 10000000),
item: order.item,
buyer: order.buyer,
relevantDateTime: dates.ZonedDateTime.fromDate(order.item.dateInterval.start).minusHours(config.get("relevantHours")).getDateTime()
relevantDateTime: dates.ZonedDateTime.fromDate(order.item.dateInterval.start).minusHours(relevantHours).getDateTime()
}
}

function getLocalizedRelevantHours($vivContext) {
switch($vivContext.locale.split('-')[0]) {
case "ko":
return config.get('ko.relevantHours')
default:
return config.get('base.relevantHours')
}
}
5 changes: 2 additions & 3 deletions code/book/FindPods.js
@@ -1,6 +1,5 @@
var config = require('config')
module.exports.function = function (spaceResort, numberOfAstronauts, dateInterval) {
switch (config.get("locale")) {
module.exports.function = function (spaceResort, numberOfAstronauts, dateInterval, $vivContext) {
switch ($vivContext.locale.split('-')[0]) {
case "ko" :
return [{
name: "허니문",
Expand Down
4 changes: 2 additions & 2 deletions code/find/FindSpaceResorts.js
@@ -1,5 +1,5 @@
const main = require("./lib/main.js")

module.exports.function = function findSpaceResorts (name, planet, searchCriteria) {
return main.findSpaceResorts(name, planet, searchCriteria);
module.exports.function = function findSpaceResorts (name, planet, searchCriteria, $vivContext) {
return main.findSpaceResorts(name, planet, searchCriteria, $vivContext);
}
4 changes: 2 additions & 2 deletions code/find/SelectResort.js
@@ -1,5 +1,5 @@
const main = require("./lib/main.js")

module.exports.function = function (resorts, name, planet, searchCriteria) {
return main.selectSpaceResorts(resorts, name, planet, searchCriteria);
module.exports.function = function (resorts, name, planet, searchCriteria, $vivContext) {
return main.selectSpaceResorts(resorts, name, planet, searchCriteria, $vivContext);
}
15 changes: 7 additions & 8 deletions code/find/lib/main.js
@@ -1,19 +1,18 @@
const data = require("./spaceResorts.js")
const sorts = require("./sorts.js")
var config = require('config')
var textLib = require('textLib')

module.exports = {
"findSpaceResorts": findSpaceResorts,
"selectSpaceResorts": selectSpaceResorts
}

function findSpaceResorts(name, planet, searchCriteria) {
return filterSpaceResorts(data, name, planet, searchCriteria)
function findSpaceResorts(name, planet, searchCriteria, $vivContext) {
return filterSpaceResorts(data($vivContext.locale), name, planet, searchCriteria, $vivContext)
}

function selectSpaceResorts(resorts, name, planet, searchCriteria) {
var candidates = data;
function selectSpaceResorts(resorts, name, planet, searchCriteria, $vivContext) {
var candidates = data($vivContext.locale);
if (resorts) {
//keep candidates that are in resorts (not a efficient!)
candidates = candidates.filter(function(candidate) {
Expand All @@ -24,11 +23,11 @@ function selectSpaceResorts(resorts, name, planet, searchCriteria) {
})
})
}
candidates = filterSpaceResorts(candidates, name, planet, searchCriteria)
candidates = filterSpaceResorts(candidates, name, planet, searchCriteria, $vivContext)
return candidates
}

function filterSpaceResorts(candidates, name, planet, searchCriteria) {
function filterSpaceResorts(candidates, name, planet, searchCriteria, $vivContext) {

if (name) {
candidates = candidates.filter(function(candidate){
Expand All @@ -50,7 +49,7 @@ function filterSpaceResorts(candidates, name, planet, searchCriteria) {
return amenity.keywords.find(function(keyword) {
keyword = keyword.toLowerCase()

if (config.get("locale") == "ko") {
if ($vivContext.locale.split('-')[0] === "ko") {
return textLib.levenshteinDistance(keyword, searchCriterion) < 1
}
else {
Expand Down