diff --git a/app/assets/javascripts/controllers/admin/events.coffee b/app/assets/javascripts/controllers/admin/events.coffee index 5d782709d..9ad119404 100644 --- a/app/assets/javascripts/controllers/admin/events.coffee +++ b/app/assets/javascripts/controllers/admin/events.coffee @@ -204,11 +204,11 @@ Application.Controllers.controller "newEventController", ["$scope", "$state", 'E ## Possible types of recurrences for an event $scope.recurrenceTypes = [ - {label: 'Aucune', value: 'none'}, - {label: 'Tous les jours', value: 'day'}, - {label: 'Chaque semaine', value: 'week'}, - {label: 'Chaque mois', value: 'month'}, - {label: 'Chaque année', value: 'year'} + {label: 'None', value: 'none'}, + {label: 'Everyday', value: 'day'}, + {label: 'Every week', value: 'week'}, + {label: 'Each month', value: 'month'}, + {label: 'Every year', value: 'year'} ] ## Using the EventsController diff --git a/app/assets/javascripts/controllers/main_nav.coffee.erb b/app/assets/javascripts/controllers/main_nav.coffee.erb index 89bb8c69a..5d440c86d 100644 --- a/app/assets/javascripts/controllers/main_nav.coffee.erb +++ b/app/assets/javascripts/controllers/main_nav.coffee.erb @@ -34,22 +34,22 @@ Application.Controllers.controller "mainNavController", ["$scope", "$location", $scope.adminNavLinks = [ { state: 'app.admin.members' - linkText: 'Suivi utilisateurs' + linkText: 'Review users' linkIcon: 'users' } { state: 'app.admin.events' - linkText: 'Suivi stages et ateliers' + linkText: 'Review courses and workshops' linkIcon: 'tags' } { state: 'app.public.machines_list' - linkText: 'Gérer les machines' + linkText: 'Manage machinery' linkIcon: 'cogs' } { state: 'app.admin.project_elements' - linkText: 'Gérer les éléments Projets' + linkText: 'Manage Projects' linkIcon: 'tasks' } ] diff --git a/app/assets/javascripts/services/dialogs.coffee.erb b/app/assets/javascripts/services/dialogs.coffee.erb index d10983921..8d5f22fc0 100644 --- a/app/assets/javascripts/services/dialogs.coffee.erb +++ b/app/assets/javascripts/services/dialogs.coffee.erb @@ -7,8 +7,8 @@ Application.Services.factory 'dialogs', ["$modal", ($modal) -> size: 'sm' resolve: object: -> - title: 'Titre de confirmation' - msg: 'Message de confiramtion' + title: 'As confirmation' + msg: 'Confirmation message' controller: ['$scope', '$modalInstance', '$state', 'object', ($scope, $modalInstance, $state, object) -> $scope.object = object $scope.ok = -> diff --git a/app/assets/templates/admin/events/index.html.erb b/app/assets/templates/admin/events/index.html.erb index c86ba419c..2cca311c3 100644 --- a/app/assets/templates/admin/events/index.html.erb +++ b/app/assets/templates/admin/events/index.html.erb @@ -13,7 +13,7 @@
- Ajouter un évènement + Add an event
@@ -24,16 +24,16 @@
- + @@ -44,19 +44,19 @@ {{ event.title }}
TitreTitle Dates
- Du {{event.start_date | amDateFormat:'DD/MM/YYYY'}} au {{event.end_date | amDateFormat:'DD/MM/YYYY'}} + From {{event.start_date | amDateFormat:'DD/MM/YYYY'}} to {{event.end_date | amDateFormat:'DD/MM/YYYY'}}
- Toute la journée + All day long - De {{event.start_date | date:'HH:mm'}} - à + From {{event.start_date | date:'HH:mm'}} + to {{event.end_date | date:'HH:mm'}}
<%#
@@ -34,7 +34,7 @@

{{event.title}}

{{event.start_date | amDateFormat:'DD/MM'}} au {{event.end_date | amDateFormat:'DD/MM'}}

-
Plein tarif: {{event.amount}}€ / Tarif réduit: {{event.reduced_amount}}€
+
Full price: {{event.amount}}€ / Tarif réduit: {{event.reduced_amount}}€
@@ -51,7 +51,7 @@
- Charger les stages et ateliers suivants ... + Load the following courses and workshops ...
diff --git a/app/assets/templates/events/new.html.erb b/app/assets/templates/events/new.html.erb index cc1e1d15f..93ec1f5fc 100644 --- a/app/assets/templates/events/new.html.erb +++ b/app/assets/templates/events/new.html.erb @@ -9,7 +9,7 @@
-

Ajouter un évènement

+

Add an event

diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index aab9e43c4..8a52d6880 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -17,7 +17,7 @@
- éditer + edit
@@ -35,7 +35,7 @@ {{event.title}}
-

Description de l'évènement

+

Event description

@@ -46,7 +46,7 @@
{{event.event_files_attributes.length}} -

Documents à télécharger

+

Download documents

    @@ -58,7 +58,7 @@
    -

    Informations

    +

    Information

    @@ -66,22 +66,22 @@
    {{event.categories[0].name}}
    Dates :
    -
    Début: {{event.start_date | amDateFormat:'DD/MM/YYYY'}}
    Fin: {{event.end_date | amDateFormat:'DD/MM/YYYY'}}
    -
    Horaires :
    +
    Start: {{event.start_date | amDateFormat:'DD/MM/YYYY'}}
    Ends: {{event.end_date | amDateFormat:'DD/MM/YYYY'}}
    +
    Hours :
    Toute la journée
    -
    De {{event.start_date | amDateFormat:'HH:mm'}} à {{event.end_date | amDateFormat:'HH:mm'}}
    +
    From {{event.start_date | amDateFormat:'HH:mm'}} to {{event.end_date | amDateFormat:'HH:mm'}}
    -
    Plein tarif : {{ event.amount }} €
    -
    Tarif réduit* : {{ event.reduced_amount }} €
    +
    Full price : {{ event.amount }} €
    +
    Reduced price* : {{ event.reduced_amount }} €
    -
    Places disponibles: {{event.nb_total_places}}
    +
    Available seats: {{event.nb_total_places}}
    -
    Entrée libre
    +
    Free admission
    @@ -89,7 +89,7 @@
    diff --git a/app/assets/templates/home.html.erb b/app/assets/templates/home.html.erb index 98eb1da3c..fe6817dea 100644 --- a/app/assets/templates/home.html.erb +++ b/app/assets/templates/home.html.erb @@ -94,25 +94,25 @@
    -
    Du {{event.start_date | amDateFormat:'DD/MM'}} au {{event.end_date | amDateFormat:'DD/MM'}}
    +
    From {{event.start_date | amDateFormat:'DD/MM'}} to {{event.end_date | amDateFormat:'DD/MM'}}
    -
    Toute la journéeDe {{event.start_date | date:'HH:mm'}} à {{event.end_date | date:'HH:mm'}}
    +
    All day longDe {{event.start_date | date:'HH:mm'}} à {{event.end_date | date:'HH:mm'}}
    - Entrée Libre - Entrée Gratuite{{event.amount}} € Plein tarif
    {{event.reduced_amount}} € Tarif réduit     -
    Événement complet.
    + Free entry + Free admission{{event.amount}} ¥ Full price
    {{event.reduced_amount}} ¥ Reduced price     +
    Event full.
    -
    Consulter
    +
    Check
    diff --git a/app/assets/templates/machines/_form.html.erb b/app/assets/templates/machines/_form.html.erb index 708485552..16715cb98 100644 --- a/app/assets/templates/machines/_form.html.erb +++ b/app/assets/templates/machines/_form.html.erb @@ -8,15 +8,15 @@ {{alert.msg}}
    - +
    - - Le Nom est obligatoire. + + The name is mandatory.
    - +
    @@ -39,20 +39,20 @@
    - La Description est obligatoire. + The description is mandatory.
    - +
    - Les Caractéristiques techniques sont obligatoires. + Les Technical specifications are mandatory.
    - +
    @@ -62,13 +62,13 @@
    {{file.attachment}}
    - Joindre un fichier - Modifier + Attach a file + Modify
    - Ajouter une pièce jointe + Add attachment
    diff --git a/app/assets/templates/machines/index.html.erb b/app/assets/templates/machines/index.html.erb index 6d3781f05..c553a5f12 100644 --- a/app/assets/templates/machines/index.html.erb +++ b/app/assets/templates/machines/index.html.erb @@ -13,7 +13,7 @@
    - Ajouter une machine + Add a machine
    @@ -42,7 +42,7 @@
    - Consulter + Check
    diff --git a/app/assets/templates/machines/show.html.erb b/app/assets/templates/machines/show.html.erb index 44607baf6..02d8abc26 100644 --- a/app/assets/templates/machines/show.html.erb +++ b/app/assets/templates/machines/show.html.erb @@ -16,7 +16,7 @@
    - Éditer + Edit
    @@ -44,7 +44,7 @@
    -

    Caractéristiques techniques

    +

    Technical specifications

    @@ -55,7 +55,7 @@
    {{machine.machine_files_attributes.length}} -

    Fichiers à télécharger

    +

    Download Files

      @@ -67,7 +67,7 @@
      -

      Projets utilisant la machine

      +

      Projects using the machine

        diff --git a/app/assets/templates/members/index.html.erb b/app/assets/templates/members/index.html.erb index ab0ab628d..22ecaa199 100644 --- a/app/assets/templates/members/index.html.erb +++ b/app/assets/templates/members/index.html.erb @@ -17,7 +17,7 @@
        - + diff --git a/app/assets/templates/shared/_member_form.html.erb b/app/assets/templates/shared/_member_form.html.erb index 4512072d1..5fc296318 100644 --- a/app/assets/templates/shared/_member_form.html.erb +++ b/app/assets/templates/shared/_member_form.html.erb @@ -40,7 +40,7 @@
        - +
        The username is mandatory
        @@ -50,7 +50,7 @@
        - +
        The last name is mandatory
        @@ -58,7 +58,7 @@
        - +
        The name is mandatory
        @@ -105,7 +105,7 @@ datepicker-popup="dd/MM/yyyy" datepicker-options="datePicker.options" is-open="datePicker.opened" - placeholder="Date de naissance" + placeholder="Birth date" ng-click="openDatePicker($event)" required/> @@ -123,7 +123,7 @@
        - +
        The telephone number is mandatory.
        diff --git a/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder b/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder index 362430b6e..a47e68020 100644 --- a/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder +++ b/app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder @@ -1,3 +1,3 @@ json.title notification.notification_type -json.description "Un nouveau compte utilisateur vient d'être créé : #{ notification.attached_object.profile.full_name } <#{ notification.attached_object.email}>." +json.description "A new user account newly created : #{ notification.attached_object.profile.full_name } <#{ notification.attached_object.email}>." json.url notification_url(notification, format: :json) diff --git a/app/views/notifications_mailer/notify_admin_when_project_published.html.erb b/app/views/notifications_mailer/notify_admin_when_project_published.html.erb index b596e2cec..69dd35169 100644 --- a/app/views/notifications_mailer/notify_admin_when_project_published.html.erb +++ b/app/views/notifications_mailer/notify_admin_when_project_published.html.erb @@ -1,3 +1,3 @@

        Bonjour,

        -

        Un nouveau projet vient d'être publié : "<%= link_to @attached_object.name, "#{root_url}#!/projects/#{@attached_object.id}" %>"

        +

        A new project has just been published : "<%= link_to @attached_object.name, "#{root_url}#!/projects/#{@attached_object.id}" %>"