From 962e9276d6d045a07c529eb3fc80f34d85976f2c Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Fri, 1 Nov 2019 21:26:51 +0800
Subject: [PATCH] Update merge.html.erb

---
 app/views/admin/journal_papers/merge.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/journal_papers/merge.html.erb b/app/views/admin/journal_papers/merge.html.erb
index 7bf9cd9..25ff8b5 100644
--- a/app/views/admin/journal_papers/merge.html.erb
+++ b/app/views/admin/journal_papers/merge.html.erb
@@ -18,17 +18,17 @@ function change_mode(){
 </script>
 <nobr>
 <form method="get" action='?' name='mode_form'>
-    <%= '嚴格比較模式'+':' %>
+    <%= t('strict_compare_mode') +':' %>
     <input type='hidden' name='mode' value=''>
     <% if params['mode']!='simple' %>
-        <input type="checkbox" onchange='change_mode()' checked><span>是</span>
+        <input type="checkbox" onchange='change_mode()' checked><span><%= t('yes_') %></span>
     <% else %>
-        <input type="checkbox" onchange='change_mode()'><span>否</span>
+        <input type="checkbox" onchange='change_mode()'><span><%= t('no_') %></span>
     <% end %>
     <button type="button" onclick="merge_form.submit()"><%= t('personal_journal.merge') %></button>
 </form>
 </nobr>
-<form method="get" action='?' name='merge_form'>
+<form method="post" action='/admin/journal_papers/merge_process' name='merge_form'>
 <table class="table main-list">
 <thead>
 <tr>
@@ -40,7 +40,7 @@ function change_mode(){
     <th><%= t('personal_journal.paper_type') %></th>
     <th><%= t('personal_journal.publication_date') %></th>
 <% end %>
-<th><%= t("personal_plugins.merge") %></th>
+<th><%= t("personal_journal.merge") %></th>
 <th><%= t("personal_plugins.author") %></th>
 </tr>
 </thead>