diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 410f6fe0..8e944b6f 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -2,8 +2,8 @@
<%= f.alert_message t('form_alert_message') %>
<%= f.text_field :name, placeholder: 'Butter cookies' %>
- <%= f.text_field :tag_list, placeholder: 'cookie, butter', help: t('helpers.help.project.tag_list') %>
- <%= f.number_field :money_budget, placeholder: '10', prepend: current_user.currency_unit, help: t('helpers.help.project.money_budget', currency_unit: current_user.currency_unit) %>
- <%= f.number_field :time_budget, placeholder: '1', help: t('helpers.help.project.time_budget') %>
+ <%= f.text_field :tag_list, placeholder: 'cookie, butter' %>
+ <%= f.number_field :money_budget, placeholder: '10', prepend: current_user.currency_unit %>
+ <%= f.number_field :time_budget, placeholder: '1' %>
<%= f.submit %>
<% end %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 77993aa9..9dfab982 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -5,13 +5,17 @@
<%= f.text_field :email, placeholder: 'fcirillo@tomato.es' %>
<%= f.time_zone_select :time_zone, nil, { include_blank: true } %>
<%= f.select :currency, options_for_select(User::CURRENCIES.invert, @user.currency) %>
- <%= f.number_field :work_hours_per_day, placeholder: '8', help: t('helpers.help.user.work_hours_per_day') %>
- <%= f.number_field :average_hourly_rate, placeholder: '35.5', step: '0.1', prepend: current_user.currency_unit, help: t('helpers.help.user.average_hourly_rate') %>
- <%= f.range_field :volume, min: 0, max: 3, help: t('helpers.help.user.volume_html') %>
- <%= f.check_box :ticking, label: t('helpers.label.user.ticking') %>
-
+ <%= f.number_field :work_hours_per_day, placeholder: '8' %>
+ <%= f.number_field :average_hourly_rate, placeholder: '35.5', step: '0.1', prepend: current_user.currency_unit %>
+ <%= f.range_field :volume, min: 0, max: 3 %>
+ <%= f.form_group do %>
+ <%= f.check_box :ticking, label: t('helpers.label.user.ticking') %>
+ <% end %>
+ <%= f.text_field :color, placeholder: '#ccff00' %>
+ <%= f.form_group do %>
+
+ <% end %>
<%= f.submit %>
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 50d10a98..851ea9ad 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -40,18 +40,6 @@ en:
user:
color: Progress bar color
ticking: Enable timer ticking effect
- help:
- project:
- tag_list: A list of project related tags.
- money_budget: Available budget in %{currency_unit}.
- time_budget: Estimated time budget in hours.
- user:
- work_hours_per_day: How many hours do you work per day?
- average_hourly_rate: How much do you charge per hour?
- volume_html: >
- Default timer volume. 0 is mute, 3 is
- max volume.
- color: A hexadecimal color code.
submit:
create: Create %{model}
update: Update %{model}
@@ -124,6 +112,17 @@ en:
weekly: Weekly
monthly: Monthly
overall: Overall
+ activerecord:
+ help:
+ project:
+ tag_list: A list of project related tags.
+ money_budget: Available budget.
+ time_budget: Estimated time budget in hours.
+ user:
+ work_hours_per_day: How many hours do you work per day?
+ average_hourly_rate: How much do you charge per hour?
+ volume: Default timer volume. 0 is mute, 3 is max volume.
+ color: A hexadecimal color code.
mongoid:
models:
project:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 27ad140e..41a30265 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -40,18 +40,6 @@ es:
user:
color: Color de la barra de progreso
ticking: Habilitar el efecto de tictac del temporizador
- help:
- project:
- tag_list: Listado de etiquetas relacionadas con el proyecto.
- money_budget: Presupuesto disponible en %{currency_unit}.
- time_budget: Presupuesto estimado en horas.
- user:
- work_hours_per_day: ¿Cuántas horas trabajas por día?
- average_hourly_rate: ¿Cual es tu tarifa horaria?
- volume_html: >
- Volumen predeterminado del temporizador. 0 es silencioso
- , 3 es volumen máximo.
- color: Código hexadecimal del color.
submit:
create: Crear %{model}
update: Actualizar %{model}
@@ -126,6 +114,19 @@ es:
weekly: Semanal
monthly: Mensual
overall: General
+ activerecord:
+ help:
+ project:
+ tag_list: Listado de etiquetas relacionadas con el proyecto.
+ money_budget: Presupuesto disponible.
+ time_budget: Presupuesto estimado en horas.
+ user:
+ work_hours_per_day: ¿Cuántas horas trabajas por día?
+ average_hourly_rate: ¿Cual es tu tarifa horaria?
+ volume: >
+ Volumen predeterminado del temporizador. 0 es silencioso, 3 es volumen
+ máximo.
+ color: Código hexadecimal del color.
mongoid:
models:
project:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index dd5e821d..c66433d4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -38,19 +38,6 @@ fr:
user:
color: Couleur de la barre de progression
ticking: Activer l'effet de tic-tac
- help:
- project:
- tag_list: Une liste d'étiquettes liées au projet.
- money_budget: Budget disponible en %{currency_unit}.
- time_budget: Budget de temps estimé en heures.
- user:
- work_hours_per_day: Combien d'heures travailles-tu par jour?
- average_hourly_rate: Combien factures-tu de l'heure?
- volume_html: >
- Volume par défaut de l'alarme. 0 équivaut à muet,
- 3 c'est le
- volume maximum.
- color: Code hexadécimal pour la couleur.
submit:
create: Créer %{model}
update: Mettre à jour %{model}
@@ -121,6 +108,19 @@ fr:
weekly: Cette semaine
monthly: Ce mois-ci
overall: Général
+ activerecord:
+ help:
+ project:
+ tag_list: Une liste d'étiquettes liées au projet.
+ money_budget: Budget disponible.
+ time_budget: Budget de temps estimé en heures.
+ user:
+ work_hours_per_day: Combien d'heures travailles-tu par jour?
+ average_hourly_rate: Combien factures-tu de l'heure?
+ volume: >
+ Volume par défaut de l'alarme. 0 équivaut à muet, 3 c'est le volume
+ maximum.
+ color: Code hexadécimal pour la couleur.
mongoid:
models:
project:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 69009ed2..5f4d9f2b 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -38,18 +38,6 @@ pt-BR:
user:
color: Cor da barra de progresso
ticking: Habilitar som de tic-tac
- help:
- project:
- tag_list: Uma lista de tags relacionadas a projetos.
- money_budget: Orçamento disponível em %{currency_unit}.
- time_budget: Orçamento de tempo estimado em horas.
- user:
- work_hours_per_day: Quantas horas você trabalha por dia?
- average_hourly_rate: Quanto você cobra por hora?
- volume_html: >
- Volume padrão do temporizador. 0 significa mudo, 3 significa
- volume máximo.
- color: Um código de cor hexadecimal.
submit:
create: Criar %{model}
update: Atualizar %{model}
@@ -77,7 +65,7 @@ pt-BR:
no_tomatoes_yet_html: >
Você ainda não registrou nada.
Clique em "Começar" para iniciar o seu primeiro pomodoro.
no_projects_yet_html: >
- Você ainda não trabalhou em nenhum projeto.
Crie um %{new_project_link} para começar a
+ Você ainda não trabalhou em nenhum projeto.
Crie um %{new_project_link} para começar a
coletar estatísticas agregadas.
counters:
day: Hoje
@@ -119,6 +107,19 @@ pt-BR:
weekly: Semanal
monthly: Mensal
overall: Geral
+ activerecord:
+ help:
+ project:
+ tag_list: Uma lista de tags relacionadas a projetos.
+ money_budget: Orçamento disponível.
+ time_budget: Orçamento de tempo estimado em horas.
+ user:
+ work_hours_per_day: Quantas horas você trabalha por dia?
+ average_hourly_rate: Quanto você cobra por hora?
+ volume: >
+ Volume padrão do temporizador. 0 significa mudo, 3 significa volume
+ máximo.
+ color: Um código de cor hexadecimal.
mongoid:
models:
project: