blacklight 6.13.0 → 6.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f8e150bbc29ab7fea77523b447dddfc11c32c7d
-  data.tar.gz: 5e9a545db8bf223f3ebf452464055408739d2620
+  metadata.gz: c80294fa4aef88bdf6ec8a3f7690825a05840f77
+  data.tar.gz: fb9bbf2a541804e29c34ad99c0e7eab733647c74
 SHA512:
-  metadata.gz: a412554969d9774294084579801d8b35804d741952a8795fd45cd0d8c810c66c3a63e96c8611ef9663ecf1574e0ff0e2dc05dda706b2ed778ec0afec332babd8
-  data.tar.gz: 2ab4d5eaf1663d0557f4d196f475f4819d816211b1006cbbc9caa406075c0d7f5c1a9a744de458e5a667ca5f7ecc6f9de6d0a159b57ce062d82c8265b1974695
+  metadata.gz: 1992d1b06cba55d9e3e1be01cb117631e211567e1a5b2c730d9b52a7a9d4c1229c83035bbe75530cdd1613105e110bd91e6b552a2828c692226eef38e9823c92
+  data.tar.gz: ba9c70f09afc9d98de7ec6340bca9884ca1d4f29980d6ea81c2ae8e2fc1a1a130a4d705902dfb853e5d2a90f0364691a157bd14b33fd0716f3332716e039d876

data/VERSION

@@ -1 +1 @@
-6.13.0
+6.14.0

data/config/locales/blacklight.zh.yml

@@ -0,0 +1,234 @@
+zh:
+  views:
+    pagination:
+      first: '« 首页'
+      last: '末页 »'
+      previous: '« 上一页'
+      next: '下一页 »'
+      truncate: '…'
+
+    pagination_compact:
+      previous: '« 上一页'
+      next: '下一页 »'
+
+  blacklight:
+    application_name: 'Blacklight'
+
+    header_links:
+      login: '登陆'
+      logout: '注销'
+      bookmarks: '书签'
+      saved_searches: '保存的搜索'
+      search_history: '搜索历史'
+
+    welcome: '欢迎!'
+    and: '和'
+    or: '或'
+
+    modal:
+      close: "关闭"
+
+    bookmarks:
+      title: '书签'
+      page_title: '书签 - %{application_name}'
+      no_bookmarks: '你还没有任何书签'
+      add:
+        button: '书签'
+        success:
+          one: '成功添加书签。'
+          other: '成功添加书签。'
+        failure:  '抱歉，保存书签时出错。'
+      remove:
+        button: '删除书签'
+        success: '成功删除书签。'
+        failure: '抱歉，删除书签时出错。'
+        action_confirm: '删除这个书签？'
+      clear:
+        action_title: '清除书签'
+        action_confirm: '清除所有书签？'
+        success: '已经清除了所有书签。'
+        failure: '抱歉，清除书签时出错。'
+      need_login: '登陆后才能访问你的书签功能。'
+      list_title: '你的书签'
+      delete: '删除'
+
+    saved_searches:
+      add:
+        success: '成功保存了您的搜索。'
+        failure: '保存搜索时出现问题。'
+      remove:
+        success: '成功删除保存的搜索。'
+        failure: '删除您的搜索时出现问题。'
+      clear:
+        action_title: '清除保存的搜索'
+        action_confirm: '清除您保存的搜索？'
+        success: '清除您保存的搜索。'
+        failure: '清除搜索时出现问题。'
+      title: '保存的搜索'
+      page_title: '保存的搜索 - %{application_name}'
+      need_login: '请登录来管理和查看您保存的搜索。'
+      no_searches: '您没有保存的搜索'
+      list_title: '您保存的搜索'
+      delete: '删除'
+
+    search_history:
+      clear:
+        action_title: '清除搜索历史'
+        action_confirm: '清除搜索历史？'
+        success: '已经清除搜索历史。'
+        failure: '清除搜索历史时出错。'
+      title: ''
+      page_title: '搜索历史 - %{application_name}'
+      no_history: '你没有任何搜索历史'
+      recent: '你最近搜索历史'
+      forget: '去除'
+      save: '保存'
+
+    tools:
+      title: '工具'
+      citation: '引用'
+      email: '电子邮件'
+      sms: '发送短信'
+      clear: '清除'
+
+    citation:
+      mla: 'MLA'
+      apa: 'APA'
+      chicago: 'Chicago'
+
+    email:
+      form:
+        title: '通过电子邮件发送'
+        to: '电子邮件：'
+        message: '正文：'
+        submit: '发送'
+      text:
+        default_title: '无'
+        title: '标题: %{value}'
+        author: '作者: %{value}'
+        format: '格式: %{value}'
+        language: '语言: %{value}'
+        subject:
+          one: '记录: %{title}'
+          other: '记录'
+        url: '网址: %{url}'
+        message: '正文： %{message}'
+
+      success: "已发送电子邮件"
+
+      errors:
+        to:
+          invalid: '请输入合法电子邮件地址'
+          blank: '请输入电子邮件接收人才能发送'
+    sms:
+      form:
+        title: '通过短信发送'
+        to: '电话号码:'
+        carrier: '运营商'
+        carrier_prompt: '请选择运营商'
+        submit: '发送'
+      text:
+        title: '%{value}'
+        author: ' 来自 %{value}'
+        url: '链接: %{url}'
+      success: "已发送短信"
+      errors:
+        to:
+          invalid: '请输入10位正确电话号码'
+          blank: "请输入接收人电话号码才能发送短信"
+        carrier:
+          blank: '你必须选择一个运营商'
+          invalid: "你必须输入一个运营商"
+
+    back_to_search: '返回搜索页面'
+    back_to_bookmarks: '返回书签页面'
+
+    search:
+      # i18n key 'title' is deprecated and will be removed in Blacklight 6.0
+      title: '%{application_name} 搜索结果'
+      page_title:
+        title: '%{constraints} - %{application_name} 搜索结果'
+        constraint: '%{label}: %{value}'
+        many_constraint_values: '%{values} 已选'
+      search_results_header: '搜索条件'
+      search_results: '搜索结果'
+      errors:
+        request_error: "抱歉，我不明白你要找什么。"
+        invalid_solr_id: "抱歉，你要找的结果不存在。"
+      per_page:
+        label: '%{count}<span class="sr-only"> 每页</span>'
+        button_label: '%{count} 每页'
+        title: '每页显示结果数'
+        submit: '更新'
+      sort:
+        label: '按 %{field} 排序'
+        submit: '排序'
+      form:
+        search_field:
+          label: '搜索字段'
+          title: '设定的搜索选项'
+          post_label: '为'
+        search:
+          label: '搜索'
+          placeholder: '搜索...'
+        submit: '搜索'
+      pagination:
+        title: '搜索结果导航'
+      pagination_info:
+        no_items_found: '没有找到 %{entry_name} '
+        single_item_found: '找到 <strong>1</strong> %{entry_name}'
+        pages:
+          one: '<strong>%{start_num}</strong> - <strong>%{end_num}</strong> 共 <strong>%{total_num}</strong>'
+          other: '<strong>%{start_num}</strong> - <strong>%{end_num}</strong> 共 <strong>%{total_num}</strong>'
+      entry_pagination_info:
+        one: '<strong>1 / 1</strong>'
+        other: '<strong>%{current}</strong> / <strong>%{total}</strong>'
+      documents:
+        counter: '%{counter}. '
+      facets:
+        title: '限定搜索'
+        clear: '清除搜索条件'
+        sort:
+          count: '按数量排序'
+          index: '按字母排序'
+        count: '%{number}'
+        more_html: '更多 <span class="sr-only">%{field_name}</span> »'
+        selected:
+          remove: '[删除]'
+        missing: "[未找到]"
+      group:
+        more: '更多 »'
+      filters:
+        title: '你在搜索：'
+        label: '%{label}:'
+        remove:
+          value: '删除限定条件 %{value}'
+          label_value: '删除限定条件 %{label}: %{value}'
+      start_over: '重新开始'
+      index:
+        label: '%{label}:'
+      show:
+        title: '%{document_title} - %{application_name}'
+        label: '%{label}:'
+      rss_feed: '搜索结果RSS'
+      atom_feed: '搜索结果Atom'
+      fields:
+        default: '关键词'
+      bookmarks:
+        present: "在书签中"
+        absent: "加入书签"
+        inprogress: "保存..."
+      zero_results:
+        title: "未找到任何结果"
+        modify_search: "请更改你的搜索条件"
+        use_fewer_keywords: "使用更少的搜索条件，使用左边的链接来筛选搜索结果。"
+        search_fields: "你在搜索如下字段 %{search_fields}"
+        search_everything: "试一试搜索所有记录"
+      view_title: "以如下方式察看搜索结果: "
+      view:
+        list: "列表"
+
+    entry_name:
+      default: '条目'
+
+    did_you_mean: '你是要输入： %{options} 吗？'

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -74,6 +74,7 @@ module Blacklight::Solr
           end.join(" AND ")
         end
 
+        solr_parameters[:defType] = 'lucene'
         solr_parameters[:spellcheck] = 'false'
       elsif blacklight_params[:q]
         solr_parameters[:q] = blacklight_params[:q]

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -147,23 +147,18 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     config.add_search_field('title') do |field|
       # solr_parameters hash are sent to Solr as ordinary url query params.
-      field.solr_parameters = { :'spellcheck.dictionary' => 'title' }
-
-      # :solr_local_parameters will be sent using Solr LocalParams
-      # syntax, as eg {! qf=$title_qf }. This is neccesary to use
-      # Solr parameter de-referencing like $title_qf.
-      # See: http://wiki.apache.org/solr/LocalParams
-      field.solr_local_parameters = {
-        qf: '$title_qf',
-        pf: '$title_pf'
+      field.solr_parameters = {
+        'spellcheck.dictionary': 'title',
+        qf: '${title_qf}',
+        pf: '${title_pf}'
       }
     end
 
     config.add_search_field('author') do |field|
-      field.solr_parameters = { :'spellcheck.dictionary' => 'author' }
-      field.solr_local_parameters = {
-        qf: '$author_qf',
-        pf: '$author_pf'
+      field.solr_parameters = {
+        'spellcheck.dictionary': 'author',
+        qf: '${author_qf}',
+        pf: '${author_pf}'
       }
     end
 
@@ -171,11 +166,11 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # tests can test it. In this case it's the same as
     # config[:default_solr_parameters][:qt], so isn't actually neccesary.
     config.add_search_field('subject') do |field|
-      field.solr_parameters = { :'spellcheck.dictionary' => 'subject' }
       field.qt = 'search'
-      field.solr_local_parameters = {
-        qf: '$subject_qf',
-        pf: '$subject_pf'
+      field.solr_parameters = {
+        'spellcheck.dictionary': 'subject',
+        qf: '${subject_qf}',
+        pf: '${subject_pf}'
       }
     end
 

data/spec/features/search_filters_spec.rb

@@ -64,7 +64,7 @@ describe "Facets" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "1")
     end
-    within(".blacklight-pub_date") do 
+    within(".blacklight-pub_date") do
       expect(page).to have_selector("span.selected", :text => "2004")
       expect(page).to have_selector("span.facet-count.selected", :text => "1")
     end
@@ -104,7 +104,7 @@ describe "Facets" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "1")
     end
-    within(".blacklight-pub_date") do 
+    within(".blacklight-pub_date") do
       expect(page).to have_selector("span.selected", :text => "2004")
       expect(page).to have_selector("span.facet-count.selected", :text => "1")
     end
@@ -115,7 +115,7 @@ describe "Facets" do
       expect(page).to have_selector("span.selected", :text => "Tibetan")
       expect(page).to have_selector("span.facet-count.selected", :text => "1")
     end
-    within(".blacklight-pub_date") do 
+    within(".blacklight-pub_date") do
       expect(page).to have_selector("span.selected", :text => "2004")
       expect(page).to have_selector("span.facet-count.selected", :text => "1")
     end
@@ -187,7 +187,7 @@ describe "Facets" do
     visit root_path
     within(".blacklight-subject_topic_facet") do
       expect(page).not_to have_selector(".panel-collapse", :visible => true)
-      click_link "Topic"
+      find(".panel-heading").click
       expect(page).to     have_selector(".panel-collapse", :visible => true)
     end
   end
@@ -195,8 +195,10 @@ describe "Facets" do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
     within(".blacklight-subject_topic_facet") do
-      click_link "Topic"
+      find(".panel-heading").click
       expect(page).to have_selector(".panel-collapse", :visible => true)
+    end
+    within(".blacklight-subject_topic_facet") do
       click_link "Japanese drama"
     end
     within(".blacklight-subject_topic_facet") do

data/spec/models/blacklight/solr/search_builder_spec.rb

@@ -253,6 +253,14 @@ describe Blacklight::Solr::SearchBuilderBehavior do
     describe "solr parameters for a field search from config (subject)" do
       let(:user_params) { subject_search_params }
 
+      before do
+        # The tests below expect pre-solr-7.2 queries with local params
+        blacklight_config.search_fields['subject'].solr_local_parameters = {
+          qf: '$subject_qf',
+          pf: '$subject_pf'
+        }
+      end
+
       it "should look up qt from field definition" do
         expect(subject[:qt]).to eq "search"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.13.0
+  version: 6.14.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -552,6 +552,7 @@ files:
 - config/locales/blacklight.it.yml
 - config/locales/blacklight.pt-BR.yml
 - config/locales/blacklight.sq.yml
+- config/locales/blacklight.zh.yml
 - config/routes.rb
 - db/migrate/20140202020201_create_searches.rb
 - db/migrate/20140202020202_create_bookmarks.rb