diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 33f475c4..ad1a81bc 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -6,9 +6,12 @@ class Bulletin
include Mongoid::MultiParameterAttributes
# field :category_id, :type => Integer
- field :title
- field :subtitle
- field :text
+ # field :title
+ has_one :title_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+ has_one :subtitle_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+ has_one :text_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+ # field :subtitle
+ # field :text
field :postdate , :type => Date
field :deadline , :type => Date
field :url
@@ -28,7 +31,7 @@ class Bulletin
accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
- validates_presence_of :title
+ validates_presence_of :title_variable
after_save :save_bulletin_files
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 419a27ef..df81381a 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -18,17 +18,35 @@
<%= f.label :title %>
- <%= f.text_field :title %>
+ <%#= f.text_field :title %>
+ <%= f.fields_for :title_variable, (@bulletin.new_record? ? @bulletin.build_title_variable : @bulletin.title_variable) do |f| %>
+ <% @site_valid_locales.each do |locale| %>
+ <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+ <%= f.text_field locale, :style => "width:130px" %>
+ <% end %>
+ <% end %>
<%= f.label :subtitle %>
- <%= f.text_area :subtitle, :rows => 10, :cols => 40 %>
+ <%#= f.text_area :subtitle, :rows => 10, :cols => 40 %>
+ <%= f.fields_for :subtitle_variable, (@bulletin.new_record? ? @bulletin.build_subtitle_variable : @bulletin.subtitle_variable) do |f| %>
+ <% @site_valid_locales.each do |locale| %>
+ <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+ <%= f.text_area locale, :rows => 10, :cols => 40 %>
+ <% end %>
+ <% end %>
<%= f.label :text %>
- <%= f.text_area :text, :rows => 10, :cols => 40 %>
+ <%#= f.text_area :text, :rows => 10, :cols => 40 %>
+ <%= f.fields_for :text_variable, (@bulletin.new_record? ? @bulletin.build_text_variable : @bulletin.text_variable) do |f| %>
+ <% @site_valid_locales.each do |locale| %>
+ <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+ <%= f.text_area locale, :rows => 10, :cols => 40 %>
+ <% end %>
+ <% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index a5a496b2..d614f7e1 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -60,7 +60,7 @@
<%= (post.deadline) ? post.deadline : t('bulletin.no_deadline') %> |
<%= post.bulletin_category.i18n_variable[I18n.locale] %> |
<%#= link_to post.title, panel_announcement_front_end_bulletin_path(post) %>
- <%= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
+ <%= link_to post.title_variable[I18n.locale], panel_announcement_back_end_bulletin_path(post) %>
|
<%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(post) %> |
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 87d08897..cc753be0 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
@@ -17,7 +17,7 @@
<%= t('announcement.title') %>
- <%= @bulletin.title %>
+ <%= @bulletin.title_variable[I18n.locale] %>
<%#= image_tag(@bulletin.image.url, :size => "320x240") if @bulletin.image.file %>
@@ -25,11 +25,11 @@
<%= t('announcement.subtitle') %>
- <%= @bulletin.subtitle %>
+ <%= @bulletin.subtitle_variable[I18n.locale] %>
<%= t('announcement.text') %>
- <%= @bulletin.text %>
+ <%= @bulletin.text_variable[I18n.locale] %>
|