Updates texts and changes test

This commit is contained in:
Alberto Garcia Cabeza
2015-09-03 14:19:45 +02:00
parent f20192d9d7
commit efeb5a7457
4 changed files with 29 additions and 11 deletions

View File

@@ -104,9 +104,8 @@ en:
tags_label: Topics tags_label: Topics
tags_instructions: > tags_instructions: >
Tag this debate. You can choose among our proposals on the list or add any other topic you want by 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: Some suggestions:
start_debate: Start a debate
show: show:
back_link: Back back_link: Back
author_deleted: Deleted user author_deleted: Deleted user
@@ -122,6 +121,8 @@ en:
editing: Edit debate editing: Edit debate
show_link: Show debate show_link: Show debate
back_link: Back back_link: Back
form:
submit_button: "Save changes"
new: new:
start_new: Start a debate start_new: Start a debate
back_link: Back 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_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_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." 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: comments:
form: form:
leave_comment: Write a comment leave_comment: Write a comment

View File

@@ -104,9 +104,8 @@ es:
tags_label: Temas tags_label: Temas
tags_instructions: > tags_instructions: >
Etiqueta este debate. Puedes elegir entre nuestras propuestas o introducir las que desees. 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: Algunas recomendaciones:
start_debate: Empieza un debate
show: show:
back_link: Volver back_link: Volver
author_deleted: Usuario eliminado author_deleted: Usuario eliminado
@@ -122,6 +121,8 @@ es:
editing: Editar debate editing: Editar debate
show_link: Ver debate show_link: Ver debate
back_link: Volver back_link: Volver
form:
submit_button: "Guardar cambios"
new: new:
start_new: Empezar un debate start_new: Empezar un debate
back_link: Volver 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_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_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." 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: comments:
form: form:
leave_comment: Deja tu comentario leave_comment: Deja tu comentario

View File

@@ -222,7 +222,7 @@ feature 'Debates' do
fill_in 'debate_description', with: "Let's..." fill_in 'debate_description', with: "Let's..."
fill_in 'debate_captcha', with: correct_captcha_text 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 "Debate was successfully updated."
expect(page).to have_content "End child poverty" expect(page).to have_content "End child poverty"
@@ -235,7 +235,7 @@ feature 'Debates' do
visit edit_debate_path(debate) visit edit_debate_path(debate)
fill_in 'debate_title', with: "" fill_in 'debate_title', with: ""
click_button 'Start a debate' click_button "Save changes"
expect(page).to have_content error_message expect(page).to have_content error_message
end end
@@ -249,13 +249,13 @@ feature 'Debates' do
fill_in 'debate_title', with: "New title" fill_in 'debate_title', with: "New title"
fill_in 'debate_captcha', with: "wrong!" 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_not have_content "Debate was successfully updated."
expect(page).to have_content "1 error" expect(page).to have_content "1 error"
fill_in 'debate_captcha', with: correct_captcha_text 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 "Debate was successfully updated."
end end
@@ -271,7 +271,7 @@ feature 'Debates' do
fill_in 'debate_title', with: "" fill_in 'debate_title', with: ""
fill_in 'debate_captcha', with: correct_captcha_text 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_not have_content "Debate was successfully updated."
expect(page).to have_content "1 error" expect(page).to have_content "1 error"

View File

@@ -90,7 +90,7 @@ feature 'Tags' do
fill_in 'debate_tag_list', with: "Economía, Hacienda" fill_in 'debate_tag_list', with: "Economía, Hacienda"
fill_in 'debate_captcha', with: correct_captcha_text 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 'Debate was successfully updated.'
within('.tags') do within('.tags') do
@@ -107,7 +107,7 @@ feature 'Tags' do
fill_in 'debate_tag_list', with: "" fill_in 'debate_tag_list', with: ""
fill_in 'debate_captcha', with: correct_captcha_text 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 'Debate was successfully updated.'
expect(page).to_not have_content 'Economía' expect(page).to_not have_content 'Economía'