From efeb5a745796530f79b7b15ba92966b86a2e7a48 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 3 Sep 2015 14:19:45 +0200 Subject: [PATCH] Updates texts and changes test --- config/locales/en.yml | 13 +++++++++++-- config/locales/es.yml | 13 +++++++++++-- spec/features/debates_spec.rb | 10 +++++----- spec/features/tags_spec.rb | 4 ++-- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index d503443aa..254216eeb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -104,9 +104,8 @@ en: tags_label: Topics tags_instructions: > Tag this debate. You can choose among our proposals on the list or add any other topic you want by - writing them separated by "," and then pressing "enter". + writing them separated by ",". Some suggestions: - start_debate: Start a debate show: back_link: Back author_deleted: Deleted user @@ -122,6 +121,8 @@ en: editing: Edit debate show_link: Show debate back_link: Back + form: + submit_button: "Save changes" new: start_new: Start a debate back_link: Back @@ -131,6 +132,14 @@ en: recommendation_three: "Any discussion or comment that involves an illegal act will be eliminated, also intending to sabotage the debate spaces, everything else is permitted." recommendation_four: "The harsh criticism are very welcome. This is a space of thought but we recommend preserving the elegance and intelligence. The world is better with them present." recommendation_five: "Enjoy this space, voices that fill it, it is yours too." + form: + submit_button: "Start a debate" + create: + form: + submit_button: "Start a debate" + update: + form: + submit_button: "Save changes" comments: form: leave_comment: Write a comment diff --git a/config/locales/es.yml b/config/locales/es.yml index c11ae5ebc..6f1fe251b 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -104,9 +104,8 @@ es: tags_label: Temas tags_instructions: > Etiqueta este debate. Puedes elegir entre nuestras propuestas o introducir las que desees. - Para ello solo tienes que escribir las etiquetas que desees separadas por "," y pulsar "intro". + Para ello solo tienes que escribir las etiquetas que desees separadas por ",". Algunas recomendaciones: - start_debate: Empieza un debate show: back_link: Volver author_deleted: Usuario eliminado @@ -122,6 +121,8 @@ es: editing: Editar debate show_link: Ver debate back_link: Volver + form: + submit_button: "Guardar cambios" new: start_new: Empezar un debate back_link: Volver @@ -131,6 +132,14 @@ es: recommendation_three: "Cualquier debate o comentario que implique una acción ilegal será eliminado, también los que tengan la intención de sabotear los espacios de debate, todo lo demás está permitido." recommendation_four: "Las críticas despiadadas son muy bienvenidas. Este es un espacio de pensamiento. Pero te recomendamos conservar la elegancia y la inteligencia. El mundo es mejor con ellas presentes." recommendation_five: "Disfruta de este espacio, de las voces que lo llenan, también es tuyo." + form: + submit_button: "Empieza un debate" + create: + form: + submit_button: "Empieza un debate" + update: + form: + submit_button: "Guardar cambios" comments: form: leave_comment: Deja tu comentario diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index 1cd8c6069..361855967 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -222,7 +222,7 @@ feature 'Debates' do fill_in 'debate_description', with: "Let's..." fill_in 'debate_captcha', with: correct_captcha_text - click_button "Start a debate" + click_button "Save changes" expect(page).to have_content "Debate was successfully updated." expect(page).to have_content "End child poverty" @@ -235,7 +235,7 @@ feature 'Debates' do visit edit_debate_path(debate) fill_in 'debate_title', with: "" - click_button 'Start a debate' + click_button "Save changes" expect(page).to have_content error_message end @@ -249,13 +249,13 @@ feature 'Debates' do fill_in 'debate_title', with: "New title" fill_in 'debate_captcha', with: "wrong!" - click_button "Start a debate" + click_button "Save changes" expect(page).to_not have_content "Debate was successfully updated." expect(page).to have_content "1 error" fill_in 'debate_captcha', with: correct_captcha_text - click_button "Start a debate" + click_button "Save changes" expect(page).to have_content "Debate was successfully updated." end @@ -271,7 +271,7 @@ feature 'Debates' do fill_in 'debate_title', with: "" fill_in 'debate_captcha', with: correct_captcha_text - click_button "Start a debate" + click_button "Save changes" expect(page).to_not have_content "Debate was successfully updated." expect(page).to have_content "1 error" diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb index 80106cf3b..1b47f87a1 100644 --- a/spec/features/tags_spec.rb +++ b/spec/features/tags_spec.rb @@ -90,7 +90,7 @@ feature 'Tags' do fill_in 'debate_tag_list', with: "Economía, Hacienda" fill_in 'debate_captcha', with: correct_captcha_text - click_button 'Start a debate' + click_button 'Save changes' expect(page).to have_content 'Debate was successfully updated.' within('.tags') do @@ -107,7 +107,7 @@ feature 'Tags' do fill_in 'debate_tag_list', with: "" fill_in 'debate_captcha', with: correct_captcha_text - click_button 'Start a debate' + click_button 'Save changes' expect(page).to have_content 'Debate was successfully updated.' expect(page).to_not have_content 'Economía'