consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add error message for invalid Newsletter user segment

Browse Source 
Instead of the name of the User Segment we'll display an error message
This commit is contained in:
Bertocq
2018-02-21 01:02:51 +01:00
parent 7dfa056fe0
commit 38f7a222f5
5 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/user_segments_helper.rb
View File

@@ -4,4 +4,12 @@ module UserSegmentsHelper
[t("admin.segment_recipient.#{user_segment_name}"), user_segment_name] [t("admin.segment_recipient.#{user_segment_name}"), user_segment_name]
end end
end end
def segment_name(user_segment)
if user_segment && UserSegments.respond_to?(user_segment)
I18n.t("admin.segment_recipient.#{user_segment}")
else
I18n.t("admin.segment_recipient.invalid_recipients_segment")
end
end
end end

2
app/views/admin/newsletters/index.html.erb
View File

@@ -19,7 +19,7 @@
<%= newsletter.subject %> <%= newsletter.subject %>
</td> </td>
<td> <td>
<%= t("admin.segment_recipient.#{newsletter.segment_recipient}") %> <%= segment_name(newsletter.segment_recipient) %>
</td> </td>
<td> <td>
<% if newsletter.draft? %> <% if newsletter.draft? %>

2
app/views/admin/newsletters/show.html.erb
View File

@@ -27,7 +27,7 @@
<div class="row"> <div class="row">
<div class="small-12 column"> <div class="small-12 column">
<strong><%= t("admin.newsletters.show.segment_recipient") %></strong><br> <strong><%= t("admin.newsletters.show.segment_recipient") %></strong><br>
<%= t("admin.segment_recipient.#{@newsletter.segment_recipient}") %> <%= segment_name(@newsletter.segment_recipient) %>
<%= t("admin.newsletters.show.affected_users", n: recipients_count) %> <%= t("admin.newsletters.show.affected_users", n: recipients_count) %>
</div> </div>
</div> </div>

1
config/locales/en/admin.yml
View File

@@ -523,6 +523,7 @@ en:
feasible_and_undecided_investment_authors: Authors of feasible or undecided investments in the current budget feasible_and_undecided_investment_authors: Authors of feasible or undecided investments in the current budget
selected_investment_authors: Authors of selected investments in the current budget selected_investment_authors: Authors of selected investments in the current budget
winner_investment_authors: Authors of winner investments in the current budget winner_investment_authors: Authors of winner investments in the current budget
invalid_recipients_segment: "Recipients user segment is invalid"
newsletters: newsletters:
create_success: Newsletter created successfully create_success: Newsletter created successfully
update_success: Newsletter updated successfully update_success: Newsletter updated successfully

1
config/locales/es/admin.yml
View File

@@ -522,6 +522,7 @@ es:
feasible_and_undecided_investment_authors: Usuarios autores de proyectos de gasto viables o sin decidir en los actuales presupuestos feasible_and_undecided_investment_authors: Usuarios autores de proyectos de gasto viables o sin decidir en los actuales presupuestos
selected_investment_authors: Usuarios autores de proyectos de gasto seleccionadas en los actuales presupuestos selected_investment_authors: Usuarios autores de proyectos de gasto seleccionadas en los actuales presupuestos
winner_investment_authors: Usuarios autores de proyectos de gasto ganadoras en los actuales presupuestos winner_investment_authors: Usuarios autores de proyectos de gasto ganadoras en los actuales presupuestos
invalid_recipients_segment: "El segmento de destinatarios es inválido"
newsletters: newsletters:
create_success: Newsletter creada correctamente create_success: Newsletter creada correctamente
update_success: Newsletter actualizada correctamente update_success: Newsletter actualizada correctamente