diff --git a/app/controllers/admin/admin_notifications_controller.rb b/app/controllers/admin/admin_notifications_controller.rb index 1dd03038a..33e99f9ed 100644 --- a/app/controllers/admin/admin_notifications_controller.rb +++ b/app/controllers/admin/admin_notifications_controller.rb @@ -1,4 +1,5 @@ class Admin::AdminNotificationsController < Admin::BaseController + include Translatable def index @admin_notifications = AdminNotification.all @@ -62,6 +63,13 @@ class Admin::AdminNotificationsController < Admin::BaseController private def admin_notification_params - params.require(:admin_notification).permit(:title, :body, :link, :segment_recipient) + attributes = [:title, :body, :link, :segment_recipient, + *translation_params(AdminNotification)] + + params.require(:admin_notification).permit(attributes) + end + + def resource + AdminNotification.find(params[:id]) end end diff --git a/app/models/admin_notification.rb b/app/models/admin_notification.rb index eccd90910..ef632b1f1 100644 --- a/app/models/admin_notification.rb +++ b/app/models/admin_notification.rb @@ -1,6 +1,10 @@ class AdminNotification < ActiveRecord::Base include Notifiable + translates :title, touch: :true + translates :body, touch: :true + globalize_accessors + validates :title, presence: true validates :body, presence: true validates :segment_recipient, presence: true diff --git a/app/views/admin/admin_notifications/_form.html.erb b/app/views/admin/admin_notifications/_form.html.erb index a08342f2b..ba9a77a79 100644 --- a/app/views/admin/admin_notifications/_form.html.erb +++ b/app/views/admin/admin_notifications/_form.html.erb @@ -1,11 +1,16 @@ -<%= form_for [:admin, @admin_notification] do |f| %> +<%= render "admin/shared/globalize_locales", resource: @admin_notification %> + +<%= translatable_form_for [:admin, @admin_notification] do |f| %> <%= render 'shared/errors', resource: @admin_notification %> <%= f.select :segment_recipient, options_for_select(user_segments_options, @admin_notification[:segment_recipient]) %> - <%= f.text_field :title %> + + <%= f.translatable_text_field :title %> + <%= f.text_field :link %> - <%= f.text_area :body %> + + <%= f.translatable_text_area :body %>
<%= f.submit t("admin.admin_notifications.#{admin_submit_action(@admin_notification)}.submit_button"), diff --git a/db/migrate/20180731150800_add_admin_notification_translations.rb b/db/migrate/20180731150800_add_admin_notification_translations.rb new file mode 100644 index 000000000..519751fd7 --- /dev/null +++ b/db/migrate/20180731150800_add_admin_notification_translations.rb @@ -0,0 +1,14 @@ +class AddAdminNotificationTranslations < ActiveRecord::Migration + + def self.up + AdminNotification.create_translation_table!( + title: :string, + body: :text + ) + end + + def self.down + AdminNotification.drop_translation_table! + end +end + diff --git a/db/schema.rb b/db/schema.rb index 867737358..b6370693a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -30,6 +30,18 @@ ActiveRecord::Schema.define(version: 20180813141443) do add_index "activities", ["actionable_id", "actionable_type"], name: "index_activities_on_actionable_id_and_actionable_type", using: :btree add_index "activities", ["user_id"], name: "index_activities_on_user_id", using: :btree + create_table "admin_notification_translations", force: :cascade do |t| + t.integer "admin_notification_id", null: false + t.string "locale", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "title" + t.text "body" + end + + add_index "admin_notification_translations", ["admin_notification_id"], name: "index_admin_notification_translations_on_admin_notification_id", using: :btree + add_index "admin_notification_translations", ["locale"], name: "index_admin_notification_translations_on_locale", using: :btree + create_table "admin_notifications", force: :cascade do |t| t.string "title" t.text "body" diff --git a/spec/features/admin/admin_notifications_spec.rb b/spec/features/admin/admin_notifications_spec.rb index 4035c17d0..f3706cbdc 100644 --- a/spec/features/admin/admin_notifications_spec.rb +++ b/spec/features/admin/admin_notifications_spec.rb @@ -8,6 +8,11 @@ feature "Admin Notifications" do create(:budget) end + it_behaves_like "translatable", + "admin_notification", + "edit_admin_admin_notification_path", + %w[title body] + context "Show" do scenario "Valid Admin Notification" do notification = create(:admin_notification, title: 'Notification title', @@ -180,7 +185,7 @@ feature "Admin Notifications" do notification = create(:admin_notification) visit edit_admin_admin_notification_path(notification) - fill_in :admin_notification_title, with: '' + fill_in :admin_notification_title_en, with: '' click_button "Update notification" expect(page).to have_content error_message diff --git a/spec/shared/features/translatable.rb b/spec/shared/features/translatable.rb index 215148fdc..9757b134c 100644 --- a/spec/shared/features/translatable.rb +++ b/spec/shared/features/translatable.rb @@ -186,6 +186,8 @@ def update_button_text case translatable_class.name when "Budget::Investment::Milestone" "Update milestone" + when "AdminNotification" + "Update notification" else "Save changes" end diff --git a/spec/support/common_actions/notifications.rb b/spec/support/common_actions/notifications.rb index 264d0ef83..8b7615b0a 100644 --- a/spec/support/common_actions/notifications.rb +++ b/spec/support/common_actions/notifications.rb @@ -43,8 +43,8 @@ module Notifications def fill_in_admin_notification_form(options = {}) select (options[:segment_recipient] || 'All users'), from: :admin_notification_segment_recipient - fill_in :admin_notification_title, with: (options[:title] || 'This is the notification title') - fill_in :admin_notification_body, with: (options[:body] || 'This is the notification body') + fill_in :admin_notification_title_en, with: (options[:title] || 'This is the notification title') + fill_in :admin_notification_body_en, with: (options[:body] || 'This is the notification body') fill_in :admin_notification_link, with: (options[:link] || 'https://www.decide.madrid.es/vota') end end