Merge branch 'master' into development

Author: simukappu

CHANGELOG.md

@@ -330,7 +330,7 @@ Enhancements:
 
 Bug Fixes:
 
-* Fix a bug which ActivityNotificaion.config.mailer configuration was ignored
+* Fix a bug which ActivityNotification.config.mailer configuration was ignored
 
 ## 1.4.1 / 2017-05-17
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v1.4.0...v1.4.1)

app/channels/activity_notification/notification_api_with_devise_channel.rb

@@ -18,7 +18,7 @@ def find_current_target(devise_type = nil)
       end
 
       # Set @target instance variable from request parameters.
-      # This method overrides super (ActivityNotiication::NotificationChannel#set_target)
+      # This method overrides super (ActivityNotification::NotificationChannel#set_target)
       # to set devise authenticated target when the target_id params is not specified.
       # @api protected
       # @return [Object] Target instance (Reject subscription when request parameters are not enough)

app/channels/activity_notification/notification_with_devise_channel.rb

@@ -23,7 +23,7 @@ def session
       end
 
       # Sets @target instance variable from request parameters.
-      # This method override super (ActivityNotiication::NotificationChannel#set_target)
+      # This method override super (ActivityNotification::NotificationChannel#set_target)
       # to set devise authenticated target when the target_id params is not specified.
       # @api protected
       # @return [Object] Target instance (Reject subscription when request parameters are not enough)

app/jobs/activity_notification/notify_all_job.rb

@@ -16,8 +16,8 @@ class ActivityNotification::NotifyAllJob < ActivityNotification.config.parent_jo
     # @option options [Boolean]                 :send_email               (true)                                Whether it sends notification email
     # @option options [Boolean]                 :send_later               (true)                                Whether it sends notification email asynchronously
     # @option options [Boolean]                 :publish_optional_targets (true)                                Whether it publishes notification to optional targets
-    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc) and values are options
-    # @return [Array<Notificaion>] Array of generated notifications
+    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc.) and values are options
+    # @return [Array<Notification>] Array of generated notifications
     def perform(targets, notifiable, options = {})
       ActivityNotification::Notification.notify_all(targets, notifiable, options)
     end

app/jobs/activity_notification/notify_job.rb

@@ -17,8 +17,8 @@ class ActivityNotification::NotifyJob < ActivityNotification.config.parent_job.c
     # @option options [Boolean]                 :send_later               (true)                                Whether it sends notification email asynchronously
     # @option options [Boolean]                 :publish_optional_targets (true)                                Whether it publishes notification to optional targets
     # @option options [Boolean]                 :pass_full_options        (false)                               Whether it passes full options to notifiable.notification_targets, not a key only
-    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc) and values are options
-    # @return [Array<Notificaion>] Array of generated notifications
+    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc.) and values are options
+    # @return [Array<Notification>] Array of generated notifications
     def perform(target_type, notifiable, options = {})
       ActivityNotification::Notification.notify(target_type, notifiable, options)
     end

app/jobs/activity_notification/notify_to_job.rb

@@ -16,7 +16,7 @@ class ActivityNotification::NotifyToJob < ActivityNotification.config.parent_job
     # @option options [Boolean]                 :send_email               (true)                                Whether it sends notification email
     # @option options [Boolean]                 :send_later               (true)                                Whether it sends notification email asynchronously
     # @option options [Boolean]                 :publish_optional_targets (true)                                Whether it publishes notification to optional targets
-    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc) and values are options
+    # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc.) and values are options
     # @return [Notification] Generated notification instance
     def perform(target, notifiable, options = {})
       ActivityNotification::Notification.notify_to(target, notifiable, options)

app/mailers/activity_notification/mailer.rb

@@ -1,5 +1,5 @@
 if defined?(ActionMailer)
-  # Mailer for email notification of ActivityNotificaion.
+  # Mailer for email notification of ActivityNotification.
   class ActivityNotification::Mailer < ActivityNotification.config.parent_mailer.constantize
     include ActivityNotification::Mailers::Helpers
 

app/views/activity_notification/mailer/default/batch_default.text.erb

@@ -1,6 +1,6 @@
 Dear <%= @target.printable_target_name %>
 
-You have recieved follwing notifications.
+You have received the following notifications.
 
 <% @notifications.each do |notification| %>
 <%= notification.notifier.present? ? notification.notifier.printable_notifier_name : 'Someone' %> notified you of <%= notification.notifiable.printable_notifiable_name(notification.target) %><%= " in #{notification.group.printable_group_name}" if notification.group.present? %>.

app/views/activity_notification/notifications/default/index.html.erb

@@ -67,7 +67,7 @@
             $(".notifications").prepend(notification.group_owner_view);
             $(".notification_count").html("<span class=unopened>" + notification.unopened_notification_count + "</span>");
           }
-          // Push notificaion using Web Notification API by Push.js
+          // Push notification using Web Notification API by Push.js
           Push.create('ActivityNotification', {
             body: notification.text,
             timeout: 5000,

app/views/activity_notification/subscriptions/default/_notification_keys.html.erb

@@ -49,7 +49,7 @@
             <% target.notifications.filtered_by_key(key).latest.optional_target_names.each do |optional_target_name| %>
               <div class="field_label">
                 <label>
-                  Optional tagret (<%= optional_target_name %>)
+                  Optional target (<%= optional_target_name %>)
                 </label>
               </div>
               <div class="field">