blacklight 3.4.2 → 3.5.0

data/app/views/record_mailer/sms_record.text.erb

@@ -1,4 +1,4 @@
 <% @documents.each do |document| %>
 <%= document.to_sms_text %>
-Link: <%= catalog_path(document, {:only_path => false}.merge(@url_gen_params) ) %>
+<%= t('blacklight.sms.text.url', :url => polymorphic_path(document, {:only_path => false}.merge(@url_gen_params)) ) %>
 <% end %>

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

@@ -1,24 +1,24 @@
-<h1>Saved Searches</h1>
+<h1><%= t('blacklight.saved_searches.title') %></h1>
 
 <%- if current_user.blank? -%>
   
-  <h2>Please log in to see your saved searches.</h2>
+  <h2><%= t('blacklight.saved_searches.need_login') %></h2>
   
 <%- elsif @searches.blank? -%>
   
-  <h2>You have no saved searches</h2>
+  <h2><%= t('blacklight.saved_searches.no_searches') %></h2>
   
 <%- else -%>
   <p>
-    <%= link_to "Clear Saved Searches", clear_saved_searches_path, :method => :delete, :confirm => "Clear your saved searches?" %>
+    <%= link_to t('blacklight.saved_searches.clear.action_title'), clear_saved_searches_path, :method => :delete, :confirm => t('blacklight.saved_searches.clear.action_confirm') %>
   </p>
 
-  <h2>Your saved searches</h2>
+  <h2><%= t('blacklight.saved_searches.list_title') %></h2>
   <table class="zebra">
   <%- @searches.each do |search| -%>
     <tr>
       <td><%= link_to_previous_search(search.query_params) %></td>
-      <td><%= button_to "delete", forget_search_path(search.id) %></td>
+      <td><%= button_to t('blacklight.saved_searches.delete'), forget_search_path(search.id) %></td>
     </tr>
   <%- end -%>
   </table>

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

@@ -1,11 +1,11 @@
-<h1>Search History</h1>
+<h1><%=t('blacklight.search_history.title')%></h1>
 <%- if @searches.blank? -%>
-  <h2>You have no search history</h2>
+  <h2><%=t('blacklight.search_history.no_history')%></h2>
 <%- else -%>
   <p>
-    <%= link_to "Clear Search History", clear_search_history_path, :method => :delete, :confirm => "Clear your search history?" %>
+  <%= link_to t('blacklight.search_history.clear.action_title'), clear_search_history_path, :method => :delete, :data => { :confirm => t('blacklight.search_history.clear.action_confirm') } %>
   </p>
-  <h2>Your recent searches</h2>
+  <h2><%=t('blacklight.search_history.recent')%></h2>
   <table class="zebra search_history">
   <%-  @searches.each_with_index do |search,index| -%>
     <%= content_tag :tr, :id => "document_#{index + 1}" do %>
@@ -13,9 +13,9 @@
       <%- if has_user_authentication_provider? -%>
         <td class="actions">
           <%- if current_user && search.saved? -%>
-            <%= button_to "forget", forget_search_path(search.id) %>
+            <%= button_to t('blacklight.search_history.forget'), forget_search_path(search.id) %>
           <%- else -%>
-            <%= button_to "save", save_search_path(search.id), :method => :put %>
+            <%= button_to t('blacklight.search_history.save'), save_search_path(search.id), :method => :put %>
           <%- end -%>
         </td>
       <%- end -%>

data/config/locales/blacklight.en.yml

@@ -0,0 +1,227 @@
+en:
+  active_record:
+    models:
+      feedback: 'Feedback'
+    attributes:
+      feedback:
+        name: 'Your Name'
+        email: 'Your Email'
+        message: 'Your Message'
+  views:
+    pagination:
+      first: '« First'
+      last: 'Last »'
+      previous: '« Previous'
+      next: 'Next »'
+      truncate: '…'
+
+  blacklight:
+    application_name: 'Blacklight'
+
+    header_links:
+      login: 'Login'
+      logout: 'Log Out'
+      bookmarks: 'Your Bookmarks'
+      saved_searches: 'Saved Searches'
+      selected_items: 'Selected Items'
+      search_history: 'Search History'
+
+    welcome: 'Welcome!'
+    and: 'and'
+    or: 'or'
+
+    bookmarks:
+      collection:
+        add:
+          button: 'Add to Bookmarks'
+      title: 'Bookmarks'
+      no_bookmarks: 'You have no bookmarks'
+      add:
+        button: 'Bookmark'
+        success:
+          one: 'Successfully added bookmark.'
+          other: 'Successfully added bookmarks.'
+        failure:  'Sorry, there was a problem saving the bookmarks.'
+      remove:
+        button: 'Remove bookmark'
+        success: 'Successfully removed bookmark.'
+        failure: 'Sorry, there was a problem removing the bookmarks.'
+        action_confirm: 'Remove this bookmark?'
+      clear:
+        action_title: 'Clear Bookmarks'
+        action_confirm: 'Clear your bookmarks?'
+        success: 'Cleared your bookmarks.'
+        failure: 'Sorry, there was a problem clearing your bookmarks.'
+      need_login: 'Please log in to manage and view your bookmarks.'
+      list_title: 'Your Bookmarks'
+      delete: 'Remove'
+
+    feedback:
+      valid_name: 'A valid name is required'
+      valid_email: 'A valid email address is required'
+      need_message: 'A message is required'
+      submit: 'Send!'
+      errors:
+        title: 'Please fix the following form errors:'
+      complete:
+        title: 'Thank-you for your feedback'
+
+    folder:
+      title: 'Selected Items'
+      add:
+        success: '%{title} successfully added to selected items'
+      remove:
+        success: '%{title} successfully removed from selected items'
+      clear:
+        success: 'Selected items cleared.'
+
+    saved_searches:
+      add:
+        success: 'Successfully saved your search.'
+        failure: 'There was a problem saving your search.'
+      remove:
+        success: 'Successfully removed that saved search.'
+        failure: 'There was a problem removing your search.'
+      clear:
+        action_title: 'Clear Saved Searches'
+        action_confirm: 'Clear your saved searches?'
+        success: 'Cleared your saved searches.'
+        failure: 'There was a problem clearing your searches.'
+      title: 'Saved Searches'
+      need_login: 'Please log in to manage and view your saved searches.'
+      no_searches: 'You have no saved searches'
+      list_title: 'Your saved searches'
+      delete: 'delete'
+
+    search_history:
+      clear:
+        action_title: 'Clear Search History'
+        action_confirm: 'Clear your search history?'
+        success: 'Cleared your search history.'
+        failure: 'There was a problem clearing your search history.'
+      title: 'Search History'
+      no_history: 'You have no search history'
+      recent: 'Your recent searches'
+      forget: 'forget'
+      save: 'save'
+
+    tools:
+      cite: 'Cite'
+      endnote: 'Export to EndNote'
+      refworks: 'Export to Refworks'
+      email: 'Email'
+      sms: 'SMS This'
+      librarian_view: 'Librarian View'
+      clear: 'Clear'
+
+    citation:
+      mla: 'MLA'
+      apa: 'APA'
+      chicago: 'Chicago'
+
+    email:
+      form:
+        title: 'Email This'
+        to: 'Email:'
+        message: 'Message:'
+        submit: 'Send'
+      text:
+        title: 'Title: %{value}'
+        author: 'Author: %{value}'
+        format: 'Format: %{value}'
+        language: 'Language: %{value}'
+        subject:
+          one: 'Item Record: %{title}'
+          other: 'Item records'
+        url: 'URL: %{url}'
+        message: 'Message: %{message}'
+
+      errors:
+        to:
+          invalid: 'You must enter a valid email address'
+          blank: 'You must enter a recipient in order to send this message'
+    sms:
+      form:
+        title: 'SMS This'
+        to: 'Phone Number:'
+        carrier: 'Carrier'
+        carrier_prompt: 'Please select your carrier'
+        submit: 'Send'
+      text:
+        title: '%{value}'
+        author: ' by %{value}'
+        url: 'Link: %{url}'
+      errors:
+        to:
+          invalid: 'You must enter a valid 10 digit phone number'
+          blank: "You must enter a recipient's phone number in order to send this message"
+        carrier:
+          blank: 'You must select a carrier'
+
+    back_to_search: 'Back to Search'
+
+    search:
+      title: '%{application_name} Search Results'
+      search_results: 'Search Results'
+      errors:
+        request_error: "Sorry, I don't understand your search."
+        invalid_solr_id: "Sorry, you have requested a record that doesn't exist."
+      per_page:
+        label: 'Show %{select} per page'
+        title: 'Number of results to display per page'
+        submit: 'update'
+      sort:
+        label: 'Sort by %{select}'
+        submit: 'sort results'
+      form:
+        search_field:
+          label: 'in'
+          title: 'Targeted search options'
+        q: 'Search '
+        submit: 'search'
+      pagination:
+        title: 'Results navigation'
+      pagination_info:
+        no_items_found: 'No %{entry_name} found'
+        single_item_found: 'Displaying <b>1</b> %{entry_name}'
+        pages:
+          one: 'Displaying <b>all %{total_num}</b> %{entry_name}'
+          other: 'Displaying %{entry_name} <b>%{start_num} - %{end_num}</b> of <b>%{total_num}</b>'
+      entry_pagination_info:
+        one: 'Showing the only item from your search.'
+        other: 'Showing item <b>%{current} of %{total}</b> from your search.'
+      documents:
+        counter: '%{counter}. '
+      folder:
+        select: 'Select'
+        unselect: 'Unselect'
+      facets:
+        title: 'Limit your search'
+        sort:
+          count: 'Numerical Sort'
+          index: 'A-Z Sort'
+        count: '(%{number})'
+        more: 'more »'
+        selected:
+          remove: '[remove]'
+      filters:
+        title: 'You searched for:'
+        label: '%{label}:'
+        remove:
+          value: 'Remove constraint %{value}'
+          label_value: 'Remove constraint %{label}: %{value}'
+      librarian_view:
+        title: 'Librarian View'
+        leader: 'LEADER %{leader}'
+      start_over: 'start over'
+      show:
+        title: '%{document_title} - %{application_name}'
+      rss_feed: 'RSS for results'
+      atom_feed: 'Atom for results'
+      fields:
+        default: 'Keyword'
+
+    entry_name:
+      default: 'entry'
+
+    did_you_mean: 'Did you mean to type: %{options}?'

data/lib/blacklight.rb

@@ -7,7 +7,6 @@ module Blacklight
 
   autoload :Configurable, 'blacklight/configurable'
   autoload :Configuration, 'blacklight/configuration'
-  autoload :GlobalConfigurable, 'blacklight/global_configurable'
   autoload :SearchFields, 'blacklight/search_fields'
 
   autoload :Solr, 'blacklight/solr'
@@ -26,7 +25,6 @@ module Blacklight
 
   autoload :OpenStructWithHashAccess, 'blacklight/utils'
 
-  extend GlobalConfigurable
   extend SearchFields
   
   require 'blacklight/version'

data/lib/blacklight/catalog.rb

@@ -28,8 +28,8 @@ module Blacklight::Catalog
     # get search results from the solr index
     def index
       
-      extra_head_content << view_context.auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => "RSS for results")
-      extra_head_content << view_context.auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => "Atom for results")
+      extra_head_content << view_context.auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss')), :title => t('blacklight.search.rss_feed') )
+      extra_head_content << view_context.auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom')), :title => t('blacklight.search.atom_feed') )
       
       (@response, @document_list) = get_search_results
       @filters = params[:f] || []
@@ -100,18 +100,17 @@ module Blacklight::Catalog
       @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
       if request.post?
         if params[:to]
-          from = request.host # host w/o port for From address (from address cannot have port#)
           url_gen_params = {:host => request.host_with_port, :protocol => request.protocol}
           
           if params[:to].match(/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/)
-            email = RecordMailer.email_record(@documents, {:to => params[:to], :message => params[:message]}, from, url_gen_params)
+            email = RecordMailer.email_record(@documents, {:to => params[:to], :message => params[:message]}, url_gen_params)
           else
-            flash[:error] = "You must enter a valid email address"
+            flash[:error] = I18n.t('blacklight.email.errors.to.invalid', :to => params[:to])
           end
           email.deliver unless flash[:error]
           redirect_to :back
         else
-          flash[:error] = "You must enter a recipient in order to send this message"
+          flash[:error] = I18n.t('blacklight.email.errors.to.blank')
         end
       end
     end
@@ -120,24 +119,23 @@ module Blacklight::Catalog
     def sms 
       @response, @documents = get_solr_response_for_field_values(SolrDocument.unique_key,params[:id])
       if request.post?
-        from = request.host # host w/o port for From address (from address cannot have port#)
         url_gen_params = {:host => request.host_with_port, :protocol => request.protocol}
         
         if params[:to]
           phone_num = params[:to].gsub(/[^\d]/, '')
           unless params[:carrier].blank?
             if phone_num.length != 10
-              flash[:error] = "You must enter a valid 10 digit phone number"
+              flash[:error] = I18n.t('blacklight.sms.errors.to.invalid', :to => params[:to])
             else
-              email = RecordMailer.sms_record(@documents, {:to => phone_num, :carrier => params[:carrier]}, from, url_gen_params)
+              email = RecordMailer.sms_record(@documents, {:to => phone_num, :carrier => params[:carrier]}, url_gen_params)
             end
             email.deliver unless flash[:error]
             redirect_to :back
           else
-            flash[:error] = "You must select a carrier"
+            flash[:error] = I18n.t('blacklight.sms.errors.carrier.blank')
           end
         else
-          flash[:error] = "You must enter a recipient's phone number in order to send this message"
+          flash[:error] = I18n.t('blacklight.sms.errors.to.blank')
         end
         
       end
@@ -251,7 +249,7 @@ module Blacklight::Catalog
       if Rails.env == "development"
         raise exception # Rails own code will catch and give usual Rails error page with stack trace
       else
-        flash_notice = "Sorry, I don't understand your search."
+        flash_notice = I18n.t('blacklight.search.errors.request_error')
         # Set the notice flag if the flash[:notice] is already set to the error that we are setting.
         # This is intended to stop the redirect loop error
         notice = flash[:notice] if flash[:notice] == flash_notice
@@ -270,7 +268,7 @@ module Blacklight::Catalog
       if Rails.env == "development"
         render # will give us the stack trace
       else
-        flash[:notice] = "Sorry, you have requested a record that doesn't exist."
+        flash[:notice] = I18n.t('blacklight.search.errors.invalid_solr_id')
         params.delete(:id)
         index
         render "index", :status => 404

data/lib/blacklight/configurable.rb

@@ -50,10 +50,7 @@ module Blacklight::Configurable
   end
 
   def self.default_configuration
-      @default_configuration ||= Blacklight::Configuration.from_legacy_configuration(Blacklight.config) if Blacklight.respond_to?(:config) and not Blacklight.config.empty?
       @default_configuration ||= Blacklight::Configuration.new
-
-      @default_configuration
   end
 
   def self.default_configuration= config

data/lib/blacklight/configuration.rb

@@ -83,47 +83,5 @@ module Blacklight
       yield self if block_given?
       self
     end
-
-    ##
-    # Helper method for loading a legacy blacklight configuration into the new style Blacklight::Configuration
-    def self.from_legacy_configuration config
-      config = Marshal.load(Marshal.dump(config))
-  
-      Blacklight::Configuration.new  do |blacklight_config|
-        # SolrHelper#default_solr_parameters needs to iterate over the keys, so this can't be a Struct
-        blacklight_config.default_solr_params = config[:default_solr_params]
-    
-        config[:facet][:field_names].each do |x|
-          blacklight_config.add_facet_field x, :limit => config[:facet][:limits][x], :label => config[:facet][:labels][x]
-        end if config[:facet] and config[:facet][:field_names]
-    
-        config[:index_fields][:field_names].each do |x|
-          blacklight_config.add_index_field x, :label => config[:index_fields][:labels][x]
-        end if config[:index_fields]
-    
-        config[:show_fields][:field_names].each do |x|
-          blacklight_config.add_show_field x, :label => config[:show_fields][:labels][x]
-        end if config[:show_fields]
-    
-        config[:search_fields].each do |x|
-          unless x.is_a? Hash
-            x = { :label => x[0], :key => x[1], :qt => x[1]}
-          end
-
-          x[:label] ||= x.delete(:display_label)
-    
-          blacklight_config.add_search_field x[:key], x
-        end if config[:search_fields]
-    
-        config[:sort_fields].each do |field|
-          label, sort = field
-          blacklight_config.add_sort_field sort, :label => label
-        end if config[:sort_fields]
-    
-        config.reject { |key, value| [:default_solr_params, :facet, :index_fields, :show_fields, :search_fields, :sort_fields].include? key }.each do |key,value|
-          blacklight_config.send("#{key}=", (Blacklight::OpenStructWithHashAccess.new(value) if value.is_a? Hash) || value)
-        end
-      end                  
-    end
   end
 end