Merge pull request #1800 from C-Otto/typos

Typos
This commit is contained in:
Reinier Balt 2015-04-12 17:39:30 +02:00
commit 5e8ce9f460
6 changed files with 8 additions and 8 deletions

View file

@ -413,7 +413,7 @@ class TodosController < ApplicationController
@todo = current_user.todos.find(params['id'])
@original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo
cache_attributes_from_before_update # TODO: remove in favor of @orininal_item
cache_attributes_from_before_update # TODO: remove in favor of @original_item
update_tags
update_project

View file

@ -1,5 +1,5 @@
<%- object_name = unique_object_name_for("update_todo_#{@todo.id}") -%>
var <%=object_name%> = {
<%= render :partial => (@saved ? "update_succesfull" : "update_has_errors"), locals: {object_name: object_name} %>
<%= render :partial => (@saved ? "update_successful" : "update_has_errors"), locals: {object_name: object_name} %>
}
<%=object_name%>.animate();

View file

@ -542,7 +542,7 @@ en:
edit: Edit
pending: Pending
completed_actions_with: "Completed actions with the tag '%{tag_name}'"
deleted_success: The action was deleted succesfully.
deleted_success: The action was deleted successfully.
completed_tasks_title: TRACKS::Completed tasks
feed_title_in_project: "in project '%{project}'"
clear_due_date: Clear due date
@ -552,7 +552,7 @@ en:
show_on_date: Show on %{date}
recurrence_period: Recurrence period
deferred_actions_with: "Deferred actions with the tag '%{tag_name}'"
recurring_deleted_success: The recurring action was deleted succesfully.
recurring_deleted_success: The recurring action was deleted successfully.
confirm_delete: "Are you sure that you want to delete the action '%{description}'?"
deferred_tasks_title: TRACKS::Tickler
next_actions_title: Tracks - Next Actions

View file

@ -761,7 +761,7 @@ es:
one: Defer one day
other: Defer %{count} days
delete: Delete
deleted_success: The action was deleted succesfully.
deleted_success: The action was deleted successfully.
delete_action: Delete action
delete_recurring_action_confirm: Are you sure that you want to delete the recurring
action '%{description}'?
@ -897,7 +897,7 @@ es:
recurring_action_deleted: Action was deleted. Because this action is recurring,
a new action was added
recurring_action_saved: Recurring action saved
recurring_deleted_success: The recurring action was deleted succesfully.
recurring_deleted_success: The recurring action was deleted successfully.
recurring_pattern_removed: El patrón de repetición se retira de %{count}
recurring_todos: Recurring todos
removed_predecessor: Removed %{successor} as dependency from %{predecessor}.

View file

@ -19,8 +19,8 @@ Feature: Edit a project
@javascript
Scenario: I can describe the project using markup
When I go to the "manage me" project
And I edit the project description to "_successfull outcome_: project is *done*"
Then I should see the italic text "successfull outcome" in the project description
And I edit the project description to "_successful outcome_: project is *done*"
Then I should see the italic text "successful outcome" in the project description
And I should see the bold text "done" in the project description
@javascript