Skip to content

Commit

Permalink
Create new basic tab for admin information texts
Browse files Browse the repository at this point in the history
  • Loading branch information
decabeza committed May 14, 2019
1 parent 229738f commit 2adb885
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ class Admin::SiteCustomization::InformationTextsController < Admin::SiteCustomiz
before_action :delete_translations, only: [:update]

def index
@content = I18nContent.content_for(params[:tab] || :debates)
@tab = params[:tab] || :basic
@content = I18nContent.content_for(@tab)
end

def update
Expand Down
4 changes: 4 additions & 0 deletions app/helpers/site_customization_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ def translation_for_locale(content, locale)
false
end
end

def information_texts_tabs
[:basic, :debates, :community, :proposals, :polls, :layouts, :mailers, :management, :welcome]
end
end
14 changes: 12 additions & 2 deletions app/models/i18n_content.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,18 @@ def self.content_for(tab)
def self.translations_for(tab)
I18n.backend.send(:init_translations) unless I18n.backend.initialized?

I18n.backend.send(:translations)[I18n.locale].select do |key, _translations|
key.to_s == tab.to_s
if tab.to_sym == :basic
basic_file = "#{Rails.root}/config/locales/#{I18n.locale}/basic.yml"

if File.exists?(basic_file)
I18n.backend.send(:load_file, basic_file)[I18n.locale.to_s]
else
{}
end
else
I18n.backend.send(:translations)[I18n.locale].select do |key, _translations|
key.to_s == tab.to_s
end
end
end
end
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ul id="information-texts-tabs" class="tabs" >
<% [:debates, :community, :proposals, :polls, :layouts, :mailers, :management, :welcome].each do |tab| %>
<% information_texts_tabs.each do |tab| %>
<li class="tabs-title">
<% if tab.to_s == @tab %>
<%= link_to t("admin.menu.site_customization.information_texts_menu.#{tab}"), admin_site_customization_information_texts_path(tab: tab), :class => "is-active" %>
Expand Down
1 change: 1 addition & 0 deletions config/locales/en/admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,7 @@ en:
content_blocks: Custom content blocks
information_texts: Custom information texts
information_texts_menu:
basic: "Basic customization"
debates: "Debates"
community: "Community"
proposals: "Proposals"
Expand Down
1 change: 1 addition & 0 deletions config/locales/es/admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,7 @@ es:
content_blocks: Personalizar bloques
information_texts: Personalizar textos
information_texts_menu:
basic: "Personalización básica"
debates: "Debates"
community: "Comunidad"
proposals: "Propuestas"
Expand Down
33 changes: 21 additions & 12 deletions spec/features/admin/site_customization/information_texts_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@
scenario "page is correctly loaded" do
visit admin_site_customization_information_texts_path

click_link "Basic customization"
expect(page).to have_content "Help about debates"
expect(page).to have_content "Help about proposals"
expect(page).to have_content "Help about voting"
expect(page).to have_content "Help about collaborative legislation"
expect(page).to have_content "Help with participatory budgets"

click_link "Debates"
expect(page).to have_content "Help about debates"

Expand Down Expand Up @@ -57,39 +64,40 @@
context "Globalization" do

scenario "Add a translation", :js do
key = "debates.form.debate_title"
key = "debates.index.section_footer.title"

visit admin_site_customization_information_texts_path

select "Français", from: "translation_locale"
fill_in "contents_content_#{key}values_value_fr", with: "Titre personalise du débat"
fill_in "contents[content_#{key}]values[value_fr]", with: "Aide personalise sur les débats"

click_button "Save"

expect(page).to have_content "Translation updated successfully"

select "Français", from: "translation_locale"
visit admin_site_customization_information_texts_path

expect(page).to have_content "Titre personalise du débat"
expect(page).not_to have_content "Titre du débat"
select "Français", from: "translation_locale"
expect(page).to have_content "Aide personalise sur les débats"
expect(page).not_to have_content "Aide sur les débats"
end

scenario "Update a translation", :js do
key = "debates.form.debate_title"
content = create(:i18n_content, key: key, value_fr: "Titre personalise du débat")
key = "proposals.form.proposal_title"

visit admin_site_customization_information_texts_path
visit admin_site_customization_information_texts_path(tab: "proposals")

select "Français", from: "translation_locale"
fill_in "contents_content_#{key}values_value_fr", with: "Titre personalise again du débat"
fill_in "contents_content_#{key}values_value_fr", with: "Titre personalise de la proposition"

click_button "Save"
expect(page).to have_content "Translation updated successfully"

visit admin_site_customization_information_texts_path(tab: "proposals")
click_link "Français"

expect(page).to have_content "Titre personalise again du débat"
expect(page).not_to have_content "Titre personalise du débat"
expect(page).to have_content "Titre personalise de la proposition"
expect(page).not_to have_content "Titre de la proposition"
end

scenario "Remove a translation", :js do
Expand All @@ -103,14 +111,15 @@
value_en: "Custom debate text",
value_es: "Texto personalizado de debate")

visit admin_site_customization_information_texts_path
visit admin_site_customization_information_texts_path(tab: "debates")

click_link "Español"
click_link "Remove language"
click_button "Save"

expect(page).not_to have_link "Español"

visit admin_site_customization_information_texts_path(tab: "debates")
click_link "English"
expect(page).to have_content "Custom debate text"
expect(page).to have_content "Custom debate title"
Expand Down
34 changes: 34 additions & 0 deletions spec/features/site_customization/information_texts_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
require "rails_helper"

feature "Custom information texts" do

scenario "Show custom texts instead of default ones" do
admin = create(:administrator)
login_as(admin.user)

debate_key = "debates.index.section_footer.title"
proposal_key = "proposals.index.section_footer.title"

visit admin_site_customization_information_texts_path(tab: "debates")
fill_in "contents[content_#{debate_key}]values[value_en]", with: "Custom help about debates"
click_button "Save"

visit admin_site_customization_information_texts_path(tab: "proposals")
fill_in "contents[content_#{proposal_key}]values[value_en]", with: "Custom help about proposals"
click_button "Save"

visit debates_path

within("#section_help") do
expect(page).to have_content "Custom help about debates"
expect(page).not_to have_content "Help about debates"
end

visit proposals_path

within("#section_help") do
expect(page).to have_content "Custom help about proposals"
expect(page).not_to have_content "Help about proposals"
end
end
end

0 comments on commit 2adb885

Please sign in to comment.