github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:sharelatex/web-sharelatex

Browse source
This commit is contained in:
James Allen 2014-10-15 14:11:11 +01:00
commit 4f2ab51ebd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/coffee/Features/Subscription/SubscriptionController.coffee
View file

@ -22,7 +22,7 @@ module.exports = SubscriptionController =
if req.query.v?
viewName = "#{viewName}_#{req.query.v}"
logger.log viewName:viewName, "showing plans page"
GeoIpLookup.getCurrencyCode req.ip, (err, recomendedCurrency)->
GeoIpLookup.getCurrencyCode req.query?.ip || req.ip, (err, recomendedCurrency)->
res.render viewName,
title: "plans_and_pricing"
plans: plans
@ -41,7 +41,7 @@ module.exports = SubscriptionController =
res.redirect "/user/subscription"
else
currency = req.query.currency?.toUpperCase()
GeoIpLookup.getCurrencyCode req.ip, (err, recomendedCurrency)->
GeoIpLookup.getCurrencyCode req.query?.ip || req.ip, (err, recomendedCurrency)->
return next(err) if err?
if recomendedCurrency? and !currency?
currency = recomendedCurrency

2
services/web/app/views/subscriptions/plans.jade
View file

@ -165,7 +165,7 @@ block content
) #{translate("buy_now")}
.row.row-spaced(ng-cloak)
p.text-centered #{translate("choose_plan_works_for_you", {len:14})}
p.text-centered #{translate("choose_plan_works_for_you", {len:'{{trial_len}}'})}
.row(ng-cloak)
.col-md-8.col-md-offset-2