radiant-reader-extension 0.9.2 → 1.0.0

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

@@ -2,37 +2,39 @@
 
 - if current_reader
   %p
-    You are currently logged in as
+    = t('logged_in_as')
     %strong
       = current_reader.name
     - unless current_reader.activated?
-      but your account is not yet activated. Please check your email for our activation message. 
+      = t('but_not_active')
     
   - if current_reader.activated?
     %p
-      If that's not you, or you want to log in with another account, please 
-      = link_to "log out", reader_logout_url
+      =t('if_not_you')
+      = link_to t("log_out"), reader_logout_url
   - else
     %p
-      If you can't find the message, we can 
-      = link_to("send it again", new_reader_activation_url) + '.'
+      =t('if_cant_find')
+      = link_to(t("send_it_again"), new_reader_activation_url) + '.'
     %p
-      If you're not
-      = current_reader.name 
-      or you think you might have put the wrong email address in, please
+      =t('if_not_you')
+      =t('or')
+      =t('wrong_email')
+      =t('please')
       = link_to "log out", reader_logout_url
-      and you will be able to register or log in normally.
+      =t('and_try_again')
       
 - else
   - if flash[:explanation]
     %p
-      = flash[:explanation]
+      = t(flash[:explanation])
       
   = render :partial => 'login_form', :locals => {:no_title => true}
 
 - content_for :breadcrumbs do
-  = link_to 'Readers', '/readers'
-  > Log in
+  = link_to t('home').titlecase, '/' 
+  > 
+  = t('log_in').titlecase
 
-- content_for :pagetitle do
-  Log in
+- content_for :title do
+  = t('log_in')

data/app/views/readers/_flasher.html.haml

@@ -1,6 +1,6 @@
 - if flash[:notice]
   .notice
-    %p= flash[:notice]
+    %p= t(flash[:notice])
 - if flash[:error]
   .error
-    %p= flash[:error]
+    %p= t(flash[:error])

data/app/views/readers/_form.html.haml

@@ -1,72 +1,66 @@
-- with_error_report(@reader.errors.on(:name)) do
-  = f.label :name, 'Your name', :class => 'required'
-  %span.formnote as you would like it to appear
+%p
+  = f.label :name, t('your_name'), :class => 'required'
+  %span.formnote= t('name_notes')
   %br
   = f.text_field :name, :class => 'standard'
 
 - if Radiant::Config['reader.use_honorifics?']
-  - with_error_report(@reader.errors.on(:honorific)) do
-    = f.label :honorific, 'Title or rank', :class => 'optional'
-    %span.formnote as you would like us to display it when you are credited
+  %p
+    = f.label :honorific, t(:honorific), :class => 'optional'
+    %span.formnote= t('honorific_notes')
     %br
     = f.text_field :honorific, :class => 'standard'
 
 - if @reader.new_record? && @email_field
 
-  - with_error_report(@reader.errors.on(:email)) do
-    = f.label @email_field, 'Your email address', :class => 'required'
-    %span.formnote this has to work
+  %p
+    = f.label @email_field, t('your_email'), :class => 'required'
+    %span.formnote= t('email_notes')
     %br
     = text_field_tag @email_field, params[@email_field] || @reader.email, :id => "reader_#{@email_field}", :class => 'standard'
 
   .innocuous
     - with_error_report(@reader.errors.on(:trap)) do
       %label{ :for => 'reader_email', :class => 'required' }
-        Don't fill this in!
-      %span.formnote
-        it's a spam trap and you weren't supposed to see it
+        = t("dont_fill")
+      %span.formnote= t('spam_trap')
       %br
       = text_field_tag 'reader_email', '', :name => 'reader[email]', :class => 'standard'
 
 - else
 
-  - with_error_report(@reader.errors.on(:email)) do
-    = f.label :email, 'Your email address', :class => 'required'
+  %p
+    = f.label :email, t('your_email'), :class => 'required'
+    %span.formnote= t('email_notes')
     %br
     = f.text_field :email, :class => 'standard'
 
-- with_error_report(@reader.errors.on(:description)) do
-  = f.label :description, 'A little about yourself', :class => 'optional'
-  %span.formnote 
-    you can fill this in later. 
-    Textile formatting 
-    is allowed.
+%p
+  = f.label :description, t('your_description'), :class => 'optional'
+  %span.formnote= t('description_notes')
   %br
   = f.text_area :description, :class => 'standard', :rows => 8
 
-- with_error_report(@reader.errors.on(:login)) do
-  = f.label :login, 'Login username', :class => 'optional'
-  %span.formnote leave blank to use your email address
+%p
+  = f.label :login, t('login_name'), :class => 'optional'
+  %span.formnote= t('login_notes')
   %br
   = f.text_field :login, :class => 'standard'
 
-- with_error_report(@reader.errors.on(:password)) do
-  - label = @reader.new_record? ? 'Password' : 'Change password?'
+%p
+  - label = @reader.new_record? ? t('password') : t('change_password')
   - cssclass = @reader.new_record? ? 'required' : 'optional'
-  - help = @reader.new_record? ? 'at least four characters, please' : 'leave blank to keep present password. If changing, at least four characters.'
-  
   = f.label :password, label, :class => cssclass
-  %span.formnote
-    = help
-    %br
+  %span.formnote= @reader.new_record? ? t('password_notes') : t('existing_password_notes')
+  %br
   = f.password_field :password, :class => 'standard', :autocomplete => 'off'
 
-- with_error_report(@reader.errors.on(:password_confirmation)) do
-  = f.label :password_confirmation, "Confirm #{'new ' unless @reader.new_record?}password", :class => @reader.new_record? ? 'required' : 'optional'
-  - unless @reader.new_record?
-    %span.formnote
-      leave blank to keep present password
-      %br
+%p
+  - label = @reader.new_record? ? t('confirm_password') : t('confirm_new_password')
+  - cssclass = @reader.new_record? ? 'required' : 'optional'
+  = f.label :password_confirmation, label, :class => cssclass
+  %span.formnote= t('existing_password_notes')
+  %br
   = f.password_field :password_confirmation, :class => 'standard', :autocomplete => 'off'
 
 - @form_partials.each do |partial|

data/app/views/readers/edit.html.haml

@@ -2,27 +2,27 @@
 
 %div.preferences_form
   %p
-    Hello 
-    = link_to "#{@reader.name}.", reader_url(@reader)
-    You can use this form to change your preferences and enter a bit more information about yourself.
-    First, just to make sure you're you, please enter your current password:
+    = t("hello")
+    = link_to(@reader.name, reader_url(@reader)) + '.'
+    = t('preferences_intro')
+    = t('enter_own_password')
 
   - unless @reader.errors.empty?
     %p.errornote
-      %strong Sorry: there were problems.
-      Please check the form. The affected fields will be highlighted.
+      %strong 
+        = t('sorry').titlecase
+        = t('form_problem') + '.'
       
   - form_for :reader, :url => reader_url(@reader), :html => { :method => "put", :class => 'friendly'} do |f| 
     
     - with_error_report(@reader.errors.on(:current_password)) do
       = f.label :current_password, "Current password", :class => 'required'
       %span.formnote
-        can't remember?
-        = link_to "Make a new one", new_password_reset_url
+        = link_to t('forgotten_password'), new_password_reset_url
       = f.password_field :current_password, :class => 'standard', :autocomplete => 'off'
       
     %p
-      Fields with bold headings are required and will cause grumbling if left blank:
+      = t('bold_required')
       
     = render :partial => 'form', :locals => {:f => f}
     %p
@@ -31,17 +31,15 @@
       = link_to 'cancel', request.referer
 
   %p
-    = link_to gravatar_for(@reader, {:size => 60}, {:class => 'gravatar'}), 'http://www.gravatar.com/signup', :target => '_blank'
-    If you would like a picture to appear next to your messages, give yourself a 
-    = link_to "gravatar.", "http://www.gravatar.com/signup", :target => '_blank'
-    This is what appears for you at the moment.
-
+    = link_to gravatar_for(@reader, {:size => 60}, {:class => 'gravatar'}), 'http://gravatar.com/site/login'
+    = link_to t('change_gravatar'), "http://gravatar.com/site/login/"
+    
 - content_for :breadcrumbs do 
-  = link_to 'Home', '/'
+  = link_to t('home').titlecase, '/'
   >
-  = link_to 'You', '/readers/me'
+  = link_to t('you').titlecase, '/readers/me'
   >
-  Revise your account
+  = t('account_settings')
 
-- content_for :pagetitle do 
-  Revise your account
+- content_for :title do 
+  = t('account_settings')

data/app/views/readers/index.html.haml

@@ -3,14 +3,12 @@
 %div
   #readers
     - @readers.each do |reader|
-      = link_to gravatar_for(reader, {:size => 100}, {:class => 'big_gravatar'}), reader_url(reader), {:title => reader.name}
-  %div.stretcher
-    %p 
+      = link_to gravatar_for(reader, {:size => 100}, {:class => 'big gravatar'}), reader_url(reader), {:title => reader.name}
 
 - content_for :breadcrumbs do
-  = link_to 'Home', '/'
+  = link_to t('home').titlecase, '/'
   >
-  People
+  = t('people').titlecase
 
-- content_for :pagetitle do
-  People
+- content_for :title do
+  = t('people').titlecase

data/app/views/readers/login.html.haml

@@ -2,14 +2,15 @@
 
 %div.login_form
   %h1 
-    Log in
+    = t('log_in').titlecase
 
   = render :partial => 'reader_sessions/login_form', :locals => {:backto => @backto}
 
 - content_for :breadcrumbs do
-  = link_to 'Home', '/' 
-  > Log in
+  = link_to t('home').titlecase, '/' 
+  > 
+  t('log_in').titlecase
 
-- content_for :pagetitle do
-  Log in
+- content_for :title do
+  = t('log_in').titlecase
   

data/app/views/readers/new.html.haml

@@ -2,40 +2,41 @@
 
 %div.register_form
   %p
-    If you've already done this, you should only need to
-    = link_to "log in.", reader_login_url
-    Otherwise, please take a moment to register an account. 
-    Only the fields labelled in bold are required: the rest you can fill in later if you prefer.
+    = t('please_register')
+    = t('already_registered')
+    = link_to t('log_in') + '.', reader_login_url
 
   - unless @reader.errors.empty?
     %p.errornote
-      %strong Sorry: there were problems.
-      Please check the form. The affected fields will be highlighted like this.
+      %strong 
+        = t('sorry').titlecase
+        = t('form_problem') + '.'
       
   - form_for :reader, :url => readers_url, :html => {:class => 'friendly'} do |f|
     = render :partial => 'form', :locals => {:f => f}
     %p
-      = submit_tag "Register"
+      = submit_tag t("register")
       or 
-      = link_to 'cancel', request.referer
+      = link_to t('cancel'), request.referer
 
   %h3
-    notes
+    = t('notes').titlecase
 
   %ul.friendly
     %li
-      When you press the 'register' button we will send a confirmation email to the address you enter above. 
-      Click on a link in that message, and you're in.
+      = t('confirming_email')
     %li
-      If you would like a picture to appear next to your messages, give yourself a 
-      = link_to "gravatar.", "http://www.gravatar.com"
-    %li
-      Please make sure you're happy with our 
-      = link_to "terms and conditions", "/terms"
+      = t('getting_gravatar')
+      = link_to "gravatar.com" + '.', "http://www.gravatar.com"
+    - if Radiant::Config['reader.terms_url']
+      %li
+        = t('please_read_our')
+        = link_to t("terms_and_conditions"), Radiant::Config['reader.terms_url']
 
 - content_for :breadcrumbs do
-  = link_to 'Home', '/'
-  > Register
+  = link_to t('home').titlecase, '/'
+  > 
+  = t('register').titlecase
 
-- content_for :pagetitle do
-  Register here
+- content_for :title do
+  = t('new_account').titlecase

data/app/views/readers/permission_denied.html.haml

@@ -2,22 +2,26 @@
 
 %div.apologetic
   %p.haserror
-    You don't have permission to see the page you just requested. 
+    = t('page_permission_denied')
+
     - if current_reader
-      Please talk to the site administrator about your account.
+      = t('if_mistake_see_admin')
+
+      - content_for :title do
+        = t('sorry_access_denied')
+      
     - else
-      Please log in.
+      = t('please_log_in') + '.'
+
+      - content_for :title do
+        = t('please_log_in')
 
   - unless current_reader
     = render :partial => 'reader_sessions/login_form'
 
 - content_for :breadcrumbs do
-  = link_to 'Home', '/'
-  >
-  = link_to 'Readers', '/readers'
+  = link_to t('home').titlecase, '/'
   >
-  Permission Denied
+  = t('access_denied')
 
-- content_for :pagetitle do
-  = @title
 

data/app/views/readers/show.html.haml

@@ -4,29 +4,32 @@
   - if @reader == current_reader
     %p.system_message
       %strong
-        Hello 
+        =t('hello').titlecase
         = @reader.name + '.'
-      This is the page that other (logged-in) site visitors will see when they click on your name. You can change the text that appears here by 
-      = link_to "editing your preferences", edit_reader_url(@reader)
-      and you can change the picture by 
-      = link_to "giving yourself a gravatar.", "http://gravatar.com/signup"
+      = t('this_is_your_page')
+    %ul.actions
+      %li
+        = link_to t('edit_profile'), edit_reader_url(@reader)
+      %li
+        = link_to t('change_gravatar'), "http://gravatar.com/site/login/"
 
   = gravatar_for(@reader, {:size => 128}, {:class => 'big_gravatar'})
 
   - if @reader.description.blank?
-    %p No description available.
+    %p 
+     = t('no_description')
   - else
     = clean_textilize @reader.description
 
   = render :partial => 'contributions'
       
 - content_for :breadhead do
-  = link_to 'People', '/readers'
+  = link_to t('people').titlecase, '/readers'
 
 - content_for :breadcrumbs do
-  = link_to 'Home', '/'
+  = link_to t('home').titlecase, '/'
   >
-  = link_to 'People', '/readers'
+  = link_to t('people').titlecase, '/readers'
   >
   = @reader.name
 

data/config/initializers/radiant_config.rb

@@ -0,0 +1,12 @@
+Radiant.config do |config|
+  config.namespace('reader') do |reader|
+    reader.define 'allow_registration?', :default => true
+    reader.define 'require_confirmation?', :default => true
+    reader.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => false
+  end
+  config.namespace('email') do |email|
+    email.define 'layout', :select_from => lambda { Layout.all.map(&:name) }, :allow_blank => true
+    email.define 'name', :allow_blank => false
+    email.define 'address', :allow_blank => false 
+  end
+end 

data/config/locales/en.yml

@@ -0,0 +1,147 @@
+en:
+  access_denied: "Access denied"
+  account_settings: "Account settings"
+  account_updated: "Your account has been updated"
+  activate_account: "Activate your account"
+  activation_complete: "Thank you very much for persevering with the registration process. Your account is now active."
+  activation_message_sent: "Account activation instructions have been emailed to you."
+  activation_sent: "Activation message sent"
+  already_active: "Your account is already active."
+  already_registered: "If you've already registered, you should only need to"
+  and_try_again: "and try again."
+  bold_required: "Fields with bold headings are required and will cause grumbling if left blank:"
+  but_not_active: 'but your account is not yet activated. Please check your email for our activation message.'
+  cancel: "cancel"
+  cannot_delete_readers: "To delete readers, please log in as an administrator"
+  cannot_edit_others: "You are not allowed to edit other people's accounts."
+  change_gravatar: "change your gravatar image"
+  change_password: "Change my password"
+  config:
+    reader:
+      allow_registration?: "Allow registration"
+      require_confirmation?: "Confirm email addresses"
+      use_honorifics?: "Use honorifics"
+      layout: "Layout for forms"
+    email:
+      name: "Message sender"
+      address: "Message reply-to"
+      prefix: "Subject prefix"
+      layout: "Layout for messages"
+  confirm_new_password: "Confirm new password"
+  confirm_password: "Confirm password"
+  confirmation_code: "Confirmation code"
+  confirming_email: "When you press the 'register' button we will send a confirmation email to the address you enter above. Click on a link in that message, and you're in."
+  continue: "Continue"
+  create_message: "create message"
+  description_notes: "you can fill this in later. Textile formatting is allowed."
+  dont_fill: "Don't fill this in!"
+  edit_profile: "edit your profile"
+  email_notes: "we will send an activation message to this address"
+  email_unknown: "Sorry. That email address is not known here."
+  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:"
+  existing_password_notes: "leave blank to keep present password. If changing, at least four characters."
+  forgotten_password: "forgotten password?"
+  form_problem: "there was a problem with the form"
+  getting_gravatar: "If you would like a picture to appear next to your messages, give yourself a gravatar at"
+  hello: "hello"
+  honorific: "Title or rank"
+  honorific_notes: ""
+  invitation_message: "Invitation message"
+  if_cant_find: "If you can't find the message, we can"
+  if_mistake_see_admin: "If this is a mistake, please talk to the site administrator about your account."
+  if_not_you: "If that's not you, or you want to log in with another account"
+  is_free_and_quick: " is free and only takes a moment"
+  log_in: 'log in'
+  log_out: "log out"
+  logged_in_as: 'You are currently logged in as'
+  login_name: "Login name"
+  login_notes: "leave blank to use your 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"
+  name_notes: "as you would like it to appear on the site"
+  new_account: "Register"
+  new_password: "New password"
+  new_password_instructions: "Please enter and confirm the new password you would like to use. It must be at least four characters long, nothing obvious or typical and ideally a mixture of numbers and letters."
+  no: "no"
+  no_description: "No description available"
+  notes: "notes"
+  page_permission_denied: "You don't have permission to see the page that you have requested."
+  password: "password"
+  password_incorrect: "Sorry. Wrong password."
+  password_mismatch: "Passwords don't match! Please try again."
+  password_not_yet_changed: "Your password hasn't changed yet, so if you've just remembered it you can still log in as usual."
+  password_notes: "at least four characters, please"
+  password_reset_instructions: "Please enter your email address below. If we recognise it, we'll send you a message with a confirmation link (or if your account is not yet active, we'll send the activation message again)."
+  password_reset_reassurance: "Your password will not change until you fill in that form, so only you can complete this process."
+  password_updated_notice: "Thank you. Your password has been updated and you are now logged in."
+  people: "people"
+  permission_denied: "Permission denied"
+  please: "please"
+  please_avoid_spam_trap: "Please don't fill in the spam trap field"
+  please_check_message: "Sorry: something was wrong in that link. Please check your email message and make sure it is giving you the whole address."
+  please_log_in: "Please log in"
+  please_log_out: "Please log out"
+  please_read_our: "Please read our"
+  please_register: "Please take a moment to register an account."
+  please_use_form: "Please use the registration form"
+  preferences_intro: "You can use this form to change your preferences and enter a bit more information about yourself."
+  reader_admin: "Reader administration"
+  reader_emails: "Administrative messages"
+  reader: 'Reader'
+  readers: 'Readers'
+  register: "register"
+  registration: "registration"
+  registration_disallowed: "Sorry. This site does not allow visitors to register"
+  remember_me: "remember me"
+  resend_activation: "resent activation messages"
+  reset_message_instructions: "Thank you. A message has been sent containing the instructions for setting a new password. Remember it hasn't changed yet and won't until you follow the instructions in the message. If you remember your old password, you can just carry on using it and ignore the reset message."
+  reset_message_sent: "Password-reset instructions have been emailed to you."
+  reset_not_found: "Password-reset code not found"
+  sorry_reset_not_found: "Sorry: the system can't find you. That link must have been garbled somewhere along the line. Please paste the 20-character confirmation code into the box below and we'll try again."
+  reset_password: "Reset your password"
+  restart_password_change: "Send another password-reset message"
+  return_to_page: "return to the page you were looking at before you started registering"
+  send_it_again: "send it again"
+  send_reset_button: "send me instructions"
+  sorry: "sorry"
+  sorry_access_denied: "Sorry: access denied"
+  spam_trap: "it's a spam trap and shouldn't be visible"
+  terms_and_conditions: "terms and conditions"
+  thanks_activated: "Thank you! Your account has been activated."
+  thanks_and_activation_instructions: "Thank you for registering. Now please check your email. We have sent a message containing a link that will automatically activate your account and log you in."
+  this_is_your_page: "This is the page that other (logged-in) site visitors will see when they click on your name."
+  username: "username"
+  welcome_back: "Welcome back"
+  welcome_message: "Welcome message"
+  wrong_email: "you think you might have put the wrong email address in,"
+  yes: "yes"
+  your_description: "A little about yourself"
+  your_email: "Your email address"
+  your_name: "Your name"
+  count_people: 
+    zero: "(nobody)"
+    one: "(one person)"
+    other: "(%{count} people)"
+  send_to: "Send to"
+  reader_configuration_page: "reader settings"
+  welcome_sent_automatically: "This message is sent automatically when someone completes the registration and email-confirmation process."
+  password_reset_sent_automatically: "This message is sent automatically when someone asks to reset their password."
+  activation_sent_automatically: "This message is sent automatically when someone begins to register."
+  invitation_sent_automatically: "This message is sent automatically when someone is invited to the site."
+  everyone_unsent: "anyone who has not received this message"
+  everyone_inactive: "anyone who has not activated their account"
+  everyone: "Everyone"
+  send_message: "Send Message"
+  edit_message: "edit message"
+  delete_message: "delete message"
+  this_message_functional: "This is the %{function} message."
+  preview_and_send_message: "Preview and send message"
+  really_delete_message: "Are you sure you want to delete the message '%{title}'? This cannot be undone."
+  delete_reader: "delete reader"
+  really_delete_reader: "Are you sure you want to remove the reader %{name}? This cannot be undone."
+  never_sent: 'never sent'
+  for: 'for'
+  home: 'home'