radiant-reader-extension 1.3.7 → 1.3.8

data/VERSION

@@ -1 +1 @@
-1.3.7
+1.3.8

data/app/controllers/admin/messages_controller.rb

@@ -30,13 +30,13 @@ class Admin::MessagesController < Admin::ResourceController
     failures = @message.deliver(@readers) || []
     if failures.any?
       if failures.length == @readers.length
-        flash[:error] = "all_deliveries_failed"
+        flash[:error] = t("all_deliveries_failed")
       else
         addresses = failures.map(&:email).to_sentence
-        flash[:notice] = "some_deliveries_failed"
+        flash[:notice] = t("some_deliveries_failed")
       end
     else
-      flash[:notice] = "message_delivered"
+      flash[:notice] = t("message_delivered")
     end
     redirect_to admin_message_url(@message)
   end

data/app/models/reader.rb

@@ -50,6 +50,10 @@ class Reader < ActiveRecord::Base
     end
   }
 
+  def self.find_by_login_or_email(login_or_email)
+    reader = find(:first, :conditions => ["login = ? OR email = ?", login_or_email, login_or_email])
+  end
+
   def forename
     read_attribute(:forename) || name.split(/\s/).first
   end

data/app/models/reader_session.rb

@@ -1,3 +1,3 @@
 class ReaderSession < Authlogic::Session::Base
-
+  find_by_login_method :find_by_login_or_email
 end

data/app/views/admin/messages/show.html.haml

@@ -50,16 +50,16 @@
             %label.checkbox{:for => 'delivery_to_all', :class => @message.possible_readers.empty? ? 'disabled' : ''} 
               = t('everyone')
               = t('count_people', :count => @message.possible_readers.count)
-          %p
-            = radio_button_tag 'delivery', 'inactive', false, :id => 'delivery_to_inactive', :disabled => @message.inactive_readers.empty?
-            %label.checkbox{:for => 'delivery_to_inactive', :class => @message.inactive_readers.empty? ? 'disabled' : ''} 
-              = t('everyone_inactive')
-              = t('count_people', :count => @message.inactive_readers.count)
           %p
             = radio_button_tag 'delivery', 'unsent', false, :id => 'delivery_to_unsent', :disabled => @message.undelivered_readers.empty?
             %label.checkbox{:for => 'delivery_to_unsent', :class => @message.undelivered_readers.empty? ? 'disabled' : ''} 
               = t('everyone_unsent')
               = t('count_people', :count => @message.undelivered_readers.count)
+          %p
+            = radio_button_tag 'delivery', 'inactive', false, :id => 'delivery_to_inactive', :disabled => @message.inactive_readers.empty?
+            %label.checkbox{:for => 'delivery_to_inactive', :class => @message.inactive_readers.empty? ? 'disabled' : ''} 
+              = t('everyone_inactive')
+              = t('count_people', :count => @message.inactive_readers.count)
 
           %p.buttons
             = submit_tag t('send_message')

data/app/views/reader_sessions/_login_form.html.haml

@@ -27,7 +27,7 @@
 
     %p{ :class => @reader_session.errors.on(:login) ? 'haserror' : '' }
       %label{:for => "reader_session_login"}
-        = t('username').titlecase
+        = t('login_or_email')
       %br
       = f.text_field :login, :class => 'login' 
         

data/config/locales/en.yml

@@ -45,12 +45,13 @@ en:
   enter_code: "Please enter confirmation code"
   enter_email_for_reminder: "enter your email address and we will send the message again"
   enter_own_password: "First, just to make sure you're you, please enter your current password:"
+  everyone_in_group: "Everyone in the group"
   forgotten_password: "Forgotten your password?"
   form_notes:
     description: "you can fill this in later. Textile formatting is allowed."
     email: "we will send activation instructions to this address"
     existing_password: "leave blank to keep present password. If changing, at least four characters."
-    login: "leave blank to use your email address"
+    login: "you can always use your email address instead"
     name: "this is how you will be credited on the site"
     new_password: "at least four characters, please"
     honorific: "this is prepended to your name when you are credited"
@@ -78,6 +79,7 @@ en:
   log_in_or_register: "To use this part of the site you need to be logged in. It's easy to get an account: if you have received an invitation, please follow the instructions in that message. Otherwise, please <a href='/register'>register here</a>. It only takes a moment."
   log_out: "log out"
   login_name: "Login name"
+  login_or_email: "Login name or email address"
   login_unknown: "Sorry: we don't recognise that combination of username and password."
   logout_message: "You are logged out. Bye!"
   must_be_empty: "must be empty"

data/radiant-reader-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-reader-extension}
-  s.version = "1.3.7"
+  s.version = "1.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["spanner"]

data/reader_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class ReaderExtension < Radiant::Extension
-  version "1.3.7"
+  version "1.3.8"
   description "Provides reader/member/user registration and management functions"
   url "http://spanner.org/radiant/reader"
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 3
-  - 7
-  version: 1.3.7
+  - 8
+  version: 1.3.8
 platform: ruby
 authors: 
 - spanner