From 572fb0b6b3eaf635110a0c64fd417eda0dba4007 Mon Sep 17 00:00:00 2001 From: lpgn Date: Sun, 17 Jan 2016 00:47:53 +0000 Subject: [PATCH] more translations and modification of readme --- .../controllers/application.coffee.erb | 8 +++---- .../controllers/main_nav.coffee.erb | 2 +- .../javascripts/controllers/projects.coffee | 8 +++---- .../templates/admin/members/new.html.erb | 6 ++--- .../admin/project_elements/index.html.erb | 22 +++++++++--------- .../templates/dashboard/projects.html.erb | 4 ++-- app/assets/templates/members/show.html.erb | 2 +- .../templates/notifications/index.html.erb | 12 +++++----- app/assets/templates/projects/_form.html.erb | 4 ++-- app/assets/templates/projects/edit.html.erb | 6 ++--- app/assets/templates/projects/new.html.erb | 2 +- app/assets/templates/projects/show.html.erb | 14 +++++------ app/assets/templates/shared/about.html.erb | 23 ++++++++----------- app/assets/templates/shared/header.html.erb | 2 +- .../shared/passwordEditModal.html.erb | 4 ++-- .../shared/passwordNewModal.html.erb | 4 ++-- .../reset_password_instructions.html.erb | 8 +++---- .../notify_member_account_is_created.html.erb | 12 +++++----- config/locales/devise.fr.yml | 4 ++-- .../components/select2/select2_locale_fr.js | 6 ++--- 20 files changed, 75 insertions(+), 78 deletions(-) diff --git a/app/assets/javascripts/controllers/application.coffee.erb b/app/assets/javascripts/controllers/application.coffee.erb index 42126aae0..98dfd64d5 100644 --- a/app/assets/javascripts/controllers/application.coffee.erb +++ b/app/assets/javascripts/controllers/application.coffee.erb @@ -136,7 +136,7 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco type: 'danger' ] .result['finally'](null).then (user) -> - growl.addInfoMessage('Votre mot de passe a bien été modifié.') + growl.addInfoMessage('Your password has been changed.') Auth.login().then (user) -> $scope.setCurrentUser(user) , (error) -> @@ -272,7 +272,7 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco # Authentication failed... $scope.alerts = [] $scope.alerts.push - msg: 'E-mail ou mot de passe incorrect.' + msg: 'Incorrect Email or password.' type: 'danger' # handle modal behaviors. The provided reason will be used to define the following actions @@ -314,12 +314,12 @@ Application.Controllers.controller 'ApplicationController', ["$rootScope", "$sco $modalInstance.close() .error -> $scope.alerts.push - msg: "Your email address n'existe pas." + msg: "Your email address does not exist." type: 'danger' ] .result['finally'](null).then -> - growl.addInfoMessage('Vous allez recevoir sous quelques minutes un e-mail vous indiquant comment réinitialiser votre mot de passe.') + growl.addInfoMessage('You will receive an email within a few minutes telling you how to reset your password.') # otherwise the user just closed the modal diff --git a/app/assets/javascripts/controllers/main_nav.coffee.erb b/app/assets/javascripts/controllers/main_nav.coffee.erb index e9d747a23..89bb8c69a 100644 --- a/app/assets/javascripts/controllers/main_nav.coffee.erb +++ b/app/assets/javascripts/controllers/main_nav.coffee.erb @@ -20,7 +20,7 @@ Application.Controllers.controller "mainNavController", ["$scope", "$location", } { state: 'app.public.events_list' - linkText: 'List of courses and workshops' + linkText: 'List of events and workshops' linkIcon: 'tags' } { diff --git a/app/assets/javascripts/controllers/projects.coffee b/app/assets/javascripts/controllers/projects.coffee index 4fa8f55ae..ab4a8041a 100644 --- a/app/assets/javascripts/controllers/projects.coffee +++ b/app/assets/javascripts/controllers/projects.coffee @@ -104,9 +104,9 @@ class ProjectsController ## - # This will remove the given file from the project's CAO attachements list. If the file was previously uploaded + # This will remove the given file from the project's CAD attachements list. If the file was previously uploaded # to the server, it will be marked for deletion on the server. Otherwise, it will be simply truncated from - # the CAO attachements array. + # the CAD attachements array. # @param file {Object} the file to delete ## $scope.deleteFile = (file) -> @@ -247,7 +247,7 @@ Application.Controllers.controller "newProjectController", ["$scope", "$state", $scope.method = 'post' ## Button litteral text value - $scope.submitName = 'Enregistrer comme brouillon' + $scope.submitName = 'Save as a draft' ## Default project parameters $scope.project = @@ -281,7 +281,7 @@ Application.Controllers.controller "editProjectController", ["$scope", "$state", $scope.method = 'put' ## Button litteral text value - $scope.submitName = 'Enregistrer' + $scope.submitName = 'Save' ## Retrieve the project's details, if an error occured, redirect the user to the projects list page $scope.project = Project.get {id: $stateParams.id} diff --git a/app/assets/templates/admin/members/new.html.erb b/app/assets/templates/admin/members/new.html.erb index 9a141a64b..86ca7dfd8 100644 --- a/app/assets/templates/admin/members/new.html.erb +++ b/app/assets/templates/admin/members/new.html.erb @@ -9,7 +9,7 @@
-

Ajouter un membre

+

Add Member

@@ -17,7 +17,7 @@
- Annuler + Cancel
@@ -42,7 +42,7 @@
- +
diff --git a/app/assets/templates/admin/project_elements/index.html.erb b/app/assets/templates/admin/project_elements/index.html.erb index 3254f262f..a3bf3421c 100644 --- a/app/assets/templates/admin/project_elements/index.html.erb +++ b/app/assets/templates/admin/project_elements/index.html.erb @@ -7,7 +7,7 @@
-

Gestion des éléments projets

+

Project elements management

@@ -21,12 +21,12 @@
- + - + @@ -49,7 +49,7 @@
NomTitle
- - + + - + @@ -89,7 +89,7 @@
NomTitle
- + - + @@ -135,7 +135,7 @@
+
NomTitle
- + @@ -42,7 +42,7 @@ - +
DateIntituléeEntitled
Aucune nouvelle notification.No new notification.
@@ -72,14 +72,14 @@ - Aucune notification archivée. + No archived notification. - Charger les notifications suivantes... + Load the following notifications...
diff --git a/app/assets/templates/projects/_form.html.erb b/app/assets/templates/projects/_form.html.erb index b59ec75bf..e36856c47 100644 --- a/app/assets/templates/projects/_form.html.erb +++ b/app/assets/templates/projects/_form.html.erb @@ -74,7 +74,7 @@
- Étape {{ $index+1 }}/{{project.project_steps_attributes.length}} + Step {{ $index+1 }}/{{project.project_steps_attributes.length}} @@ -168,7 +168,7 @@
-

Thématiques

+

Themes

diff --git a/app/assets/templates/projects/edit.html.erb b/app/assets/templates/projects/edit.html.erb index 9eb93b999..8f9349322 100644 --- a/app/assets/templates/projects/edit.html.erb +++ b/app/assets/templates/projects/edit.html.erb @@ -12,18 +12,18 @@
-

Editer le projet Brouillon

+

Edit Project Draft copy

- Publier + Publish
diff --git a/app/assets/templates/projects/new.html.erb b/app/assets/templates/projects/new.html.erb index 06fbeb0bf..f11e08029 100644 --- a/app/assets/templates/projects/new.html.erb +++ b/app/assets/templates/projects/new.html.erb @@ -9,7 +9,7 @@
-

Ajouter un nouveau projet

+

Add a new project

diff --git a/app/assets/templates/projects/show.html.erb b/app/assets/templates/projects/show.html.erb index 73c22f6a1..4f49a6c68 100644 --- a/app/assets/templates/projects/show.html.erb +++ b/app/assets/templates/projects/show.html.erb @@ -9,14 +9,14 @@
-

{{ project.name }} Brouillon

+

{{ project.name }} Draft

- éditer + edit Propose a Project
@@ -33,13 +33,13 @@ {{project.name}}
-

Description du projet

+

Project description

-

Étape {{$index+1}} : {{step.title}}

+

Step {{$index+1}} : {{step.title}}

{{step.title}} @@ -73,7 +73,7 @@
- posté le {{project.created_at | amDateFormat: 'Do MMMM YYYY'}} + posted on {{project.created_at | amDateFormat: 'Do MMMM YYYY'}}
@@ -81,7 +81,7 @@
{{project.project_caos_attributes.length}} -

Fichier CAO à télécharger

+

CAD file to download

    @@ -94,7 +94,7 @@
    {{project.machines.length}} -

    Machines et matériaux

    +

    Machines and materials

      diff --git a/app/assets/templates/shared/about.html.erb b/app/assets/templates/shared/about.html.erb index 0d602806f..c7fbb7db4 100644 --- a/app/assets/templates/shared/about.html.erb +++ b/app/assets/templates/shared/about.html.erb @@ -2,30 +2,27 @@
      -

      Imaginer, Fabriquer,
      Partager au Fab Lab

      +

      Imagine, Make,
      Share at Fablab XinFab

      -

      Le Fab Lab est un atelier de fabrication numérique où l’on peut utiliser des machines de découpe, des imprimantes 3D,… permettant de travailler sur des matériaux variés : plastique, bois, carton, vinyle, … afin de créer toute sorte d’objet grâce à la conception assistée par ordinateur ou à l’électronique. Mais le Fab Lab est aussi un lieu d’échange de compétences technique.

      +

      Fab Lab is the educational outreach component of MIT’s Center for Bits and Atoms (CBA), an extension of its research into digital fabrication and computation. A Fab Lab is a technical prototyping platform for innovation and invention, providing stimulus for local entrepreneurship. A Fab Lab is also a platform for learning and innovation: a place to play, to create, to learn, to mentor, to invent.

      - Le Fab Lab est un espace permanent : ouvert à tous, il offre la possibilité de réaliser des objets soi-même, de partager ses compétences et d’apprendre au contact des médiateurs du Fab Lab et des autres usagers.

      -

      - La formation au Fab Lab s’appuie sur des projets et le partage de connaissances : vous devez prendre part à la capitalisation des connaissances et à l’instruction des autres utilisateurs. -

      + Fablabs are a part of maker culture where ordinary people are empowered to design, build, innovate, and invent on their own or with other makers. Fablabs offer makers the space and tools to digitally manufacture objects, from furniture to jewelry, robots to food.

      -

      Vos contacts au Fab Lab

      +

      Fab Lab XinFab contacts

      -
      Manager Fab Lab :
      -
      @email
      -
      Responsable médiation :
      -
      @email
      -
      Animateur scientifique :
      -
      @email
      +
      Fab Lab Manager:
      +
      spacemanager@xinfab.com
      +
      Staff:
      +
      info@xinfab.com
      +
      Information:
      +
      info@xinfab.com
      diff --git a/app/assets/templates/shared/header.html.erb b/app/assets/templates/shared/header.html.erb index 0a08b4d07..52ee0b98a 100644 --- a/app/assets/templates/shared/header.html.erb +++ b/app/assets/templates/shared/header.html.erb @@ -11,7 +11,7 @@ ?About Fablab XinFab - Retour + Back
diff --git a/app/assets/templates/shared/passwordEditModal.html.erb b/app/assets/templates/shared/passwordEditModal.html.erb index fa725ab5d..e4f023d7b 100644 --- a/app/assets/templates/shared/passwordEditModal.html.erb +++ b/app/assets/templates/shared/passwordEditModal.html.erb @@ -14,8 +14,8 @@
- Mot de passe est obligatoire - Mot de passe est trop court (au moins 8 caractères) + Password is required + Password is too short (at least 8 characters)
diff --git a/app/assets/templates/shared/passwordNewModal.html.erb b/app/assets/templates/shared/passwordNewModal.html.erb index c7fc1ff2f..30085c41b 100644 --- a/app/assets/templates/shared/passwordNewModal.html.erb +++ b/app/assets/templates/shared/passwordNewModal.html.erb @@ -1,7 +1,7 @@
<%= image_tag("fablab-w.png", class: 'modal-logo') %> -

Mot de passe oublié

+

Forgotten password

{{alert.msg}} @@ -22,7 +22,7 @@
- +
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb index f2aa6655c..3dd7d6672 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -1,7 +1,7 @@ -

Bonjour,

+

Hi,

-

Quelqu'un a demandé un lien pour changer votre mot de passe. Vous pouvez le faire via le lien ci-dessous.

+

Someone asked a link to change your password. You can do this via the link below.

-

<%= link_to 'Changer mon mot de passe', "#{root_url}#!/?reset_password_token=#{@token}" %>

+

<%= link_to 'Change my password', "#{root_url}#!/?reset_password_token=#{@token}" %>

-

Si vous n'avez pas demandé cela, merci d'ignorer ce message.

+

If you did not request this, thank you ignore this message.

diff --git a/app/views/users_mailer/notify_member_account_is_created.html.erb b/app/views/users_mailer/notify_member_account_is_created.html.erb index 12c85a509..00d075eb4 100644 --- a/app/views/users_mailer/notify_member_account_is_created.html.erb +++ b/app/views/users_mailer/notify_member_account_is_created.html.erb @@ -1,10 +1,10 @@ -

Bonjour <%= @user.profile.full_name %>,

+

Hi <%= @user.profile.full_name %>,

-

L’équipe du Fab Lab vient de vous créer un compte sur <%= link_to 'le site du Fab lab', root_url %>
Voici vos paramètres de connexion :

+

The FabLab team has created an account on www.xinfab.com. <%= link_to 'www.xinfab.com', root_url %>
Here is your connection settings :

-

Nom de compte : <%= @user.email %>

-

Mot de passe : <%= @generated_password %>

+

Username : <%= @user.email %>

+

Password : <%= @generated_password %>

-

Ce mot de passe est temporaire, vous pourrez le modifier en accédant à l’espace « Mon compte ». Avec ce compte, vous conservez bien entendu tous les avantages liés à votre profil utilisateur Fab Lab (abonnement, formations).

+

This password is temporary, you can change it by accessing the "My Account". With this account, you retain all the benefits of course related to your user profile Fab Lab (subscription, training).

-

L'équipe Fab Lab.

\ No newline at end of file +

The team Fablab XinFab.

\ No newline at end of file diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml index b0594fc71..7266e3b54 100644 --- a/config/locales/devise.fr.yml +++ b/config/locales/devise.fr.yml @@ -9,10 +9,10 @@ fr: failure: already_authenticated: Vous êtes déjà connecté(e). inactive: Votre compte n’est pas encore activé. - invalid: E-mail ou mot de passe incorrect. + invalid: Incorrect Email or password. invalid_token: Jeton d'authentification incorrect. locked: Votre compte est verrouillé. - not_found_in_database: E-mail ou mot de passe incorrect. + not_found_in_database: Incorrect Email or password. timeout: Votre session est périmée, veuillez vous reconnecter pour continuer. unauthenticated: Vous devez vous connecter ou vous enregistrer pour continuer. unconfirmed: Vous devez confirmer votre compte par e-mail. diff --git a/vendor/assets/components/select2/select2_locale_fr.js b/vendor/assets/components/select2/select2_locale_fr.js index 9afda2abd..d02414e8e 100644 --- a/vendor/assets/components/select2/select2_locale_fr.js +++ b/vendor/assets/components/select2/select2_locale_fr.js @@ -5,9 +5,9 @@ "use strict"; $.extend($.fn.select2.defaults, { - formatMatches: function (matches) { return matches + " résultats sont disponibles, utilisez les flèches haut et bas pour naviguer."; }, - formatNoMatches: function () { return "Aucun résultat trouvé"; }, - formatInputTooShort: function (input, min) { var n = min - input.length; return "Merci de saisir " + n + " caractère" + (n == 1 ? "" : "s") + " de plus"; }, + formatMatches: function (matches) { return matches + " results are available, use the up and down arrows to navigate."; }, + formatNoMatches: function () { return "No result found"; }, + formatInputTooShort: function (input, min) { var n = min - input.length; return "Thank You " + n + " character" + (n == 1 ? "" : "s") + " de plus"; }, formatInputTooLong: function (input, max) { var n = input.length - max; return "Merci de supprimer " + n + " caractère" + (n == 1 ? "" : "s"); }, formatSelectionTooBig: function (limit) { return "Vous pouvez seulement sélectionner " + limit + " élément" + (limit == 1 ? "" : "s"); }, formatLoadMore: function (pageNumber) { return "Chargement de résultats supplémentaires…"; },