-
+
+ <%= render 'layouts/header' %>
+
+ <%= flash_messages %>
+
<%= yield %>
+
<%= render 'layouts/footer' %>
diff --git a/config/locales/views/admin/de.yml b/config/locales/views/admin/de.yml
index 4a41b80..2f1e4a9 100644
--- a/config/locales/views/admin/de.yml
+++ b/config/locales/views/admin/de.yml
@@ -9,4 +9,16 @@ de:
update_problem_count:
success_message: "Problem-Anzahl wurde erfolgreich aktualisiert!"
failure_message: "Problem-Anzahl konnte nicht aktualisiert werden! Grund: %{error}"
- no_problem_count: "Keine Problem-Anzahl gegeben!"
\ No newline at end of file
+ no_problem_count: "Keine Problem-Anzahl gegeben!"
+ translations:
+ must_be_pending: "Übersetzung muss ausstehend sein, um akzeptiert oder abgelehnt zu werden!"
+ show:
+ accept_translation: "Akzeptieren"
+ decline_translation: "Ablehnen"
+ visit_current_translation: "Aktuelle Übersetzung anschauen"
+ already_translated: "Dieses Problem wurde bereits übersetzt."
+ is_new_translation: "Dieses Problem hat bisher keine Übersetzung."
+ accept:
+ success_message: "Übersetzung wurde erfolgreich akzeptiert!"
+ decline:
+ success_message: "Übersetzung wurde erfolgreich abgelehnt!"
\ No newline at end of file
diff --git a/config/locales/views/application/de.yml b/config/locales/views/application/de.yml
index 2340f66..cccda7c 100644
--- a/config/locales/views/application/de.yml
+++ b/config/locales/views/application/de.yml
@@ -1,6 +1,9 @@
# ruby encoding: utf-8
de:
+ attributes:
+ created_at: Erstellt
+ updated_at: Aktualisiert
application:
site_title: "Projekt Euler"
sign_in: 'Einloggen'
@@ -8,4 +11,8 @@ de:
info: "Info"
legal: "Impressum"
copyright: "Copyright-Informationen"
- bootstrap_html: 'Entworfen mit
Bootstrap'
\ No newline at end of file
+ bootstrap_html: 'Entworfen mit
Bootstrap'
+ helpers:
+ submit:
+ translation:
+ create: "%{model} vorschlagen"
diff --git a/config/locales/views/translations/de.yml b/config/locales/views/translations/de.yml
index 69ea5f2..df84c5e 100644
--- a/config/locales/views/translations/de.yml
+++ b/config/locales/views/translations/de.yml
@@ -9,4 +9,4 @@ de:
new:
new_translation: Neue Übersetzung für Problem %{id}
notice:
- successfully_created: Übersetzung wurde erfolgreich erstellt.
\ No newline at end of file
+ successfully_created: Der Übersetzungsvorschlag wurde eingereicht. Ein Organisator wird sich Ihren Vorschlag so bald wie möglich anschauen.
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 49fc368..cb13527 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,6 +26,10 @@ Rails.application.routes.draw do
namespace :admin do
get '', to: 'dashboard#index', as: 'dashboard_index'
post '/update_problem_count', to: 'dashboard#update_problem_count', as: 'dashboard_update_problem_count'
- resources :translations, only: [:index, :show]
+ resources :translations, only: [:index] do
+ get '', to: 'translations#show', as: ''
+ post 'accept', to: 'translations#accept'
+ post 'decline', to: 'translations#decline'
+ end
end
end
\ No newline at end of file
diff --git a/db/migrate/20190202113250_add_status_to_translations.rb b/db/migrate/20190202113250_add_status_to_translations.rb
new file mode 100644
index 0000000..86583d5
--- /dev/null
+++ b/db/migrate/20190202113250_add_status_to_translations.rb
@@ -0,0 +1,15 @@
+class AddStatusToTranslations < ActiveRecord::Migration[5.2]
+ def change
+ add_column :translations, :status, :integer, default: 0
+
+ reversible do |dir|
+ dir.up do
+ Problem.all.each do |problem|
+ if problem.is_translated?
+ problem.translation.in_use!
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3475fce..f50f95e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150131103802) do
+ActiveRecord::Schema.define(version: 2019_02_02_113250) do
create_table "admins", force: :cascade do |t|
t.string "email", default: "", null: false
@@ -42,6 +42,7 @@ ActiveRecord::Schema.define(version: 20150131103802) do
t.datetime "created_at"
t.datetime "updated_at"
t.integer "problem_id"
+ t.integer "status", default: 0
t.index ["problem_id"], name: "index_translations_on_problem_id"
end
diff --git a/db/seeds.rb b/db/seeds.rb
index 452dab4..0986997 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -27,7 +27,7 @@ for i in 1..10 do
)
problem = Problem.find(i)
- problem.translation = translation
+ problem.set_translation(translation)
problem.save!
end
diff --git a/test/controllers/admin/translations_controller_test.rb b/test/controllers/admin/translations_controller_test.rb
index 31bc4d0..4536ae0 100644
--- a/test/controllers/admin/translations_controller_test.rb
+++ b/test/controllers/admin/translations_controller_test.rb
@@ -6,6 +6,7 @@ class Admin::TranslationsControllerTest < ActionDispatch::IntegrationTest
setup do
login
@translation = translations(:translation_one)
+ @translation_alternative = translations(:translation_two_alternative)
end
test "should get index" do
get admin_translations_url
@@ -14,8 +15,19 @@ class Admin::TranslationsControllerTest < ActionDispatch::IntegrationTest
end
test "should show translation" do
- get admin_translation_url(id: @translation)
+ get admin_translation_url(translation_id: @translation)
assert_response :success
end
+ test "should accept translation" do
+ post admin_translation_accept_path(@translation_alternative)
+ assert_redirected_to problem_path(2)
+ assert_equal @translation_alternative, Problem.find(2).translation
+ end
+
+ test "should decline translation" do
+ post admin_translation_decline_path(@translation_alternative)
+ assert_redirected_to admin_translations_path
+ assert Translation.find(@translation_alternative.id).declined?
+ end
end
diff --git a/test/fixtures/translations.yml b/test/fixtures/translations.yml
index f8bcb86..2122ecd 100644
--- a/test/fixtures/translations.yml
+++ b/test/fixtures/translations.yml
@@ -4,8 +4,16 @@ translation_one:
problem_id: 1
title: First title
content: The content of the translation
+ status: 1
translation_two:
problem_id: 2
title: Second title
content: The content of the second translation
+ status: 1
+
+translation_two_alternative:
+ problem_id: 2
+ title: Second title
+ content: The changed content for the second problem
+ status: 0
diff --git a/test/models/problem_test.rb b/test/models/problem_test.rb
index b203bed..eff3db1 100644
--- a/test/models/problem_test.rb
+++ b/test/models/problem_test.rb
@@ -14,6 +14,13 @@ class ProblemTest < ActiveSupport::TestCase
assert problems(:one).is_translated?
end
+ test "set_translation should modify status correctly" do
+ problems(:two).set_translation(translations(:translation_two_alternative))
+ assert translations(:translation_two).outdated?
+ assert translations(:translation_two_alternative).in_use?
+ assert_equal translations(:translation_two_alternative), problems(:two).translation
+ end
+
test "should have correct original url" do
assert_equal "https://projecteuler.net/problem=1", problems(:one).original_url
end
diff --git a/test/models/translation_test.rb b/test/models/translation_test.rb
index 3deb421..38233bd 100644
--- a/test/models/translation_test.rb
+++ b/test/models/translation_test.rb
@@ -36,5 +36,6 @@ class TranslationTest < ActiveSupport::TestCase
problem_id: 1
)
assert translation.save
+ assert translation.pending?
end
end