saucy 0.2.30 → 0.2.31

data/app/mailers/billing_mailer.rb

@@ -20,10 +20,10 @@ class BillingMailer < ActionMailer::Base
 
   def expiring_trial(account)
     @account = account
-    mail(:to       => account.customer.email,
-         :subject  => I18n.t(:subject,
-                             :scope   => [:saucy, :mailers, :billing_mailer, :expiring_tiral],
-                             :default => "Your trial is expiring soon"),
-         :from     => Saucy::Configuration.mailer_sender)
+    mail(:to      => account.customer.email,
+         :subject => I18n.t(:subject,
+                            :scope   => [:billing_mailer, :expiring_tiral],
+                            :default => "Your trial is expiring soon"),
+         :from    => Saucy::Configuration.mailer_sender)
   end
 end

data/app/views/billing_mailer/expiring_trial.text.erb

@@ -1,16 +1,12 @@
-Thanks for giving us a try!
+<%= t(".greeting") %>
 
-Your 30 day trial for <%= @account.name %> is expiring soon. We hope that
-you've enjoyed <%= t("app_name") %> enough to sign up for a paid subscription.
-If you'd like to continue using your account, please take a moment to choose
-a paid plan:
+<%= t(".expiration_notice",
+      :account_name => @account.name,
+      :app_name => t("app_name")) %>
 
 <%= edit_account_plan_url(@account) %>
 
-If you need more time to evaluate <%= t("app_name") %> or you have any questions,
-please don't hesitate to contact us.
-
-<%= t("support_contact_info") %>
+<%= t(".contact", :app_name => t("app_name")) %>
 
 ============================================================
 

data/config/locales/en.yml

@@ -2,7 +2,6 @@ en:
   app_name: App Name
   app_url: 'http://example.com'
   support_email: support@example.com
-  supprt_contact_info: support@example.com
   saucy:
     billing_address: Billing Address
     errors:
@@ -12,4 +11,9 @@ en:
       expired:
         admin: Your account's trial has expired. Please upgrade to another plan.
         user: This account's trial has expired. Please have an administrator on the account upgrade to another plan.
+  billing_mailer:
+    expiring_trial:
+      greeting: Thanks for giving us a try!
+      expiration_notice: "Your 30 day trial for %{account_name} is expiring soon. I hope that you've enjoyed %{app_name} enough to sign up for a paid subscription.  If you'd like to continue using your account, please take a moment to choose a paid plan:"
+      contact: "If you need more time to evaluate %{app_name} or you have any questions, please don't hesitate to contact me."
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 2
-  - 30
-  version: 0.2.30
+  - 31
+  version: 0.2.31
 platform: ruby
 authors: 
 - thoughtbot, inc.