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

Merge pull request #3191 from consul/ui-i18n-details

Browse Source 
Fix i18n and UI minor details
This commit is contained in:
Alberto
2019-02-13 10:55:03 +01:00
committed by GitHub
parent e76f483850 e8ad9f749e
commit 938d5eba43
13 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/layout.scss
View File

@@ -980,7 +980,7 @@ footer {
}
.locale-switcher {
background: #1a1a1a;
background: #001d33;
border: 0;
border-radius: rem-calc(4);
color: #fff;

4
app/views/admin/settings/_configuration.html.erb
View File

@@ -19,10 +19,10 @@
</td>
<td class="small-6">
<%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %>
<div class="small-12 medium-6 large-9 column">
<div class="small-12 medium-6 large-8 column">
<%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %>
</div>
<div class="small-12 medium-6 large-3 column">
<div class="small-12 medium-6 large-4 column">
<%= f.submit(t('admin.settings.index.update_setting'), class: "button hollow expanded") %>
</div>
<% end %>

4
app/views/budgets/investments/_investment_show.html.erb
View File

@@ -194,8 +194,8 @@
url: budget_investment_url(investment.budget, investment),
description: t("budgets.investments.share.message",
title: investment.title,
org: setting['org_name']),
mobile: t("budgets.investments.share.message_mobile",
handle: setting['org_name']),
mobile: t("budgets.investments.share.message",
title: investment.title,
handle: setting['twitter_handle']) %>

4
app/views/proposals/_social_share.html.erb
View File

@@ -4,7 +4,7 @@
url: proposal_url(proposal),
description: t("proposals.share.message",
summary: proposal.summary,
org: setting['org_name']),
mobile: t("proposals.share.message_mobile",
handle: setting['org_name']),
mobile: t("proposals.share.message",
summary: proposal.summary,
handle: setting['twitter_handle']) %>

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

@@ -87,7 +87,7 @@ en:
table_edit_budget: Edit
edit_groups: Edit headings groups
edit_budget: Edit budget
no_budgets: "There are no open budgets."
no_budgets: "There are no budgets."
create:
notice: New participatory budget created successfully!
update:

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

@@ -106,8 +106,7 @@ en:
confidence_score: highest rated
price: by price
share:
message: "I created the investment project %{title} in %{org}. Create an investment project you too!"
message_mobile: "I created the investment project %{title} in %{handle}. Create an investment project you too!"
message: "I created the investment project %{title} in %{handle}. Create an investment project too!"
show:
author_deleted: User deleted
price_explanation: Price explanation
@@ -147,7 +146,7 @@ en:
different_heading_assigned_html: "You have active votes in another heading: %{heading_link}"
change_ballot: "If your change your mind you can remove your votes in %{check_ballot} and start again."
check_ballot_link: "check my ballot"
price: "This heading have a budget of"
price: "This heading has a budget of"
progress_bar:
assigned: "You have assigned: "
available: "Available budget: "

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

@@ -445,8 +445,7 @@ en:
form:
submit_button: Save changes
share:
message: "I supported the proposal %{summary} in %{org}. If you're interested, support it too!"
message_mobile: "I supported the proposal %{summary} in %{handle}. If you're interested, support it too!"
message: "I supported the proposal %{summary} in %{handle}. If you're interested, support it too!"
polls:
all: "All"
no_dates: "no date assigned"

4
config/locales/en/settings.yml
View File

@@ -14,7 +14,7 @@ en:
official_level_5_name_description: "Tag that will appear on users marked as Level 5 official position"
max_ratio_anon_votes_on_debates: "Maximum ratio of anonymous votes per Debate"
max_ratio_anon_votes_on_debates_description: "Anonymous votes are by registered users with an unverified account"
max_votes_for_proposal_edit: "Number of votes from which a Proposal can no longer be edited"
max_votes_for_proposal_edit: "Number of supports from which a Proposal can no longer be edited"
max_votes_for_proposal_edit_description: "From this number of supports the author of a Proposal can no longer edit it"
max_votes_for_debate_edit: "Number of votes from which a Debate can no longer be edited"
max_votes_for_debate_edit_description: "From this number of votes the author of a Debate can no longer edit it"
@@ -22,7 +22,7 @@ en:
proposal_code_prefix_description: "This prefix will appear in the Proposals before the creation date and its ID"
featured_proposals_number: "Number of featured proposals"
featured_proposals_number_description: "Number of featured proposals that will be displayed if the Featured proposals feature is active"
votes_for_proposal_success: "Number of votes necessary for approval of a Proposal"
votes_for_proposal_success: "Number of supports necessary for approval of a Proposal"
votes_for_proposal_success_description: "When a proposal reaches this number of supports it will no longer be able to receive more supports and is considered successful"
months_to_archive_proposals: "Months to archive Proposals"
months_to_archive_proposals_description: "After this number of months the Proposals will be archived and will no longer be able to receive supports"

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

@@ -87,7 +87,7 @@ es:
table_edit_budget: Editar
edit_groups: Editar grupos de partidas
edit_budget: Editar presupuesto
no_budgets: "No hay presupuestos abiertos."
no_budgets: "No hay presupuestos."
create:
notice: '¡Presupuestos participativos creados con éxito!'
update:

3
config/locales/es/budgets.yml
View File

@@ -106,8 +106,7 @@ es:
confidence_score: Mejor valorados
price: Por coste
share:
message: "He presentado el proyecto %{title} en %{org}. ¡Presenta un proyecto tú también!"
message_mobile: "He presentado el proyecto %{title} en %{handle}. ¡Presenta un proyecto tú también!"
message: "He presentado el proyecto %{title} en %{handle}. ¡Presenta un proyecto tú también!"
show:
author_deleted: Usuario eliminado
price_explanation: Informe de coste

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

@@ -445,8 +445,7 @@ es:
form:
submit_button: Guardar cambios
share:
message: "He apoyado la propuesta %{summary} en %{org}. Si te interesa, ¡apoya tú también!"
message_mobile: "He apoyado la propuesta %{summary} en %{handle}. Si te interesa, ¡apoya tú también!"
message: "He apoyado la propuesta %{summary} en %{handle}. Si te interesa, ¡apoya tú también!"
polls:
all: "Todas"
no_dates: "sin fecha asignada"

2
config/locales/es/settings.yml
View File

@@ -14,7 +14,7 @@ es:
official_level_5_name_description: "Etiqueta que aparecerá en los usuarios marcados como Nivel 5 de cargo público"
max_ratio_anon_votes_on_debates: "Porcentaje máximo de votos anónimos por Debate"
max_ratio_anon_votes_on_debates_description: "Se consideran votos anónimos los realizados por usuarios registrados con una cuenta sin verificar"
max_votes_for_proposal_edit: "Número de votos en que una Propuesta deja de poderse editar"
max_votes_for_proposal_edit: "Número de apoyos en que una Propuesta deja de poderse editar"
max_votes_for_proposal_edit_description: "A partir de este número de apoyos el autor de una Propuesta ya no podrá editarla"
max_votes_for_debate_edit: "Número de votos en que un Debate deja de poderse editar"
max_votes_for_debate_edit_description: "A partir de este número de votos el autor de un Debate ya no podrá editarlo"

4
spec/features/admin/budgets_spec.rb
View File

@@ -28,7 +28,7 @@ feature 'Admin budgets' do
scenario 'Displaying no open budgets text' do
visit admin_budgets_path
expect(page).to have_content("There are no open budgets.")
expect(page).to have_content("There are no budgets.")
end
scenario 'Displaying budgets' do
@@ -125,7 +125,7 @@ feature 'Admin budgets' do
click_link 'Delete budget'
expect(page).to have_content('Budget deleted successfully')
expect(page).to have_content('There are no open budgets.')
expect(page).to have_content("There are no budgets.")
end
scenario 'Try to destroy a budget with investments' do