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

services/web/app/coffee/Features/Subscription/SubscriptionController.coffee

@@ -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

services/web/app/views/subscriptions/plans.jade

@@ -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