From d20081157a8fcd11bc7f46085413240e83bdc370 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Tue, 12 Mar 2013 11:22:11 +0800
Subject: [PATCH] modify translation for journal_co_author_relation button

---
 .../desktop/conference_co_author_relations_controller.rb      | 4 ++--
 .../desktop/journal_co_author_relations_controller.rb         | 4 ++--
 .../desktop/journal_co_author_relations/_form.html.erb        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb
index 001f9f424..0da30e7c8 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_author_relations_controller.rb
@@ -28,7 +28,7 @@ class Panel::PersonalConference::Desktop::ConferenceCoAuthorRelationsController
 
     if @conference_co_author_relation.save
       newv = render_to_string partial: "show_form", object: @conference_co_author_relations
-      render json: {success: true, msg: t("create_success") , newvalue: newv}.to_json
+      render json: {success: true, msg: t('create_success') , newvalue: newv}.to_json
     else
       error_msg = @conference_co_author_relation.errors.full_messages.join("<br />")
       render json: {success: false, msg: error_msg}.to_json
@@ -40,7 +40,7 @@ class Panel::PersonalConference::Desktop::ConferenceCoAuthorRelationsController
     if @conference_co_author_relation.update_attributes(params[:conference_co_author_relation])
       @conference_co_author_relations = ConferenceCoAuthorRelation.all
       newv = render_to_string partial: "show_form", object: @conference_co_author_relations
-      render json: {success: true, msg: t("update_success"), newvalue: newv}.to_json
+      render json: {success: true, msg: t('update_success'), newvalue: newv}.to_json
     else
       error_msg = @conference_co_author.errors.full_messages.join("<br />")
       render json: {success: false, msg: error_msg}.to_json
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_author_relations_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_author_relations_controller.rb
index 66ff582c6..74594d7d9 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_author_relations_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_author_relations_controller.rb
@@ -28,7 +28,7 @@ class Panel::PersonalJournal::Desktop::JournalCoAuthorRelationsController < Appl
 
     if @journal_co_author_relation.save
       newv = render_to_string partial: "show_form", object: @journal_co_author_relations
-      render json: {success: true, msg: "create_success", newvalue: newv}.to_json
+      render json: {success: true, msg: t("create_success"), newvalue: newv}.to_json
     else
       error_msg = @journal_co_author_relation.errors.full_messages.join("<br />")
       render json: {success: false, msg: error_msg}.to_json
@@ -40,7 +40,7 @@ class Panel::PersonalJournal::Desktop::JournalCoAuthorRelationsController < Appl
     if @journal_co_author_relation.update_attributes(params[:journal_co_author_relation])
       @journal_co_author_relations = JournalCoAuthorRelation.all
       newv = render_to_string partial: "show_form", object: @journal_co_author_relations
-      render json: {success: true, msg: "update_success", newvalue: newv}.to_json
+      render json: {success: true, msg: t("update_success"), newvalue: newv}.to_json
     else
       error_msg = @journal_co_author.errors.full_messages.join("<br />")
       render json: {success: false, msg: error_msg}.to_json
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
index 9cf116365..5391bacee 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
@@ -7,5 +7,5 @@
 -->
 <%= f.submit t("save"), class: "ini_input hp hh1 thmtxt thmc2", style: "margin-left: 10px;" %>
 <% if not @journal_co_author_relation.new_record? %>
-  <%= submit_tag t("back"), :type => "button", class: "bt-cancel-type ini_input hp hh1 thmtxt" %>
+  <%= submit_tag t("cancel"), :type => "button", class: "bt-cancel-type ini_input hp hh1 thmtxt" %>
 <% end %>