blacklight 3.4.2 → 3.5.0

data/app/controllers/bookmarks_controller.rb

@@ -24,9 +24,9 @@ class BookmarksController < ApplicationController
     
     unless request.xhr?
       if bookmark.save
-        flash[:notice] = "Successfully added bookmark."
+        flash[:notice] = I18n.t('blacklight.bookmarks.add.success')
       else
-        flash[:error] = "Could not save bookmark."
+        flash[:error] = I18n.t('blacklight.bookmarks.add.failure') 
       end
       redirect_to :back
     else
@@ -56,9 +56,9 @@ class BookmarksController < ApplicationController
       success = false unless current_user.bookmarks.create(bookmark)
     end
     if @bookmarks.length > 0 && success
-      flash[:notice] = "Successfully added bookmarks."      
+      flash[:notice] = I18n.t('blacklight.bookmarks.add.success', :count => @bookmarks.length)
     elsif @bookmarks.length > 0
-      flash[:error] = "There was a problem adding bookmarks"      
+      flash[:error] = I18n.t('blacklight.bookmarks.add.failure', :count => @bookmarks.length)
     end
     
     redirect_to :back
@@ -73,9 +73,9 @@ class BookmarksController < ApplicationController
     
     unless request.xhr?
       if success
-        flash[:notice] = "Successfully removed bookmark."
+        flash[:notice] =  I18n.t('blacklight.bookmarks.remove.success')
       else
-        flash[:error] = "Sorry, there was a problem removing the bookmark."
+        flash[:error] = I18n.t('blacklight.bookmarks.remove.failure')
       end 
       redirect_to :back
     else
@@ -86,15 +86,15 @@ class BookmarksController < ApplicationController
   
   def clear    
     if current_user.bookmarks.clear
-      flash[:notice] = "Cleared your bookmarks."
+      flash[:notice] = I18n.t('blacklight.bookmarks.clear.success') 
     else
-      flash[:error] = "There was a problem clearing your bookmarks."
+      flash[:error] = I18n.t('blacklight.bookmarks.clear.failure') 
     end
     redirect_to :action => "index"
   end
   
   protected
   def verify_user
-    flash[:notice] = "Please log in to manage and view your bookmarks." and raise Blacklight::Exceptions::AccessDenied  unless current_user
+    flash[:notice] = I18n.t('blacklight.bookmarks.need_login') and raise Blacklight::Exceptions::AccessDenied  unless current_user
   end
 end

data/app/controllers/feedback_controller.rb

@@ -21,13 +21,13 @@ class FeedbackController < ApplicationController
   # returns either an empty array or an array with error messages
   def validate
     unless params[:name] =~ /\w+/
-      @errors << 'A valid name is required'
+      @errors << I18n.t('blacklight.feedback.valid_name') 
     end
     unless params[:email] =~ /\w+@\w+\.\w+/
-      @errors << 'A valid email address is required'
+      @errors << I18n.t('blacklight.feedback.valid_email')
     end
     unless params[:message] =~ /\w+/
-      @errors << 'A message is required'
+      @errors << I18n.t('blacklight.feedback.need_message')
     end
     #unless simple_captcha_valid?
     #  @errors << 'Captcha did not match'

data/app/controllers/folder_controller.rb

@@ -20,7 +20,7 @@ class FolderController < ApplicationController
     # Rails 3 uses a one line notation for setting the flash notice.
     #    flash[:notice] = "#{params[:title] || "Item"} successfully added to Folder"
     respond_to do |format|
-      format.html { redirect_to :back, :notice =>  "#{params[:title] || "Item"} successfully added to Folder"}
+      format.html { redirect_to :back, :notice =>  I18n.t('blacklight.folder.add.success', :title => params[:title] || 'Item') }
       format.js { render :json => session[:folder_document_ids] }
     end
   end
@@ -31,7 +31,7 @@ class FolderController < ApplicationController
           
     respond_to do |format|
       format.html do
-        flash[:notice] = "#{params[:title] || "Item"} successfully removed from selected items"
+        flash[:notice] = I18n.t('blacklight.folder.remove.success', :title => params[:title] || 'Item')
         redirect_to :back
       end
       format.js do
@@ -43,7 +43,7 @@ class FolderController < ApplicationController
  
   # get rid of the items in the folder
   def clear
-    flash[:notice] = "Cleared Selected Items"
+    flash[:notice] = I18n.t('blacklight.folder.clear.success')
     session[:folder_document_ids] = []
     respond_to do |format|
       format.html { redirect_to :back }

data/app/controllers/saved_searches_controller.rb

@@ -13,9 +13,9 @@ class SavedSearchesController < ApplicationController
   def save    
     current_user.searches << Search.find(params[:id])
     if current_user.save
-      flash[:notice] = "Successfully saved your search."
+      flash[:notice] = I18n.t('blacklight.saved_searches.add.success')
     else
-      flash[:error] = "The was a problem saving your search."
+      flash[:error] = I18n.t('blacklight.saved_searches.add.failure')
     end
     redirect_to :back
   end
@@ -28,9 +28,9 @@ class SavedSearchesController < ApplicationController
       search.user_id = nil
       search.save
 
-      flash[:notice] = "Successfully removed that saved search."
+      flash[:notice] =I18n.t('blacklight.saved_searches.remove.success')
     else
-      flash[:error] = "Couldn't remove that saved search."
+      flash[:error] = I18n.t('blacklight.saved_searches.remove.failure')
     end
     redirect_to :back
   end
@@ -39,9 +39,9 @@ class SavedSearchesController < ApplicationController
   # are in the session[:history]
   def clear    
     if Search.update_all("user_id = NULL", "user_id = #{current_user.id}")
-      flash[:notice] = "Cleared your saved searches."
+      flash[:notice] = I18n.t('blacklight.saved_searches.clear.success')
     else
-      flash[:error] = "There was a problem clearing your saved searches."
+      flash[:error] = I18n.t('blacklight.saved_searches.clear.failure') 
     end
     redirect_to :action => "index"
   end
@@ -49,6 +49,6 @@ class SavedSearchesController < ApplicationController
 
   protected
   def verify_user
-    flash[:notice] = "Please log in to manage and view your saved searches." and raise Blacklight::Exceptions::AccessDenied unless current_user
+    flash[:notice] = I18n.t('blacklight.saved_searches.need_login') and raise Blacklight::Exceptions::AccessDenied unless current_user
   end
 end

data/app/controllers/search_history_controller.rb

@@ -12,9 +12,9 @@ class SearchHistoryController < ApplicationController
   #TODO we may want to remove unsaved (those without user_id) items from the database when removed from history
   def clear
     if session[:history].clear
-      flash[:notice] = "Cleared your search history."
+      flash[:notice] = I18n.t('blacklight.search_history.clear.success')
     else
-      flash[:error] = "There was a problem clearing your search history."
+      flash[:error] = I18n.t('blacklight.search_history.clear.failure') 
     end
     redirect_to :back
   end

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -13,7 +13,7 @@ module Blacklight::BlacklightHelperBehavior
   def application_name
     return Rails.application.config.application_name if Rails.application.config.respond_to? :application_name
 
-    'Blacklight'
+    t('blacklight.application_name')
   end
 
   # Provide the full, absolute url for an image
@@ -42,7 +42,7 @@ module Blacklight::BlacklightHelperBehavior
       unless( options[:exclude].include?(format) ||
              (options[:unique] && seen.include?(spec[:content_type]))
              )
-        html << tag(:link, {:rel=>"alternate", :title=>format, :type => spec[:content_type], :href=> catalog_url(document,  format)}) << "\n"
+        html << tag(:link, {:rel=>"alternate", :title=>format, :type => spec[:content_type], :href=> polymorphic_url(document, :format => format)}) << "\n"
         
         seen.add(spec[:content_type]) if options[:unique]
       end
@@ -266,10 +266,6 @@ module Blacklight::BlacklightHelperBehavior
     label ||= doc.id
   end
 
-
-  def solr_document_path(*args); catalog_path(*args); end
-  def solr_document_url(*args); catalog_url(*args); end
-
   # link_to_document(doc, :label=>'VIEW', :counter => 3)
   # Use the catalog_path RESTful route to create a link to the show page for a specific item. 
   # catalog_path accepts a HashWithIndifferentAccess object. The solr query params are stored in the session,
@@ -282,11 +278,11 @@ module Blacklight::BlacklightHelperBehavior
 
   # link_back_to_catalog(:label=>'Back to Search')
   # Create a link back to the index screen, keeping the user's facet, query and paging choices intact by using session.
-  def link_back_to_catalog(opts={:label=>'Back to Search'})
+  def link_back_to_catalog(opts={:label=>t('blacklight.back_to_search')})
     query_params = session[:search] ? session[:search].dup : {}
     query_params.delete :counter
     query_params.delete :total
-    link_url = catalog_index_path + "?" + query_params.to_query
+    link_url = url_for(query_params)
     link_to opts[:label], link_url
   end
   
@@ -327,12 +323,12 @@ module Blacklight::BlacklightHelperBehavior
 
   def link_to_previous_document(previous_document)
     return if previous_document == nil
-    link_to '« Previous', previous_document, :class => "previous", :'data-counter' => session[:search][:counter].to_i - 1
+    link_to raw(t('views.pagination.previous')), previous_document, :class => "previous", :'data-counter' => session[:search][:counter].to_i - 1
   end
 
   def link_to_next_document(next_document)
     return if next_document == nil
-    link_to 'Next »', next_document, :class => "next", :'data-counter' => session[:search][:counter].to_i + 1
+    link_to raw(t('views.pagination.next')), next_document, :class => "next", :'data-counter' => session[:search][:counter].to_i + 1
   end
 
   # Use case, you want to render an html partial from an XML (say, atom)

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -39,17 +39,14 @@ module Blacklight::CatalogHelperBehavior
       end_num = format_num(start + response.docs.length - 1)
       total_num = format_num(total_hits)
 
+   # TODO: i18n the entry_name
       entry_name = options[:entry_name] ||
-        (response.empty?? 'entry' : response.docs.first.class.name.underscore.sub('_', ' '))
+        (response.empty?? t('blacklight.entry_name.default') : response.docs.first.class.name.underscore.sub('_', ' '))
 
-      if num_pages < 2
-        case response.docs.length
-        when 0; "No #{h(entry_name.pluralize)} found".html_safe
-        when 1; "Displaying <b>1</b> #{h(entry_name)}".html_safe
-        else;   "Displaying <b>all #{total_num}</b> #{entry_name.pluralize}".html_safe
-        end
-      else
-        "Displaying #{h(entry_name.pluralize)} <b>#{start_num} - #{end_num}</b> of <b>#{total_num}</b>".html_safe
+      case response.docs.length
+        when 0; t('blacklight.search.pagination_info.no_items_found', :entry_name => entry_name.pluralize ).html_safe
+        when 1; t('blacklight.search.pagination_info.single_item_found', :entry_name => entry_name).html_safe
+        else; t('blacklight.search.pagination_info.pages', :entry_name => entry_name.pluralize, :current_page => current_page, :num_pages => num_pages, :start_num => start_num, :end_num => end_num, :total_num => total_num, :count => num_pages).html_safe
       end
   end
 
@@ -59,7 +56,7 @@ module Blacklight::CatalogHelperBehavior
   # Code should call this method rather than interrogating session directly,
   # because implementation of where this data is stored/retrieved may change. 
   def item_page_entry_info
-    "Showing item <b>#{session[:search][:counter].to_i} of #{format_num(session[:search][:total])}</b> from your search.".html_safe
+    t('blacklight.search.entry_pagination_info.other', :current => format_num(session[:search][:counter]), :total => format_num(session[:search][:total]), :count => session[:search][:total].to_i).html_safe
   end
   
   # Look up search field user-displayable label
@@ -70,7 +67,7 @@ module Blacklight::CatalogHelperBehavior
 
   # Export to Refworks URL, called in _show_tools
   def refworks_export_url(document = @document)
-    "http://www.refworks.com/express/expressimport.asp?vendor=#{CGI.escape(application_name)}&filter=MARC%20Format&encoding=65001&url=#{CGI.escape(catalog_path(document, :format => 'refworks_marc_txt', :only_path => false))}"        
+    "http://www.refworks.com/express/expressimport.asp?vendor=#{CGI.escape(application_name)}&filter=MARC%20Format&encoding=65001&url=#{CGI.escape(polymorphic_path(document, :format => 'refworks_marc_txt', :only_path => false))}"        
   end
   
   def render_document_class(document = @document)

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -102,14 +102,14 @@ module Blacklight::FacetsHelperBehavior
   # with class, and 'remove' button.
   def render_selected_facet_value(facet_solr_field, item)
     content_tag(:span, render_facet_value(facet_solr_field, item, :suppress_link => true), :class => "selected label") +
-      link_to("[remove]", remove_facet_params(facet_solr_field, item.value, params), :class=>"remove")
+      link_to(t('blacklight.search.facets.selected.remove'), remove_facet_params(facet_solr_field, item.value, params), :class=>"remove")
   end
 
   # Renders a count value for facet limits. Can be over-ridden locally
   # to change style, for instance not use parens. And can be called
   # by plugins to get consistent display. 
   def render_facet_count(num)
-    content_tag("span",  "(" + format_num(num) + ")", :class => "count") 
+    content_tag("span", t('blacklight.search.facets.count', :number => num), :class => "count") 
   end
   
   # adds the value and/or field to params[:f]

data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb

@@ -32,7 +32,7 @@ module Blacklight::SearchHistoryConstraintsHelperBehavior
       render_search_to_s_element(blacklight_config.facet_fields[facet_field].label,
         value_list.collect do |value|
           render_filter_value(value)
-        end.join(content_tag(:span, 'and', :class =>'label')).html_safe
+        end.join(content_tag(:span, t('blacklight.and'), :class =>'label')).html_safe
       )    
     end.join(" \n ").html_safe    
   end
@@ -46,7 +46,7 @@ module Blacklight::SearchHistoryConstraintsHelperBehavior
 
   def render_filter_name name
     return "".html_safe if name.blank?
-    content_tag(:span, h(name) + ":", :class => 'filterName')
+    content_tag(:span, t('blacklight.search.filters.label', :label => name), :class => 'filterName')
   end
 
   def render_filter_value value

data/app/models/bookmark.rb

@@ -4,5 +4,10 @@ class Bookmark < ActiveRecord::Base
   belongs_to :user
   validates_presence_of :user_id, :scope=>:document_id
   attr_accessible :id, :document_id, :title
+
+
+  def document
+    SolrDocument.new :id => document_id
+  end
   
 end

data/app/models/record_mailer.rb

@@ -1,31 +1,25 @@
 # -*- encoding : utf-8 -*-
 # Only works for documents with a #to_marc right now. 
 class RecordMailer < ActionMailer::Base
-  
-  def email_record(documents, details, from_host, url_gen_params)
+  def email_record(documents, details, url_gen_params)
     #raise ArgumentError.new("RecordMailer#email_record only works with documents with a #to_marc") unless document.respond_to?(:to_marc)
         
-    if documents.size == 1
-      subject = "Item Record: #{documents.first.to_semantic_values[:title] rescue 'N/A'}"
-    else
-      subject = "Item records"
-    end
+    subject = I18n.t('blacklight.email.text.subject', :count => documents.length, :title => (documents.first.to_semantic_values[:title] rescue 'N/A') )
 
     @documents      = documents
     @message        = details[:message]
     @url_gen_params = url_gen_params
 
-    mail(:to => details[:to],  :from => "no-reply@" << from_host, :subject => subject)
+    mail(:to => details[:to],  :subject => subject)
   end
   
-  def sms_record(documents, details, from_host, url_gen_params)
+  def sms_record(documents, details, url_gen_params)
     if sms_mapping[details[:carrier]]
       to = "#{details[:to]}@#{sms_mapping[details[:carrier]]}"
     end
     @documents      = documents
-    @host           = from_host
     @url_gen_params = url_gen_params
-    mail(:to => to, :from => "no-reply@" << from_host, :subject => "")
+    mail(:to => to, :subject => "")
   end
 
   protected

data/app/views/_user_util_links.html.erb

@@ -1,15 +1,15 @@
 <% if has_user_authentication_provider? %>
   <% if current_user%>
-  <%= link_to "Log Out", destroy_user_session_path %> [<%= link_to current_user, edit_user_registration_path %>]
+  <%= link_to t('blacklight.header_links.logout'), destroy_user_session_path %> [<%= link_to current_user, edit_user_registration_path %>]
     | 
-    <%= link_to 'Your Bookmarks', bookmarks_path %>
+    <%= link_to t('blacklight.header_links.bookmarks'), bookmarks_path %>
     |
-    <%= link_to "Saved Searches", saved_searches_path %>
+    <%= link_to t('blacklight.header_links.saved_searches'), saved_searches_path %>
 <% else %>
-  <%= link_to 'Login', new_user_session_path %>
+  <%= link_to t('blacklight.header_links.login'), new_user_session_path %>
 <% end %>
 | 
 <% end %>
-<%= link_to "Selected Items", folder_index_path %> (<span id="folder_number"><%= "#{session[:folder_document_ids] ? session[:folder_document_ids].length : 0}" %></span>)
+<%= link_to t('blacklight.header_links.selected_items'), folder_index_path %> (<span id="folder_number"><%= "#{session[:folder_document_ids] ? session[:folder_document_ids].length : 0}" %></span>)
 |
-<%= link_to "Search History", search_history_path %>
+<%= link_to t('blacklight.header_links.search_history'), search_history_path %>

data/app/views/bookmarks/index.html.erb

@@ -1,29 +1,29 @@
-<h1>Bookmarks</h1>
+<h1><%= t('blacklight.bookmarks.title') %></h1>
 
 <%- if current_user.blank? -%>
   
-  <h2>Please log in to see your bookmarks.</h2>
+  <h2><%= t('blacklight.bookmarks.need_login') %></h2>
   
 <%- elsif @bookmarks.blank? -%>
   
-  <h2>You have no bookmarks</h2>
+  <h2><%= t('blacklight.bookmarks.no_bookmarks') %></h2>
   
 <%- else -%>
 
 <%= paginate @bookmarks, :theme => 'blacklight' %>
   <div id="userBookmarks">
     <p>
-      <%= link_to "Clear Bookmarks", clear_bookmarks_path, :method => :delete, :confirm => "Clear your bookmarks?" %>
+    <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') } %>
     </p>
     
-    <h2>Your Bookmarks</h2>
+    <h2><%= t('blacklight.bookmarks.list_title') %></h2>
     
     <table class="zebra">
       <% @bookmarks.each do |bm| %>
       <tr>
-    	<td><%= link_to h(bm.title), catalog_path(CGI.escape(bm.document_id)) %></td>
-    	<td><%= button_to 'Remove', {:controller => "bookmarks", :action => "destroy", :id => CGI.escape(bm.document_id)}, 
-	  :method => :delete, :confirm => 'Remove this bookmark?' %></td>
+    	<td><%= link_to h(bm.title), polymorphic_path(bm.document) %></td>
+    	<td><%= button_to t('blacklight.bookmarks.delete'), {:controller => "bookmarks", :action => "destroy", :id => CGI.escape(bm.document_id)}, 
+	  :method => :delete, :confirm => t('blacklight.bookmarks.remove.action_confirm') %></td>
       </tr>
       <% end %>
     </table>

data/app/views/catalog/_bookmark_control.html.erb

@@ -9,14 +9,14 @@
 
       <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :title=> document[document_show_link_field] ) do %>        
         <%= hidden_field(:bookmark, :title, :value => document[document_show_link_field] ) %>
-        <%= submit_tag("Bookmark", :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add") %>
+        <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add") %>
       <% end %>
   
   <% else %>
   
       <%= form_tag( bookmark_path( document ), :method => :delete, :class => "bookmark_toggle", "data-doc-id" => document.id, :title=> document[document_show_link_field]) do %>  
         <%= hidden_field(:bookmark, :title, :value => document[document_show_link_field] ) %>
-        <%= submit_tag("Remove bookmark", :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove") %>
+        <%= submit_tag(t('blacklight.bookmarks.remove.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_remove") %>
       <% end %>
       
   <% end %>

data/app/views/catalog/_bookmark_form.html.erb

@@ -1,8 +1,8 @@
-<%= form_tag '/bookmarks', :name => "bookmarks" do %>
+<%= form_tag bookmarks_url, :name => "bookmarks" do %>
   <% documents.each_with_index do |document, index| %>
     <%= hidden_field_tag "bookmarks[#{index}][document_id]", document.get(:id)%>
     <%= hidden_field_tag "bookmarks[#{index}][title]", h(document[document_show_link_field])%>
   <% end %>
-  <%= link_to_function "Add to Bookmarks", "document.bookmarks.submit()" %>
-  <%= submit_tag 'Add to Bookmarks', :class => 'hide' %>
+  <%= link_to_function t('blacklight.bookmarks.collection.add.button'), "document.bookmarks.submit()" %>
+  <%= submit_tag t('blacklight.bookmarks.collection.add.button'), :class => 'hide' %>
 <% end %>

data/app/views/catalog/_citation.html.erb

@@ -3,17 +3,17 @@
 <h1><%= citation_title(document) %></h1>
 
 <% if document.respond_to?(:export_as_mla_citation_txt) %>
-  <h4>MLA</h4>
+  <h4><%= t('blacklight.citation.mla') %></h4>
   <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
 <% end %>
 
 <% if document.respond_to?(:export_as_apa_citation_txt) %>
-  <h4>APA</h4>
+  <h4><%= t('blacklight.citation.apa') %></h4>
   <%= document.send(:export_as_apa_citation_txt).html_safe %><br/><br/>
 <% end %>
 
 <%- if document.respond_to?(:export_as_chicago_citation_txt) -%>
-  <h4>Chicago</h4>
+  <h4><%= t('blacklight.citation.chicago') %></h4>
   <%= document.send(:export_as_chicago_citation_txt).html_safe %>
 <%- end -%>