Merge branch 'week' into dev

app/assets/templates/admin/plans/_form.html.erb

@@ -49,6 +49,7 @@
             ng-model="plan.interval"
             ng-disabled="method == 'PATCH'"
             required="required">
+        <option value="week" ng-selected="plan.interval == 'week'" translate>{{ 'plan_form.week' }}</option>
         <option value="month" ng-selected="plan.interval == 'month'" translate>{{ 'plan_form.month' }}</option>
         <option value="year" ng-selected="plan.interval == 'year'" translate>{{ 'plan_form.year' }}</option>
     </select>

app/models/plan.rb

@@ -27,7 +27,7 @@ class Plan < ActiveRecord::Base
 
   validates :amount, :group, :base_name, presence: true
   validates :interval_count, numericality: { only_integer: true, greater_than_or_equal_to: 1 }
-  validates :interval, inclusion: { in: %w(year month) }
+  validates :interval, inclusion: { in: %w(year month week) }
   validates :base_name, :slug, presence: true
 
   def self.create_for_all_groups(plan_params)

config/locales/app.shared.en.yml

@@ -213,6 +213,7 @@ en:
           period: "Period"
           year: "Year"
           month: "Month"
+          week: "Week"
           period_is_required: "Period is required."
           subscription_price: "Subscription price"
           price_is_required: "Price is required."

config/locales/app.shared.fr.yml

@@ -213,6 +213,7 @@ fr:
           period: "Période"
           year: "Année"
           month: "Mois"
+          week: "Semaine"
           period_is_required: "La période est requise."
           subscription_price: "Coût de l'abonnement"
           price_is_required: "Le prix est requis."