From 11e9f5d7cd9232614d8643e105ddb12183f90936 Mon Sep 17 00:00:00 2001
From: iCross <rja@icross.cc>
Date: Wed, 26 Jun 2013 21:47:59 +0800
Subject: [PATCH] Fix announcement versioning

Conflicts:

	Gemfile
---
 Gemfile                                                     | 2 ++
 .../announcement/back_end/bulletin_versions/index.html.erb  | 2 +-
 .../announcement/back_end/bulletin_versions/show.html.erb   | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5406ccce3..fa5f07030 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,6 +64,8 @@ gem 'rmmseg-cpp-huacnlee', '0.2.9'
 gem 'redis-namespace'
 gem 'redis-search'
 gem 'syslog-logger'
+gem "recaptcha", :require => "recaptcha/rails"
+gem 'mongoid-versioning'
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/index.html.erb
index b80949c16..ef23cea94 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/index.html.erb
@@ -11,7 +11,7 @@
     <% @bulletin.versions.reverse.each do |version| %>
 		  <tr class="with_action">
 		  	<td>
-		  		<%= version.title[I18n.locale.to_s] %>
+		  		<%= version.title %>
 		  		<div class="quick-edit">
             <%= link_to '顯示', panel_announcement_back_end_bulletin_bulletin_version_path(@bulletin, version.version) %>
 		  		</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/show.html.erb
index fa701f006..17f855eb4 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_versions/show.html.erb
@@ -1,15 +1,15 @@
 <ul>
 	<li>
 		<b><%= t(:name) %></b>
-		<%= @version.title[I18n.locale.to_s] %>
+		<%= @version.title %>
 	</li>
 	<li>
 		<b><%= t(:subtitle) %></b>
-		<%= @version.subtitle[I18n.locale.to_s] %>
+		<%= @version.subtitle %>
 	</li>
   <li>
     <b><%= t(:text) %></b>
-    <%= simple_format @version.text[I18n.locale.to_s] %>
+    <%= simple_format @version.text %>
   </li>
   <li>
     <b><%= t(:deadline) %></b>