From b2cbcf6629c56f29946a5c0df85626e4bc0dd395 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Thu, 7 Mar 2013 10:50:43 +0800
Subject: [PATCH] fixed bug

---
 .../desktop/journal_pages/_form.html.erb                 | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
index a4d40d640..b83916864 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
@@ -1,9 +1,9 @@
 <div class="toolbar hh1">
   <div class="fn_g hp">
 
-    <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
+    <%= f.submit t("save"), name: "commit", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
     <% if not @writing_journal.new_record? %>
-      <%= submit_tag "Cancel", :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %>
+      <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %>
 
     <% end %>
   </div>
@@ -190,12 +190,7 @@
                 <td colspan="3">
                   <div id='add_plugin_file' class="info_input plugin_files_block s_action">
                     <%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %>
-<<<<<<< Updated upstream
                     <a class="add setting_btn thmc1 thmtxt w1 hh1 hp" href=""><i class="icon-plus icon-white"></i> add</a>
-=======
-                    <a class="add setting_btn thmc1 thmtxt w1 hh2 hp" href="#"><i class="icon-plus icon-white"></i> add</a>
-
->>>>>>> Stashed changes
                   </div>
                 </td>
               </tr>