fix bug which showed all plans as monthly in payment form.

Also use translations for string of month/year

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

@@ -42,8 +42,9 @@ block content
 								.col-md-12.text-center
 									div(ng-if="trialLength") !{translate("first_few_days_free", {trialLen:'{{trialLength}}'})}
 									div(ng-if="price")
-										strong {{price.currency.symbol}}{{price.next.total}}
-										span  #{translate("every")} {{billingCycleType}}
+										strong {{price.currency.symbol}}{{price.next.total}} 
+										span(ng-if="monthlyBilling")  #{translate("every")} #{translate("month")}
+										span(ng-if="!monthlyBilling")  #{translate("every")} #{translate("year")}
 						.row
 							.col-md-12
 								form(ng-show="planName")

services/web/public/coffee/main/new-subscription.coffee

@@ -54,7 +54,7 @@ define [
 			$scope.planName = pricing.items.plan.name
 			$scope.price = pricing.price
 			$scope.trialLength = pricing.items.plan.trial?.length
-			$scope.billingCycleType = if pricing.items.plan.period.interval == "months" then "month" else "year"
+			$scope.monthlyBilling = pricing.items.plan.period.length == 1
 			$scope.$apply()
 
 		$scope.applyCoupon = ->