diff --git a/app/assets/javascripts/controllers/projects.coffee b/app/assets/javascripts/controllers/projects.coffee index ab4a8041a..151b19ddf 100644 --- a/app/assets/javascripts/controllers/projects.coffee +++ b/app/assets/javascripts/controllers/projects.coffee @@ -290,7 +290,7 @@ Application.Controllers.controller "editProjectController", ["$scope", "$state", , -> # failed $state.go('app.public.projects_list') - ## Other members list (project collaborators) + ## Other members list (project contributors) Member.query().$promise.then (data)-> $scope.members = data.filter (m) -> m.id != $scope.project.author_id diff --git a/app/assets/javascripts/filters/filters.coffee b/app/assets/javascripts/filters/filters.coffee index e3277355a..68a5fcf2d 100644 --- a/app/assets/javascripts/filters/filters.coffee +++ b/app/assets/javascripts/filters/filters.coffee @@ -17,12 +17,12 @@ Application.Controllers.filter "projectMemberFilter", [ "Auth", (Auth)-> (projects, selectedMember) -> if !angular.isUndefined(projects) and angular.isDefined(selectedMember) and projects? and selectedMember? and selectedMember != "" filteredProject = [] - # Mes projets + # My projects if selectedMember == '0' angular.forEach projects, (project)-> if project.author_id == Auth._currentUser.id filteredProject.push(project) - # les projets auxquels je collabore + # the projects I am working else angular.forEach projects, (project)-> if project.user_ids.indexOf(Auth._currentUser.id) != -1 diff --git a/app/assets/templates/dashboard/projects.html.erb b/app/assets/templates/dashboard/projects.html.erb index db670763d..e38d138fe 100644 --- a/app/assets/templates/dashboard/projects.html.erb +++ b/app/assets/templates/dashboard/projects.html.erb @@ -27,7 +27,7 @@
+ posted on {{project.created_at | amDateFormat: 'Do MMMM YYYY'}} -->
@@ -54,7 +54,7 @@
-

The collaborators

+

The contributors

  • diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 8a52d6880..7087cdd1f 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -68,7 +68,7 @@
    Dates :
    Start: {{event.start_date | amDateFormat:'DD/MM/YYYY'}}
    Ends: {{event.end_date | amDateFormat:'DD/MM/YYYY'}}
    Hours :
    -
    Toute la journée
    +
    All day
    From {{event.start_date | amDateFormat:'HH:mm'}} to {{event.end_date | amDateFormat:'HH:mm'}}
    diff --git a/app/assets/templates/projects/_form.html.erb b/app/assets/templates/projects/_form.html.erb index e36856c47..8b79fd79f 100644 --- a/app/assets/templates/projects/_form.html.erb +++ b/app/assets/templates/projects/_form.html.erb @@ -159,7 +159,7 @@

    Licences Creative Commons

  • - <%# TODO: Bug concerne qu'on ne peut pas déselectionner un option %> + <%# TODO: Bug concerns that you can not select an option %> diff --git a/app/assets/templates/projects/index.html.erb b/app/assets/templates/projects/index.html.erb index 27bcff5e1..dbcf4a71b 100644 --- a/app/assets/templates/projects/index.html.erb +++ b/app/assets/templates/projects/index.html.erb @@ -73,10 +73,10 @@