taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #50 from wilwade/master 

Spelling and Grammar changes
stable
Xaviju 2014-10-02 15:51:10 +02:00
parent 9da893cce6 27c4bdefaa
commit 3ea5065505
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/coffee/modules/auth.coffee
View File

@ -221,7 +221,7 @@ RegisterDirective = ($auth, $confirm, $location, $navUrls, $config) ->
form = $el.find("form").checksley() form = $el.find("form").checksley()
onSuccessSubmit = (response) -> onSuccessSubmit = (response) ->
$confirm.notify("success", "Our Oompa Loompas are happy, wellcome to Taiga.") #TODO: i18n $confirm.notify("success", "Our Oompa Loompas are happy, welcome to Taiga.") #TODO: i18n
$location.path($navUrls.resolve("home")) $location.path($navUrls.resolve("home"))
onErrorSubmit = (response) -> onErrorSubmit = (response) ->
@ -305,7 +305,7 @@ ChangePasswordFromRecoveryDirective = ($auth, $confirm, $location, $params, $nav
onSuccessSubmit = (response) -> onSuccessSubmit = (response) ->
$location.path($navUrls.resolve("login")) $location.path($navUrls.resolve("login"))
$confirm.success("Our Oompa Loompas save your new password.<br /> $confirm.success("Our Oompa Loompas saved your new password.<br />
Try to <strong>sign in</strong> with it.") #TODO: i18n Try to <strong>sign in</strong> with it.") #TODO: i18n
onErrorSubmit = (response) -> onErrorSubmit = (response) ->
@ -346,8 +346,8 @@ InvitationDirective = ($auth, $confirm, $location, $params, $navUrls) ->
promise.then null, (response) -> promise.then null, (response) ->
$location.path($navUrls.resolve("login")) $location.path($navUrls.resolve("login"))
$confirm.success("<strong>Ooops, we have a problems</strong><br /> $confirm.success("<strong>Ooops, we have a problem</strong><br />
Our Oompa Loompas can't find your invitations.") #TODO: i18n Our Oompa Loompas can't find your invitation.") #TODO: i18n
# Login form # Login form
$scope.dataLogin = {token: token} $scope.dataLogin = {token: token}
@ -355,12 +355,12 @@ InvitationDirective = ($auth, $confirm, $location, $params, $navUrls) ->
onSuccessSubmitLogin = (response) -> onSuccessSubmitLogin = (response) ->
$location.path($navUrls.resolve("project", {project: $scope.invitation.project_slug})) $location.path($navUrls.resolve("project", {project: $scope.invitation.project_slug}))
$confirm.notify("success", "You've successfully joined to this project", $confirm.notify("success", "You've successfully joined this project",
"Wellcome to #{$scope.invitation.project_name}") "Welcome to #{$scope.invitation.project_name}")
onErrorSubmitLogin = (response) -> onErrorSubmitLogin = (response) ->
$confirm.notify("light-error", "According to our Oompa Loompas, your are not registered yet or $confirm.notify("light-error", "According to our Oompa Loompas, your are not registered yet or
type an invalid password.") #TODO: i18n typed an invalid password.") #TODO: i18n
submitLogin = -> submitLogin = ->
if not loginForm.validate() if not loginForm.validate()
@ -383,11 +383,11 @@ InvitationDirective = ($auth, $confirm, $location, $params, $navUrls) ->
onSuccessSubmitRegister = (response) -> onSuccessSubmitRegister = (response) ->
$location.path($navUrls.resolve("project", {project: $scope.invitation.project_slug})) $location.path($navUrls.resolve("project", {project: $scope.invitation.project_slug}))
$confirm.notify("success", "You've successfully joined to this project", $confirm.notify("success", "You've successfully joined this project",
"Wellcome to #{$scope.invitation.project_name}") "Welcome to #{$scope.invitation.project_name}")
onErrorSubmitRegister = (response) -> onErrorSubmitRegister = (response) ->
$confirm.notify("light-error", "According to our Oompa Loompas, the $confirm.notify("light-error", "According to our Oompa Loompas, that
username or email is already in use.") #TODO: i18n username or email is already in use.") #TODO: i18n
submitRegister = -> submitRegister = ->

2
app/coffee/modules/common/history.coffee
View File

@ -269,7 +269,7 @@ HistoryDirective = ($log, $loading) ->
team_requirement: "team requirement" team_requirement: "team requirement"
# Task # Task
milestone: "spreint" milestone: "sprint"
user_story: "user story" user_story: "user story"
is_iocaine: "is iocaine" is_iocaine: "is iocaine"