Unify user permission texts
We had the same texts four times, with slight variations in the case of the management section. We're unifying them under the "verification" i18n namespace, since the texts are about actions which can be done depending on whether users are verified or not. Note the names of the i18n keys aren't very consistent, since we use "debates" in plural but "proposal" in singular. We're leaving it like this so existing translations aren't affected.
This commit is contained in:
@@ -94,15 +94,15 @@
|
|||||||
<p><%= t("account.show.user_permission_info") %></p>
|
<p><%= t("account.show.user_permission_info") %></p>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li><span class="icon-check"></span> <%= t("account.show.user_permission_debates") %></li>
|
<li><span class="icon-check"></span> <%= t("verification.user_permission_debates") %></li>
|
||||||
<li><span class="icon-check"></span> <%= t("account.show.user_permission_proposal") %></li>
|
<li><span class="icon-check"></span> <%= t("verification.user_permission_proposal") %></li>
|
||||||
<li>
|
<li>
|
||||||
<% if current_user.level_two_or_three_verified? %>
|
<% if current_user.level_two_or_three_verified? %>
|
||||||
<span class="icon-check"></span>
|
<span class="icon-check"></span>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span class="icon-x"></span>
|
<span class="icon-x"></span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= t("account.show.user_permission_support_proposal") %>
|
<%= t("verification.user_permission_support_proposal") %>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<% if current_user.level_three_verified? %>
|
<% if current_user.level_three_verified? %>
|
||||||
@@ -110,7 +110,7 @@
|
|||||||
<% else %>
|
<% else %>
|
||||||
<span class="icon-x"></span>
|
<span class="icon-x"></span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= t("account.show.user_permission_votes") %>
|
<%= t("verification.user_permission_votes") %>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|||||||
@@ -7,10 +7,10 @@
|
|||||||
<p><%= message %></p>
|
<p><%= message %></p>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<% [:debates, :create_proposals, :support_proposals, :vote_proposals].each do |permission| %>
|
<% [:debates, :proposal, :support_proposal, :votes].each do |permission| %>
|
||||||
<li>
|
<li>
|
||||||
<span class="<%= permissions.include?(permission) ? "icon-check" : "icon-x" %>"></span>
|
<span class="<%= permissions.include?(permission) ? "icon-check" : "icon-x" %>"></span>
|
||||||
<%= t("management.permissions.#{permission}") %>
|
<%= t("verification.user_permission_#{permission}") %>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
<%= render "management/user_permissions",
|
<%= render "management/user_permissions",
|
||||||
message: t("management.document_verifications.not_in_census_info"),
|
message: t("management.document_verifications.not_in_census_info"),
|
||||||
permissions: [:debates, :create_proposals] %>
|
permissions: [:debates, :proposal] %>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<%= sanitize(t("management.document_verifications.has_no_account",
|
<%= sanitize(t("management.document_verifications.has_no_account",
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<%= render "management/user_permissions",
|
<%= render "management/user_permissions",
|
||||||
message: t("management.document_verifications.in_census_has_following_permissions"),
|
message: t("management.document_verifications.in_census_has_following_permissions"),
|
||||||
permissions: [:debates, :create_proposals, :support_proposals] %>
|
permissions: [:debates, :proposal, :support_proposal] %>
|
||||||
|
|
||||||
<%= form_for @document_verification,
|
<%= form_for @document_verification,
|
||||||
as: :document_verification,
|
as: :document_verification,
|
||||||
|
|||||||
@@ -4,6 +4,6 @@
|
|||||||
|
|
||||||
<%= render "management/user_permissions",
|
<%= render "management/user_permissions",
|
||||||
message: t("management.document_verifications.in_census_has_following_permissions"),
|
message: t("management.document_verifications.in_census_has_following_permissions"),
|
||||||
permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
|
permissions: [:debates, :proposal, :support_proposal, :votes] %>
|
||||||
|
|
||||||
<a href="javascript:window.print();" class="button warning"><%= t("management.print_info") %></a>
|
<a href="javascript:window.print();" class="button warning"><%= t("management.print_info") %></a>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<%= render "management/user_permissions",
|
<%= render "management/user_permissions",
|
||||||
message: t("management.email_verifications.document_found_in_census"),
|
message: t("management.email_verifications.document_found_in_census"),
|
||||||
permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
|
permissions: [:debates, :proposal, :support_proposal, :votes] %>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<a href="javascript:window.print();" class="button warning"><%= t("management.print_info") %></a>
|
<a href="javascript:window.print();" class="button warning"><%= t("management.print_info") %></a>
|
||||||
|
|||||||
@@ -25,6 +25,6 @@
|
|||||||
<div class="callout">
|
<div class="callout">
|
||||||
<%= render "management/user_permissions",
|
<%= render "management/user_permissions",
|
||||||
message: t("management.document_verifications.in_census_has_following_permissions"),
|
message: t("management.document_verifications.in_census_has_following_permissions"),
|
||||||
permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
|
permissions: [:debates, :proposal, :support_proposal, :votes] %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -6,6 +6,6 @@
|
|||||||
|
|
||||||
<%= render "management/user_permissions",
|
<%= render "management/user_permissions",
|
||||||
message: t("management.document_verifications.in_census_has_following_permissions"),
|
message: t("management.document_verifications.in_census_has_following_permissions"),
|
||||||
permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
|
permissions: [:debates, :proposal, :support_proposal, :votes] %>
|
||||||
|
|
||||||
<a href="javascript:window.print();" class="button warning radius"><%= t("management.print_info") %></a>
|
<a href="javascript:window.print();" class="button warning radius"><%= t("management.print_info") %></a>
|
||||||
|
|||||||
@@ -11,13 +11,9 @@ en:
|
|||||||
save_changes_submit: Save changes
|
save_changes_submit: Save changes
|
||||||
recommendations: Recommendations
|
recommendations: Recommendations
|
||||||
title: My account
|
title: My account
|
||||||
user_permission_debates: Participate in debates
|
|
||||||
user_permission_info: With your account you can...
|
user_permission_info: With your account you can...
|
||||||
user_permission_proposal: Create new proposals
|
|
||||||
user_permission_support_proposal: Support proposals
|
|
||||||
user_permission_title: Participation
|
user_permission_title: Participation
|
||||||
user_permission_verify: To perform all the actions verify your account.
|
user_permission_verify: To perform all the actions verify your account.
|
||||||
user_permission_votes: Participate in final voting
|
|
||||||
verified_account: Account verified
|
verified_account: Account verified
|
||||||
verify_my_account: Verify my account
|
verify_my_account: Verify my account
|
||||||
application:
|
application:
|
||||||
@@ -892,13 +888,9 @@ en:
|
|||||||
go_to_index: Not now, go to index page
|
go_to_index: Not now, go to index page
|
||||||
start_using_consul: Go to index page
|
start_using_consul: Go to index page
|
||||||
title: Participate
|
title: Participate
|
||||||
user_permission_debates: Participate in debates
|
|
||||||
user_permission_info: With your account you can...
|
user_permission_info: With your account you can...
|
||||||
user_permission_proposal: Create new proposals
|
|
||||||
user_permission_support_proposal: Support proposals
|
|
||||||
user_permission_verify: "To perform the following actions verify your account."
|
user_permission_verify: "To perform the following actions verify your account."
|
||||||
user_permission_verify_my_account: Verify my account
|
user_permission_verify_my_account: Verify my account
|
||||||
user_permission_votes: Participate in final voting
|
|
||||||
invisible_captcha:
|
invisible_captcha:
|
||||||
sentence_for_humans: "If you are human, ignore this field"
|
sentence_for_humans: "If you are human, ignore this field"
|
||||||
timestamp_error_message: "Sorry, that was too quick! Please resubmit."
|
timestamp_error_message: "Sorry, that was too quick! Please resubmit."
|
||||||
|
|||||||
@@ -64,11 +64,6 @@ en:
|
|||||||
users: Users management
|
users: Users management
|
||||||
user_invites: Send invitations
|
user_invites: Send invitations
|
||||||
select_user: Select user
|
select_user: Select user
|
||||||
permissions:
|
|
||||||
create_proposals: Create proposals
|
|
||||||
debates: Engage in debates
|
|
||||||
support_proposals: Support proposals
|
|
||||||
vote_proposals: Vote proposals
|
|
||||||
print:
|
print:
|
||||||
proposals_info: Create your proposal on http://url.consul
|
proposals_info: Create your proposal on http://url.consul
|
||||||
proposals_title: "Proposals:"
|
proposals_title: "Proposals:"
|
||||||
|
|||||||
@@ -11,13 +11,9 @@ es:
|
|||||||
save_changes_submit: Guardar cambios
|
save_changes_submit: Guardar cambios
|
||||||
recommendations: Recomendaciones
|
recommendations: Recomendaciones
|
||||||
title: Mi cuenta
|
title: Mi cuenta
|
||||||
user_permission_debates: Participar en debates
|
|
||||||
user_permission_info: Con tu cuenta ya puedes...
|
user_permission_info: Con tu cuenta ya puedes...
|
||||||
user_permission_proposal: Crear nuevas propuestas
|
|
||||||
user_permission_support_proposal: Apoyar propuestas
|
|
||||||
user_permission_title: Participación
|
user_permission_title: Participación
|
||||||
user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta.
|
user_permission_verify: Para poder realizar todas las acciones, verifica tu cuenta.
|
||||||
user_permission_votes: Participar en las votaciones finales
|
|
||||||
verified_account: Cuenta verificada
|
verified_account: Cuenta verificada
|
||||||
verify_my_account: Verificar mi cuenta
|
verify_my_account: Verificar mi cuenta
|
||||||
application:
|
application:
|
||||||
@@ -892,13 +888,9 @@ es:
|
|||||||
go_to_index: Ahora no, ir a la página de inicio
|
go_to_index: Ahora no, ir a la página de inicio
|
||||||
start_using_consul: Ir a la página de inicio
|
start_using_consul: Ir a la página de inicio
|
||||||
title: Empieza a participar
|
title: Empieza a participar
|
||||||
user_permission_debates: Participar en debates
|
|
||||||
user_permission_info: Con tu cuenta ya puedes...
|
user_permission_info: Con tu cuenta ya puedes...
|
||||||
user_permission_proposal: Crear nuevas propuestas
|
|
||||||
user_permission_support_proposal: Apoyar propuestas
|
|
||||||
user_permission_verify: "Para poder realizar las siguientes acciones, verifica tu cuenta."
|
user_permission_verify: "Para poder realizar las siguientes acciones, verifica tu cuenta."
|
||||||
user_permission_verify_my_account: Verificar mi cuenta
|
user_permission_verify_my_account: Verificar mi cuenta
|
||||||
user_permission_votes: Participar en las votaciones finales
|
|
||||||
invisible_captcha:
|
invisible_captcha:
|
||||||
sentence_for_humans: "Si eres humano, por favor ignora este campo"
|
sentence_for_humans: "Si eres humano, por favor ignora este campo"
|
||||||
timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario."
|
timestamp_error_message: "Eso ha sido demasiado rápido. Por favor, reenvía el formulario."
|
||||||
|
|||||||
@@ -64,11 +64,6 @@ es:
|
|||||||
users: Gestión de usuarios
|
users: Gestión de usuarios
|
||||||
user_invites: Enviar invitaciones
|
user_invites: Enviar invitaciones
|
||||||
select_user: Seleccionar usuario
|
select_user: Seleccionar usuario
|
||||||
permissions:
|
|
||||||
create_proposals: Crear nuevas propuestas
|
|
||||||
debates: Participar en debates
|
|
||||||
support_proposals: Apoyar propuestas
|
|
||||||
vote_proposals: Participar en las votaciones finales
|
|
||||||
print:
|
print:
|
||||||
proposals_info: Haz tu propuesta en http://url.consul
|
proposals_info: Haz tu propuesta en http://url.consul
|
||||||
proposals_title: "Propuestas:"
|
proposals_title: "Propuestas:"
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ def generate_content(page)
|
|||||||
|
|
||||||
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
|
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_debates")}</li>
|
<li>#{I18n.t("verification.user_permission_debates")}</li>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_proposal")}</li>
|
<li>#{I18n.t("verification.user_permission_proposal")}</li>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_support_proposal")}</li>
|
<li>#{I18n.t("verification.user_permission_support_proposal")}</li>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_votes")}</li>
|
<li>#{I18n.t("verification.user_permission_votes")}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<p>#{I18n.t("account.show.verified_account")}</p>
|
<p>#{I18n.t("account.show.verified_account")}</p>
|
||||||
|
|||||||
@@ -3,14 +3,14 @@ def generate_content(page)
|
|||||||
|
|
||||||
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
|
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_debates")}</li>
|
<li>#{I18n.t("verification.user_permission_debates")}</li>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_proposal")}</li>
|
<li>#{I18n.t("verification.user_permission_proposal")}</li>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_support_proposal")}</li>
|
<li>#{I18n.t("verification.user_permission_support_proposal")}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<p>#{I18n.t("welcome.welcome.user_permission_verify")}</p>
|
<p>#{I18n.t("welcome.welcome.user_permission_verify")}</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_votes")}</li>
|
<li>#{I18n.t("verification.user_permission_votes")}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<a href='/verification' class='button success radius expand'>
|
<a href='/verification' class='button success radius expand'>
|
||||||
|
|||||||
@@ -3,14 +3,14 @@ def generate_content(page)
|
|||||||
|
|
||||||
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
|
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_debates")}</li>
|
<li>#{I18n.t("verification.user_permission_debates")}</li>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_proposal")}</li>
|
<li>#{I18n.t("verification.user_permission_proposal")}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<p>#{I18n.t("welcome.welcome.user_permission_verify")}</p>
|
<p>#{I18n.t("welcome.welcome.user_permission_verify")}</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_support_proposal")}</li>
|
<li>#{I18n.t("verification.user_permission_support_proposal")}</li>
|
||||||
<li>#{I18n.t("welcome.welcome.user_permission_votes")}</li>
|
<li>#{I18n.t("verification.user_permission_votes")}</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<a href='/verification' class='button success radius expand'>
|
<a href='/verification' class='button success radius expand'>
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ describe "DocumentVerifications" do
|
|||||||
fill_in "document_verification_document_number", with: user.document_number
|
fill_in "document_verification_document_number", with: user.document_number
|
||||||
click_button "Check document"
|
click_button "Check document"
|
||||||
|
|
||||||
expect(page).to have_content "Vote proposals"
|
expect(page).to have_content "Participate in final voting"
|
||||||
|
|
||||||
click_button "Verify"
|
click_button "Verify"
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ describe "Managed User" do
|
|||||||
fill_in "document_verification_document_number", with: user.document_number
|
fill_in "document_verification_document_number", with: user.document_number
|
||||||
click_button "Check document"
|
click_button "Check document"
|
||||||
|
|
||||||
expect(page).to have_content "Vote proposals"
|
expect(page).to have_content "Participate in final voting"
|
||||||
|
|
||||||
click_button "Verify"
|
click_button "Verify"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user