From 8ad7f708227350814bd671dcc09466b1ca8bb35c Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Fri, 18 May 2012 10:28:28 +0800
Subject: [PATCH] Proof i18n_variable for categories

---
 app/controllers/admin/asset_categories_controller.rb            | 1 -
 app/controllers/admin/infos_controller.rb                       | 1 -
 app/controllers/admin/roles_controller.rb                       | 1 -
 .../announcement/back_end/bulletin_categorys_controller.rb      | 1 -
 .../panel/announcement/back_end/bulletins/_bulletin.html.erb    | 2 +-
 .../views/panel/announcement/back_end/bulletins/show.html.erb   | 2 +-
 .../views/panel/announcement/front_end/bulletins/index.html.erb | 2 +-
 .../views/panel/announcement/widget/bulletins/_index.html.erb   | 2 +-
 .../panel/news/back_end/news_bulletin_categorys_controller.rb   | 1 -
 .../panel/news/back_end/news_bulletins/_news_bulletin.html.erb  | 2 +-
 .../app/views/panel/news/back_end/news_bulletins/show.html.erb  | 2 +-
 .../web_resource/back_end/web_link_categorys_controller.rb      | 1 -
 .../panel/web_resource/back_end/web_links/_web_link.html.erb    | 2 +-
 .../views/panel/web_resource/back_end/web_links/show.html.erb   | 2 +-
 .../views/panel/web_resource/front_end/web_links/index.html.erb | 2 +-
 .../views/panel/web_resource/front_end/web_links/show.html.erb  | 2 +-
 .../views/panel/web_resource/widget/web_links/index.html.erb    | 2 +-
 17 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/controllers/admin/asset_categories_controller.rb b/app/controllers/admin/asset_categories_controller.rb
index 22efd03f0..9ce6bb482 100644
--- a/app/controllers/admin/asset_categories_controller.rb
+++ b/app/controllers/admin/asset_categories_controller.rb
@@ -17,7 +17,6 @@ class Admin::AssetCategoriesController < OrbitBackendController
   
   def edit
     @asset_category = AssetCategory.find(params[:id])
-    @i18n_variable = @asset_category.i18n_variable	
     @url = admin_asset_categories_path(@asset_category)
   end
 
diff --git a/app/controllers/admin/infos_controller.rb b/app/controllers/admin/infos_controller.rb
index bc86b662e..21306c6e5 100644
--- a/app/controllers/admin/infos_controller.rb
+++ b/app/controllers/admin/infos_controller.rb
@@ -21,7 +21,6 @@ class Admin::InfosController < ApplicationController
   
   def edit
     @attribute = Info.find(params[:id])
-    @i18n_variable = @attribute.i18n_variable
     render :template => 'admin/attributes/edit'
   end
   
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index 65c86f362..d02224a5f 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -21,7 +21,6 @@ class Admin::RolesController < ApplicationController
   
   def edit
     @attribute = Role.find(params[:id])
-    @i18n_variable = @attribute.i18n_variable
     render :template => 'admin/attributes/edit'
   end
   
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
index b9151125c..65359763c 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
@@ -55,7 +55,6 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
   # GET /bulletins/1/edit
   def edit
     @bulletin_category = BulletinCategory.find(params[:id])
-    @i18n_variable = @bulletin_category.i18n_variable	
 	
 	@url = panel_announcement_back_end_bulletin_category_path(@bulletin_category)
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index b69def3b5..423e35ba5 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -28,7 +28,7 @@
 			</div>
 		</div>
 	</td>
-	<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] %></td>
+	<td><%= bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td>
 		<%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
 		
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
index 158e07d0f..68634b9a7 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
@@ -1,7 +1,7 @@
 <ul>
 	<li>
   <b><%= t('announcement.category') %></b>
-  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %>
+  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %>
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
index 16ac7d8bc..6937a6c30 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
@@ -18,7 +18,7 @@
 
 <% @bulletins.each do |post| %>
   <tr>
-	<td><%= post.bulletin_category.i18n_variable[I18n.locale] %></td>
+	<td><%= post.bulletin_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>
 	<%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
 	</td>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
index c0fe606ff..daadc3675 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
@@ -12,7 +12,7 @@
 
 <% @bulletins.each do |post| %>
   <tr>
-	<td><%= post.bulletin_category.i18n_variable[I18n.locale] %></td>
+	<td><%= post.bulletin_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td><%= link_to post.title[I18n.locale], panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>
 	</td>
 	<td><%= post.postdate %></td>
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
index 956e98dca..e3ac7476e 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
@@ -56,7 +56,6 @@ class Panel::News::BackEnd::NewsBulletinCategorysController < OrbitBackendContro
   # GET /news_bulletins/1/edit
   def edit
     @news_bulletin_category = NewsBulletinCategory.find(params[:id])
-    @i18n_variable = @news_bulletin_category.i18n_variable	
 	
 	@url = panel_news_back_end_news_bulletin_category_path(@news_bulletin_category)
 
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
index b84e89b9a..bdd19082c 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
@@ -28,7 +28,7 @@
 			</div>
 		</div>
 	</td>
-	<td><%= news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] %></td>
+	<td><%= news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td>
 		<%= link_to news_bulletin.title[I18n.locale], panel_news_front_end_news_bulletin_path(news_bulletin, :category_id => news_bulletin.news_bulletin_category.id) rescue ''%>
 
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/show.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/show.html.erb
index 343d3a94d..1868c8fbc 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/show.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/show.html.erb
@@ -1,7 +1,7 @@
 <ul>
 	<li>
   <b><%= t('news.category') %></b>
-  <%= @news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] %>
+  <%= @news_bulletin.news_bulletin_category.i18n_variable[I18n.locale] rescue nil %>
 	</li>
 	<li>
   <b><%= t('news.postdate') %></b>
diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb
index 8c961cbab..a7d270a5a 100644
--- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb
+++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_link_categorys_controller.rb
@@ -38,7 +38,6 @@ class Panel::WebResource::BackEnd::WebLinkCategorysController < OrbitBackendCont
   # GET /web_links/1/edit
   def edit
     @web_link_category = WebLinkCategory.find(params[:id])
-    @i18n_variable = @web_link_category.i18n_variable	
 	
 	@url = panel_web_resource_back_end_web_link_category_path(@web_link_category)
 
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
index f7d70250f..7efa3b723 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb
@@ -19,7 +19,7 @@
 			</div>
 		</div>
 	</td>
-	<td><%= web_link.web_link_category.i18n_variable[I18n.locale] %></td>
+	<td><%= web_link.web_link_category.i18n_variable[I18n.locale] rescue nil %></td>
 	<td>
 	<%= link_to web_link.name[I18n.locale], panel_web_resource_back_end_web_link_path(web_link) %>
 	<div class="quick-edit">
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb
index f02d91569..e37346161 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/show.html.erb
@@ -9,7 +9,7 @@
 <ul>
 	<li>
   <b><%= t('announcement.category') %></b>
-  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %>
+  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %>
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
index 2c32f8008..0d1626a5d 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.html.erb
@@ -15,7 +15,7 @@
 
 	<% @web_links.each do |post| %>
 	  <tr>
-		<td><%= post.web_link_category.i18n_variable[I18n.locale] %></td>
+		<td><%= post.web_link_category.i18n_variable[I18n.locale] rescue nil %></td>
 		<td>
 		<%#= link_to post.name[I18n.locale], panel_web_resource_front_end_web_link_path(post) %>
 		<%= link_to post.name[I18n.locale], post.url, {:target => '_blank', :title => post.name[I18n.locale]} %>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb
index 755766fed..a3381e5c7 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/show.html.erb
@@ -9,7 +9,7 @@
 <ul>
 	<li>
   <b><%= t('announcement.category') %></b>
-  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %>
+  <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] rescue nil %>
 	</li>
 	<li>
   <b><%= t('announcement.postdate') %></b>
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb
index 8eebc6ac8..40d70aaa7 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/index.html.erb
@@ -14,7 +14,7 @@
 	  </tr>
 		<% @web_links.each do |post| %>
 		  <tr>
-				<td><%= post.web_link_category.i18n_variable[I18n.locale] %></td>
+				<td><%= post.web_link_category.i18n_variable[I18n.locale] rescue nil %></td>
 				<td>
 					<%= link_to post.name[I18n.locale], post.url, {:target => '_blank', :title => post.name[I18n.locale]} %>
 				</td>