Merge pull request #890 from kmuto/chapterdisplay

chapref, columnの参照文字列のgettext化の改善

lib/review/book/index.rb

@@ -108,7 +108,11 @@ def title(id)
       end
 
       def display_string(id)
-        "#{number(id)}#{I18n.t('chapter_quote', title(id))}"
+        if number(id)
+          I18n.t('chapter_quote', [number(id), title(id)])
+        else
+          I18n.t('chapter_quote_without_number', title(id))
+        end
       end
     end
 

lib/review/builder.rb

@@ -352,7 +352,7 @@ def inline_column(id)
     end
 
     def inline_column_chap(chapter, id)
-      chapter.column(id).caption
+      I18n.t('column', chapter.column(id).caption)
     end
 
     def inline_pageref(id)

lib/review/htmlbuilder.rb

@@ -965,9 +965,9 @@ def inline_bib(id)
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
       if chap.number and @book.config['secnolevel'] >= n.split('.').size
-        str = I18n.t('chapter_quote', "#{n} #{compile_inline(chap.headline(id).caption)}")
+        str = I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
       else
-        str = I18n.t('chapter_quote', compile_inline(chap.headline(id).caption))
+        str = I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
       end
       if @book.config['chapterlink']
         anchor = 'h' + n.gsub('.', '-')

lib/review/i18n.rb

@@ -90,6 +90,12 @@ def update_localefile(path)
           @store[key].merge!(values)
         end
       end
+
+      # check obsolete locale parameter
+      s = t('chapter_quote', ['__!@!NUMBER!@!__', '__!@!TITLE!@!__'])
+      if s !~ /__!@!NUMBER!@!__/ || s !~ /__!@!TITLE!@!__/
+        ReVIEW.logger.warn %Q('chapter_quote' should take 2 '%s' (number and title).)
+      end
     end
 
     def update(user_i18n, locale = nil)

lib/review/i18n.yml

@@ -10,7 +10,10 @@ ja:
   chapter: 第%d章
   chapter_short: "%d"
   chapter_postfix: "　"
-  chapter_quote: "「%s」"
+  chapter_quote: "%s「%s」"
+  chapter_quote_without_number: "「%s」"
+  hd_quote: "「%s %s」"
+  hd_quote_without_number: "「%s」"
   appendix: 付録%pA
   numberless_image: "図:"
   memo_head: ■メモ
@@ -72,7 +75,10 @@ en:
   chapter: Chapter %d
   chapter_short: "%d"
   chapter_postfix: ". "
-  chapter_quote: '"%s"'
+  chapter_quote: '%s "%s"'
+  chapter_quote_without_number: '"%s"'
+  hd_quote: '"%s %s"'
+  hd_quote_without_number: '"%s"'
   appendix: Appendix %s
   numberless_image: "Figure:"
   memo_head: Note
@@ -126,12 +132,18 @@ zh-TW:
   image: 圖
   table: 表
   list: List
+  column: "Column %s"
+  columnname: "Column"
+  column_head: "Column"
   part: 第%pR部份
   part_short: "%pR"
   chapter: 第%d章
   chapter_short: "%d"
   chapter_postfix: "　"
-  chapter_quote: "「%s」"
+  chapter_quote: "%s「%s」"
+  chapter_quote_without_number: "「%s」"
+  hd_quote: "「%s %s」"
+  hd_quote_without_number: "「%s」"
   appendix: 附錄%s
   numberless_image: "圖:"
   format_number: "%s.%d"

lib/review/idgxmlbuilder.rb

@@ -1143,10 +1143,10 @@ def inline_hd_chap(chap, id)
       if chap.number
         n = chap.headline_index.number(id)
         if @book.config['secnolevel'] >= n.split('.').size
-          return I18n.t('chapter_quote', "#{n}　#{compile_inline(chap.headline(id).caption)}")
+          return I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
         end
       end
-      I18n.t('chapter_quote', compile_inline(chap.headline(id).caption))
+      I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
     rescue KeyError
       error "unknown headline: #{id}"
     end

lib/review/latexbuilder.rb

@@ -992,9 +992,9 @@ def inline_bib(id)
     def inline_hd_chap(chap, id)
       n = chap.headline_index.number(id)
       if chap.number and @book.config['secnolevel'] >= n.split('.').size
-        str = I18n.t('chapter_quote', "#{chap.headline_index.number(id)} #{compile_inline(chap.headline(id).caption)}")
+        str = I18n.t('hd_quote', [chap.headline_index.number(id), compile_inline(chap.headline(id).caption)])
       else
-        str = I18n.t('chapter_quote', compile_inline(chap.headline(id).caption))
+        str = I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
       end
       if @book.config['chapterlink']
         anchor = n.gsub(/\./, '-')
@@ -1006,7 +1006,7 @@ def inline_hd_chap(chap, id)
 
     def inline_column_chap(chapter, id)
       macro('reviewcolumnref',
-            I18n.t('chapter_quote', compile_inline(chapter.column(id).caption)),
+            I18n.t('column', compile_inline(chapter.column(id).caption)),
             column_label(id, chapter))
     rescue KeyError
       error "unknown column: #{id}"

lib/review/plaintextbuilder.rb

@@ -391,10 +391,10 @@ def inline_hd_chap(chap, id)
       if chap.number
         n = chap.headline_index.number(id)
         if @book.config['secnolevel'] >= n.split('.').size
-          return I18n.t('chapter_quote', "#{n}　#{compile_inline(chap.headline(id).caption)}")
+          return I18n.t('hd_quote', [n, compile_inline(chap.headline(id).caption)])
         end
       end
-      I18n.t('chapter_quote', compile_inline(chap.headline(id).caption))
+      I18n.t('hd_quote_without_number', compile_inline(chap.headline(id).caption))
     rescue KeyError
       error "unknown headline: #{id}"
     end

test/test_plaintextbuilder.rb

@@ -382,7 +382,7 @@ def test_column_ref
 inside column
 
 next level
-this is test.
+this is コラム「test」.
 EOS
 
     assert_equal expected, column_helper(review)

test/test_rstbuilder.rb

@@ -347,7 +347,7 @@ def test_column_ref
 next level
 --------------------
 
-this is test.
+this is コラム「test」.
 
 EOS
 

test/test_topbuilder.rb

@@ -406,7 +406,7 @@ def test_column_ref
 ◆→終了:コラム←◆
 
 ■H3■next level
-this is test.
+this is コラム「test」.
 EOS
 
     assert_equal expected, column_helper(review)