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

Unify user permission texts

Browse Source 
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:
Javi Martín
2022-05-05 16:11:26 +02:00
parent 67e9c68662
commit 92b1e53fc3
17 changed files with 26 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/account/show.html.erb
View File

@@ -94,15 +94,15 @@
<p><%= t("account.show.user_permission_info") %></p>
<ul>
<li><span class="icon-check"></span>&nbsp;<%= t("account.show.user_permission_debates") %></li>
<li><span class="icon-check"></span>&nbsp;<%= t("account.show.user_permission_proposal") %></li>
<li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_debates") %></li>
<li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_proposal") %></li>
<li>
<% if current_user.level_two_or_three_verified? %>
<span class="icon-check"></span>
<% else %>
<span class="icon-x"></span>
<% end %>
<%= t("account.show.user_permission_support_proposal") %>
<%= t("verification.user_permission_support_proposal") %>
</li>
<li>
<% if current_user.level_three_verified? %>
@@ -110,7 +110,7 @@
<% else %>
<span class="icon-x"></span>
<% end %>
<%= t("account.show.user_permission_votes") %>
<%= t("verification.user_permission_votes") %>
</li>
</ul>

4
app/views/management/_user_permissions.html.erb
View File

@@ -7,10 +7,10 @@
<p><%= message %></p>
<ul>
<% [:debates, :create_proposals, :support_proposals, :vote_proposals].each do |permission| %>
<% [:debates, :proposal, :support_proposal, :votes].each do |permission| %>
<li>
<span class="<%= permissions.include?(permission) ? "icon-check" : "icon-x" %>"></span>
<%= t("management.permissions.#{permission}") %>
<%= t("verification.user_permission_#{permission}") %>
</li>
<% end %>
</ul>

2
app/views/management/document_verifications/invalid_document.html.erb
View File

@@ -8,7 +8,7 @@
<%= render "management/user_permissions",
message: t("management.document_verifications.not_in_census_info"),
permissions: [:debates, :create_proposals] %>
permissions: [:debates, :proposal] %>
<p>
<%= sanitize(t("management.document_verifications.has_no_account",

2
app/views/management/document_verifications/new.html.erb
View File

@@ -4,7 +4,7 @@
<%= render "management/user_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,
as: :document_verification,

2
app/views/management/document_verifications/verified.html.erb
View File

@@ -4,6 +4,6 @@
<%= render "management/user_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>

2
app/views/management/email_verifications/sent.html.erb
View File

@@ -4,7 +4,7 @@
<%= render "management/user_permissions",
message: t("management.email_verifications.document_found_in_census"),
permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
permissions: [:debates, :proposal, :support_proposal, :votes] %>
<p>
<a href="javascript:window.print();" class="button warning"><%= t("management.print_info") %></a>

2
app/views/management/users/new.html.erb
View File

@@ -25,6 +25,6 @@
<div class="callout">
<%= render "management/user_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>

2
app/views/management/users/show.html.erb
View File

@@ -6,6 +6,6 @@
<%= render "management/user_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>

8
config/locales/en/general.yml
View File

@@ -11,13 +11,9 @@ en:
save_changes_submit: Save changes
recommendations: Recommendations
title: My account
user_permission_debates: Participate in debates
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_verify: To perform all the actions verify your account.
user_permission_votes: Participate in final voting
verified_account: Account verified
verify_my_account: Verify my account
application:
@@ -892,13 +888,9 @@ en:
go_to_index: Not now, go to index page
start_using_consul: Go to index page
title: Participate
user_permission_debates: Participate in debates
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_my_account: Verify my account
user_permission_votes: Participate in final voting
invisible_captcha:
sentence_for_humans: "If you are human, ignore this field"
timestamp_error_message: "Sorry, that was too quick! Please resubmit."

5
config/locales/en/management.yml
View File

@@ -64,11 +64,6 @@ en:
users: Users management
user_invites: Send invitations
select_user: Select user
permissions:
create_proposals: Create proposals
debates: Engage in debates
support_proposals: Support proposals
vote_proposals: Vote proposals
print:
proposals_info: Create your proposal on http://url.consul
proposals_title: "Proposals:"

8
config/locales/es/general.yml
View File

@@ -11,13 +11,9 @@ es:
save_changes_submit: Guardar cambios
recommendations: Recomendaciones
title: Mi cuenta
user_permission_debates: Participar en debates
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_verify: Para poder realizar todas las acciones, verifica tu cuenta.
user_permission_votes: Participar en las votaciones finales
verified_account: Cuenta verificada
verify_my_account: Verificar mi cuenta
application:
@@ -892,13 +888,9 @@ es:
go_to_index: Ahora no, ir a la página de inicio
start_using_consul: Ir a la página de inicio
title: Empieza a participar
user_permission_debates: Participar en debates
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_my_account: Verificar mi cuenta
user_permission_votes: Participar en las votaciones finales
invisible_captcha:
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."

5
config/locales/es/management.yml
View File

@@ -64,11 +64,6 @@ es:
users: Gestión de usuarios
user_invites: Enviar invitaciones
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:
proposals_info: Haz tu propuesta en http://url.consul
proposals_title: "Propuestas:"

8
db/pages/welcome_level_three_verified.rb
View File

@@ -3,10 +3,10 @@ def generate_content(page)
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_debates")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_proposal")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_support_proposal")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_votes")}</li>
<li>#{I18n.t("verification.user_permission_debates")}</li>
<li>#{I18n.t("verification.user_permission_proposal")}</li>
<li>#{I18n.t("verification.user_permission_support_proposal")}</li>
<li>#{I18n.t("verification.user_permission_votes")}</li>
</ul>
<p>#{I18n.t("account.show.verified_account")}</p>

8
db/pages/welcome_level_two_verified.rb
View File

@@ -3,14 +3,14 @@ def generate_content(page)
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_debates")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_proposal")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_support_proposal")}</li>
<li>#{I18n.t("verification.user_permission_debates")}</li>
<li>#{I18n.t("verification.user_permission_proposal")}</li>
<li>#{I18n.t("verification.user_permission_support_proposal")}</li>
</ul>
<p>#{I18n.t("welcome.welcome.user_permission_verify")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_votes")}</li>
<li>#{I18n.t("verification.user_permission_votes")}</li>
</ul>
<a href='/verification' class='button success radius expand'>

8
db/pages/welcome_not_verified.rb
View File

@@ -3,14 +3,14 @@ def generate_content(page)
page.content = "<p>#{I18n.t("welcome.welcome.user_permission_info")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_debates")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_proposal")}</li>
<li>#{I18n.t("verification.user_permission_debates")}</li>
<li>#{I18n.t("verification.user_permission_proposal")}</li>
</ul>
<p>#{I18n.t("welcome.welcome.user_permission_verify")}</p>
<ul>
<li>#{I18n.t("welcome.welcome.user_permission_support_proposal")}</li>
<li>#{I18n.t("welcome.welcome.user_permission_votes")}</li>
<li>#{I18n.t("verification.user_permission_support_proposal")}</li>
<li>#{I18n.t("verification.user_permission_votes")}</li>
</ul>
<a href='/verification' class='button success radius expand'>

2
spec/system/management/document_verifications_spec.rb
View File

@@ -20,7 +20,7 @@ describe "DocumentVerifications" do
fill_in "document_verification_document_number", with: user.document_number
click_button "Check document"
expect(page).to have_content "Vote proposals"
expect(page).to have_content "Participate in final voting"
click_button "Verify"

2
spec/system/management/managed_users_spec.rb
View File

@@ -34,7 +34,7 @@ describe "Managed User" do
fill_in "document_verification_document_number", with: user.document_number
click_button "Check document"
expect(page).to have_content "Vote proposals"
expect(page).to have_content "Participate in final voting"
click_button "Verify"