diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 09d325e08..a1c7cf7b5 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -5,8 +5,8 @@ module AdminHelper
end
def official_level_options
- options = []
- (0..5).each do |i|
+ options = [["",0]]
+ (1..5).each do |i|
options << [[t("admin.officials.level_#{i}"), Setting.value_for("official_level_#{i}_name")].compact.join(': '), i]
end
options
diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb
index 15ae47b8e..3cebe96b5 100644
--- a/app/views/admin/settings/index.html.erb
+++ b/app/views/admin/settings/index.html.erb
@@ -3,7 +3,7 @@
<% @settings.each do |setting| %>
-
- <%= setting.key.classify %>
+ <%= t("settings.#{setting.key}") %>
<%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %>
<%= f.text_field :value, label: false, id: dom_id(setting) %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index 9e9c7e61d..fae6a38c6 100644
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -80,7 +80,7 @@ en:
registered_at: "Registered at:"
hidden_at: "Hidden at:"
officials:
- level_0: Level 0
+ level_0: Not an official
level_1: Level 1
level_2: Level 2
level_3: Level 3
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index 1735b9f20..13984ab39 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -80,7 +80,7 @@ es:
registered_at: "Fecha de alta:"
hidden_at: "Bloqueado:"
officials:
- level_0: Nivel 0
+ level_0: "No es cargo público"
level_1: Nivel 1
level_2: Nivel 2
level_3: Nivel 3
diff --git a/config/locales/settings.en.yml b/config/locales/settings.en.yml
new file mode 100644
index 000000000..78e1a9e9e
--- /dev/null
+++ b/config/locales/settings.en.yml
@@ -0,0 +1,8 @@
+en:
+ settings:
+ official_level_1_name: "Level 1 official positions"
+ official_level_2_name: "Level 2 official positions"
+ official_level_3_name: "Level 3 official positions"
+ official_level_4_name: "Level 4 official positions"
+ official_level_5_name: "Level 5 official positions"
+ max_ratio_anon_votes_on_debates: "Max allowed percentage of anonymous votes per debate"
\ No newline at end of file
diff --git a/config/locales/settings.es.yml b/config/locales/settings.es.yml
new file mode 100644
index 000000000..36adb02af
--- /dev/null
+++ b/config/locales/settings.es.yml
@@ -0,0 +1,8 @@
+es:
+ settings:
+ official_level_1_name: "Cargos públicos de nivel 1"
+ official_level_2_name: "Cargos públicos de nivel 2"
+ official_level_3_name: "Cargos públicos de nivel 3"
+ official_level_4_name: "Cargos públicos de nivel 4"
+ official_level_5_name: "Cargos públicos de nivel 5"
+ max_ratio_anon_votes_on_debates: "Porcentaje máximo de votos anónimos por debate"
\ No newline at end of file
diff --git a/db/seeds.rb b/db/seeds.rb
index 6158a2a8d..600808d1b 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,6 +1,5 @@
# Names for the moderation console, as a hint for moderators
# to know better how to assign users with official positions
-Setting.create(key: 'official_level_0_name', value: 'No cargo público')
Setting.create(key: 'official_level_1_name', value: 'Empleados públicos')
Setting.create(key: 'official_level_2_name', value: 'Organización Municipal')
Setting.create(key: 'official_level_3_name', value: 'Directores generales')
diff --git a/spec/factories.rb b/spec/factories.rb
index 344b178a8..9f4345d4d 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -140,8 +140,8 @@ FactoryGirl.define do
end
factory :setting do
- sequence(:key) { |n| "setting key number #{n}" }
- sequence(:value) { |n| "setting number #{n} value" }
+ sequence(:key) { |n| "Setting Key #{n}" }
+ sequence(:value) { |n| "Setting #{n} Value" }
end
factory :ahoy_event, :class => Ahoy::Event do
diff --git a/spec/features/admin/settings_spec.rb b/spec/features/admin/settings_spec.rb
index e9a9bf13d..db10e0de7 100644
--- a/spec/features/admin/settings_spec.rb
+++ b/spec/features/admin/settings_spec.rb
@@ -12,9 +12,9 @@ feature 'Admin settings' do
scenario 'Index' do
visit admin_settings_path
- expect(page).to have_content @setting1.key.classify
- expect(page).to have_content @setting2.key.classify
- expect(page).to have_content @setting3.key.classify
+ expect(page).to have_content @setting1.key
+ expect(page).to have_content @setting2.key
+ expect(page).to have_content @setting3.key
end
scenario 'Update' do