diff --git a/app/assets/javascripts/controllers/admin/calendar.js.erb b/app/assets/javascripts/controllers/admin/calendar.js.erb index df52ae0e7..793579bf7 100644 --- a/app/assets/javascripts/controllers/admin/calendar.js.erb +++ b/app/assets/javascripts/controllers/admin/calendar.js.erb @@ -675,7 +675,7 @@ Application.Controllers.controller('CreateEventModalController', ['$scope', '$ui if (items.length === 0) return `${_t("app.admin.calendar.none")}`; const names = items.map(function (i) { return $sce.trustAsHtml(`${i.name}`); }); - if (items.length > 1) return names.slice(0, -1).join(', ') + ` ${_t('and')} ` + names[names.length - 1]; + if (items.length > 1) return names.slice(0, -1).join(', ') + ` ${_t('app.admin.calendar.and')} ` + names[names.length - 1]; return names[0]; } diff --git a/app/assets/javascripts/controllers/admin/groups.js b/app/assets/javascripts/controllers/admin/groups.js index 221d64d8f..e102117c6 100644 --- a/app/assets/javascripts/controllers/admin/groups.js +++ b/app/assets/javascripts/controllers/admin/groups.js @@ -54,15 +54,15 @@ Application.Controllers.controller('GroupsController', ['$scope', 'groupsPromise */ $scope.saveGroup = function (data, id) { if (id != null) { - return Group.update({ id }, { group: data }, response => growl.success(_t('group_form.changes_successfully_saved')) - , error => growl.error(_t('group_form.an_error_occurred_while_saving_changes'))); + return Group.update({ id }, { group: data }, response => growl.success(_t('app.admin.members.group_form.changes_successfully_saved')) + , error => growl.error(_t('app.admin.members.group_form.an_error_occurred_while_saving_changes'))); } else { return Group.save({ group: data }, function (resp) { - growl.success(_t('group_form.new_group_successfully_saved')); + growl.success(_t('app.admin.members.group_form.new_group_successfully_saved')); return $scope.groups[$scope.groups.length - 1].id = resp.id; } , function (error) { - growl.error(_t('.group_forman_error_occurred_when_saving_the_new_group')); + growl.error(_t('app.admin.members.group_form.an_error_occurred_when_saving_the_new_group')); return $scope.groups.splice($scope.groups.length - 1, 1); }); } @@ -74,10 +74,10 @@ Application.Controllers.controller('GroupsController', ['$scope', 'groupsPromise */ $scope.removeGroup = index => Group.delete({ id: $scope.groups[index].id }, function (resp) { - growl.success(_t('group_form.group_successfully_deleted')); + growl.success(_t('app.admin.members.group_form.group_successfully_deleted')); return $scope.groups.splice(index, 1); } - , error => growl.error(_t('group_form.unable_to_delete_group_because_some_users_and_or_groups_are_still_linked_to_it'))); + , error => growl.error(_t('app.admin.members.group_form.unable_to_delete_group_because_some_users_and_or_groups_are_still_linked_to_it'))); /** * Enable/disable the group at the specified index @@ -86,13 +86,13 @@ Application.Controllers.controller('GroupsController', ['$scope', 'groupsPromise return $scope.toggleDisableGroup = function (index) { const group = $scope.groups[index]; if (!group.disabled && (group.users > 0)) { - return growl.error(_t('group_form.unable_to_disable_group_with_users', { USERS: group.users })); + return growl.error(_t('app.admin.members.group_form.unable_to_disable_group_with_users', { USERS: group.users })); } else { return Group.update({ id: group.id }, { group: { disabled: !group.disabled } }, function (response) { $scope.groups[index] = response; - return growl.success(_t('group_form.group_successfully_enabled_disabled', { STATUS: response.disabled })); + return growl.success(_t('app.admin.members.group_form.group_successfully_enabled_disabled', { STATUS: response.disabled })); } - , error => growl.error(_t('group_form.unable_to_enable_disable_group', { STATUS: !group.disabled }))); + , error => growl.error(_t('app.admin.members.group_form.unable_to_enable_disable_group', { STATUS: !group.disabled }))); } }; } diff --git a/app/assets/javascripts/controllers/admin/invoices.js.erb b/app/assets/javascripts/controllers/admin/invoices.js.erb index 3011621d3..df5cbc6c7 100644 --- a/app/assets/javascripts/controllers/admin/invoices.js.erb +++ b/app/assets/javascripts/controllers/admin/invoices.js.erb @@ -705,8 +705,8 @@ Application.Controllers.controller('AvoirModalController', ['$scope', '$uibModal // If a subscription was took with the current invoice, should it be canceled or not $scope.subscriptionExpireOptions = {}; - $scope.subscriptionExpireOptions[_t('yes')] = true; - $scope.subscriptionExpireOptions[_t('no')] = false; + $scope.subscriptionExpireOptions[_t('app.shared.buttons.yes')] = true; + $scope.subscriptionExpireOptions[_t('app.shared.buttons.no')] = false; // AngularUI-Bootstrap datepicker parameters to define when to refund $scope.datePicker = { diff --git a/app/assets/javascripts/controllers/admin/members.js.erb b/app/assets/javascripts/controllers/admin/members.js.erb index ce7b16c41..506cae4ee 100644 --- a/app/assets/javascripts/controllers/admin/members.js.erb +++ b/app/assets/javascripts/controllers/admin/members.js.erb @@ -192,8 +192,8 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', resolve: { object () { return { - title: _t('confirmation_required'), - msg: $sce.trustAsHtml(_t('confirm_delete_member') + '

' + _t('this_may_take_a_while_please_wait')) + title: _t('app.admin.members.confirmation_required'), + msg: $sce.trustAsHtml(_t('app.admin.members.confirm_delete_member') + '

' + _t('app.admin.members.this_may_take_a_while_please_wait')) }; } } @@ -203,9 +203,9 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', { id: memberId }, function () { $scope.members.splice(findItemIdxById($scope.members, memberId), 1); - return growl.success(_t('member_successfully_deleted')); + return growl.success(_t('app.admin.members.member_successfully_deleted')); }, - function (error) { growl.error(_t('unable_to_delete_the_member')); } + function (error) { growl.error(_t('app.admin.members.unable_to_delete_the_member')); } ); } ); @@ -222,8 +222,8 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', resolve: { object () { return { - title: _t('confirmation_required'), - msg: $sce.trustAsHtml(_t('do_you_really_want_to_delete_this_administrator_this_cannot_be_undone') + '

' + _t('this_may_take_a_while_please_wait')) + title: _t('app.admin.members.confirmation_required'), + msg: $sce.trustAsHtml(_t('app.admin.members.do_you_really_want_to_delete_this_administrator_this_cannot_be_undone') + '

' + _t('app.admin.members.this_may_take_a_while_please_wait')) }; } } @@ -233,9 +233,9 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', { id: admin.id }, function () { admins.splice(findItemIdxById(admins, admin.id), 1); - return growl.success(_t('administrator_successfully_deleted')); + return growl.success(_t('app.admin.members.administrator_successfully_deleted')); }, - function (error) { growl.error(_t('unable_to_delete_the_administrator')); } + function (error) { growl.error(_t('app.admin.members.unable_to_delete_the_administrator')); } ); } ); @@ -268,7 +268,7 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', $scope.alertExport = function (type) { Export.status({ category: 'users', type }).then(function (res) { if (!res.data.exists) { - return growl.success(_t('export_is_running_you_ll_be_notified_when_its_ready')); + return growl.success(_t('app.admin.members.export_is_running_you_ll_be_notified_when_its_ready')); } }); }; @@ -424,10 +424,10 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state', { id: subscription.id }, { subscription: { expired_at: $scope.new_expired_at, free } }, function (_subscription) { - growl.success(_t('you_successfully_changed_the_expiration_date_of_the_user_s_subscription')); + growl.success(_t('app.admin.members_edit.you_successfully_changed_the_expiration_date_of_the_user_s_subscription')); return $uibModalInstance.close(_subscription); }, - function (error) { growl.error(_t('a_problem_occurred_while_saving_the_date')); } + function (error) { growl.error(_t('app.admin.members_edit.a_problem_occurred_while_saving_the_date')); } ); }; @@ -471,12 +471,12 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state', $scope.ok = function () { $scope.subscription.user_id = user.id; return Subscription.save({ }, { subscription: $scope.subscription }, function (_subscription) { - growl.success(_t('subscription_successfully_purchased')); + growl.success(_t('app.admin.members_edit.subscription_successfully_purchased')); $uibModalInstance.close(_subscription); return $state.reload(); } , function (error) { - growl.error(_t('a_problem_occurred_while_taking_the_subscription')); + growl.error(_t('app.admin.members_edit.a_problem_occurred_while_taking_the_subscription')); console.error(error); }); }; @@ -536,11 +536,11 @@ Application.Controllers.controller('EditMemberController', ['$scope', '$state', avoir_description: $scope.description }, function (_wallet) { - growl.success(_t('wallet_credit_successfully')); + growl.success(_t('app.shared.wallet.wallet_credit_successfully')); return $uibModalInstance.close(_wallet); }, function (error) { - growl.error(_t('a_problem_occurred_for_wallet_credit')); + growl.error(_t('app.shared.wallet.a_problem_occurred_for_wallet_credit')); console.error(error); } ); @@ -750,11 +750,11 @@ Application.Controllers.controller('NewAdminController', ['$state', '$scope', 'A {}, { admin: $scope.admin }, function () { - growl.success(_t('administrator_successfully_created_he_will_receive_his_connection_directives_by_email', { GENDER: getGender($scope.admin) })); + growl.success(_t('app.admin.admins_new.administrator_successfully_created_he_will_receive_his_connection_directives_by_email', { GENDER: getGender($scope.admin) })); return $state.go('app.admin.members'); } , function (error) { - growl.error(_t('failed_to_create_admin') + JSON.stringify(error.data ? error.data : error)); + growl.error(_t('app.admin.admins_new.failed_to_create_admin') + JSON.stringify(error.data ? error.data : error)); console.error(error); } ); diff --git a/app/assets/javascripts/controllers/admin/pricing.js.erb b/app/assets/javascripts/controllers/admin/pricing.js.erb index acd26eab8..fb576b001 100644 --- a/app/assets/javascripts/controllers/admin/pricing.js.erb +++ b/app/assets/javascripts/controllers/admin/pricing.js.erb @@ -528,7 +528,7 @@ Application.Controllers.controller('EditPricingController', ['$scope', '$state', , function () { // the admin has confirmed, delete the coupon Coupon.delete({ id }, function (res) { - growl.success(_t('coupon_was_successfully_deleted')); + growl.success(_t('app.admin.pricing.coupon_was_successfully_deleted')); return $scope.coupons.splice(findItemIdxById(coupons, id), 1); } diff --git a/app/assets/javascripts/controllers/admin/settings.js.erb b/app/assets/javascripts/controllers/admin/settings.js.erb index d16907986..e682dd5a2 100644 --- a/app/assets/javascripts/controllers/admin/settings.js.erb +++ b/app/assets/javascripts/controllers/admin/settings.js.erb @@ -166,7 +166,7 @@ Application.Controllers.controller('SettingsController', ['$scope', '$filter', ' Setting.update( { name: setting.name }, { value }, - function () { growl.success(_t('app.admin.settings.customization_of_SETTING_successfully_saved', { SETTING: _t(`settings.${setting.name}`) })); }, + function () { growl.success(_t('app.admin.settings.customization_of_SETTING_successfully_saved', { SETTING: _t(`app.admin.settings.${setting.name}`) })); }, function (error) { console.log(error); } ); }; diff --git a/app/assets/javascripts/controllers/admin/trainings.js.erb b/app/assets/javascripts/controllers/admin/trainings.js.erb index 366bfe531..d783bf429 100644 --- a/app/assets/javascripts/controllers/admin/trainings.js.erb +++ b/app/assets/javascripts/controllers/admin/trainings.js.erb @@ -276,8 +276,8 @@ Application.Controllers.controller('TrainingsAdminController', ['$scope', '$stat resolve: { object () { return { - title: _t('confirmation_required'), - msg: _t('do_you_really_want_to_delete_this_training') + title: _t('app.admin.trainings.confirmation_required'), + msg: _t('app.admin.trainings.do_you_really_want_to_delete_this_training') }; } } @@ -285,10 +285,10 @@ Application.Controllers.controller('TrainingsAdminController', ['$scope', '$stat function () { // deletion confirmed training.$delete(function () { $scope.trainings.splice(index, 1); - growl.info(_t('training_successfully_deleted')); + growl.info(_t('app.admin.trainings.training_successfully_deleted')); }, function (error) { - growl.warning(_t('unable_to_delete_the_training_because_some_users_alredy_booked_it')); + growl.warning(_t('app.admin.trainings.unable_to_delete_the_training_because_some_users_already_booked_it')); console.error(error); }); } diff --git a/app/assets/javascripts/controllers/application.js.erb b/app/assets/javascripts/controllers/application.js.erb index 7e4d33006..db462cb75 100644 --- a/app/assets/javascripts/controllers/application.js.erb +++ b/app/assets/javascripts/controllers/application.js.erb @@ -149,7 +149,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco $uibModalInstance.close(user); } else { // the user was not saved in database, something wrong occurred - growl.error(_t('unexpected_error_occurred')); + growl.error(_t('app.public.common.unexpected_error_occurred')); } }, function (error) { // creation failed... @@ -204,7 +204,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco }; }] }).result['finally'](null).then(function () { - growl.success(_t('your_password_was_successfully_changed')); + growl.success(_t('app.public.common.your_password_was_successfully_changed')); return Auth.login().then(function (user) { $scope.setCurrentUser(user); }, function (error) { @@ -375,7 +375,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco console.error(`Authentication failed: ${JSON.stringify(error)}`); $scope.alerts = []; return $scope.alerts.push({ - msg: _t('wrong_email_or_password'), + msg: _t('app.public.common.wrong_email_or_password'), type: 'danger' }); }); @@ -418,13 +418,13 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco $scope.alerts = []; return $http.post('/users/password.json', { user: $scope.user }).then(function () { $uibModalInstance.close(); }).catch(function () { $scope.alerts.push({ - msg: _t('your_email_address_is_unknown'), + msg: _t('app.public.common.your_email_address_is_unknown'), type: 'danger' }); }); }; }] - }).result['finally'](null).then(function () { growl.info(_t('you_will_receive_in_a_moment_an_email_with_instructions_to_reset_your_password')); }); + }).result['finally'](null).then(function () { growl.info(_t('app.public.common.you_will_receive_in_a_moment_an_email_with_instructions_to_reset_your_password')); }); } }); // otherwise the user just closed the modal diff --git a/app/assets/javascripts/controllers/members.js b/app/assets/javascripts/controllers/members.js index 23127f37f..5afb42eba 100644 --- a/app/assets/javascripts/controllers/members.js +++ b/app/assets/javascripts/controllers/members.js @@ -142,10 +142,10 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco $rootScope.currentUser = user; Auth._currentUser.group_id = user.group_id; $scope.group.change = false; - return growl.success(_t('edit_profile.your_group_has_been_successfully_changed')); + return growl.success(_t('app.logged.dashboard.settings.your_group_has_been_successfully_changed')); } , function (err) { - growl.error(_t('edit_profile.an_unexpected_error_prevented_your_group_from_being_changed')); + growl.error(_t('app.logged.dashboard.settings.an_unexpected_error_prevented_your_group_from_being_changed')); return console.error(err); }); @@ -198,13 +198,13 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco resolve: { object () { return { - title: _t('confirmation_required'), + title: _t('app.logged.dashboard.settings.confirmation_required'), msg: $sce.trustAsHtml( - _t('edit_profile.confirm_delete_your_account') + '
' + - '' + _t('edit_profile.all_data_will_be_lost') + '

' + - _t('edit_profile.invoicing_data_kept') + '
' + - _t('edit_profile.statistic_data_anonymized') + '
' + - _t('edit_profile.no_further_access_to_projects') + _t('app.logged.dashboard.settings.confirm_delete_your_account') + '
' + + '' + _t('app.logged.dashboard.settings.all_data_will_be_lost') + '

' + + _t('app.logged.dashboard.settings.invoicing_data_kept') + '
' + + _t('app.logged.dashboard.settings.statistic_data_anonymized') + '
' + + _t('app.logged.dashboard.settings.no_further_access_to_projects') ) }; } @@ -214,12 +214,12 @@ Application.Controllers.controller('EditProfileController', ['$scope', '$rootSco Member.remove({ id: user.id }, () => Auth.logout().then(function () { $state.go('app.public.home'); - return growl.success(_t('edit_profile.your_user_account_has_been_successfully_deleted_goodbye')); + return growl.success(_t('app.logged.dashboard.settings.your_user_account_has_been_successfully_deleted_goodbye')); }) , function (error) { console.log(error); - return growl.error(_t('edit_profile.an_error_occured_preventing_your_account_from_being_deleted')); + return growl.error(_t('app.logged.dashboard.settings.an_error_occured_preventing_your_account_from_being_deleted')); }) ); diff --git a/app/assets/javascripts/controllers/plans.js.erb b/app/assets/javascripts/controllers/plans.js.erb index bc155daa9..bbdbd4cee 100644 --- a/app/assets/javascripts/controllers/plans.js.erb +++ b/app/assets/javascripts/controllers/plans.js.erb @@ -99,7 +99,7 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop const amountToPay = helpers.getAmountToPay($scope.cart.total, wallet.amount); if (($scope.currentUser.role !== 'admin') && (amountToPay > 0)) { if ($rootScope.fablabWithoutOnlinePayment) { - growl.error(_t('online_payment_disabled')); + growl.error(_t('app.public.plans.online_payment_disabled')); } else { return payByStripe(); } @@ -323,7 +323,7 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop if ((price.price > 0) && ($scope.walletAmount === 0)) { $scope.validButtonName = _t('app.public.plans.confirm_payment_of_html', { ROLE: $scope.currentUser.role, AMOUNT: $filter('currency')(price.price) }); } else { - $scope.validButtonName = _t('confirm'); + $scope.validButtonName = _t('app.shared.buttons.confirm'); } } diff --git a/app/assets/javascripts/controllers/profile.js.erb b/app/assets/javascripts/controllers/profile.js.erb index 4c7e11048..7a893f7a1 100644 --- a/app/assets/javascripts/controllers/profile.js.erb +++ b/app/assets/javascripts/controllers/profile.js.erb @@ -123,7 +123,7 @@ Application.Controllers.controller('CompleteProfileController', ['$scope', '$roo if (err.data.error) { growl.error(err.data.error); } else { - growl.error(_t('an_unexpected_error_occurred_check_your_authentication_code')); + growl.error(_t('app.logged.profile_completion.an_unexpected_error_occurred_check_your_authentication_code')); console.error(err); } }); @@ -174,7 +174,7 @@ Application.Controllers.controller('CompleteProfileController', ['$scope', '$roo function (email) { // Request the server to send an auth-migration email to the current user AuthProvider.send_code({ email }, - function (res) { growl.info(_t('code_successfully_sent_again')); }, + function (res) { growl.info(_t('app.logged.profile_completion.code_successfully_sent_again')); }, function (err) { growl.error(err.data.error); } ); } diff --git a/app/assets/javascripts/controllers/spaces.js.erb b/app/assets/javascripts/controllers/spaces.js.erb index 20db9ea8d..a60d0fce0 100644 --- a/app/assets/javascripts/controllers/spaces.js.erb +++ b/app/assets/javascripts/controllers/spaces.js.erb @@ -185,7 +185,7 @@ Application.Controllers.controller('ShowSpaceController', ['$scope', '$state', ' event.preventDefault(); // check the permissions if ($scope.currentUser.role !== 'admin') { - return console.error(_t('space_show.unauthorized_operation')); + return console.error(_t('app.public.space_show.unauthorized_operation')); } else { return dialogs.confirm({ resolve: { diff --git a/app/assets/javascripts/controllers/trainings.js.erb b/app/assets/javascripts/controllers/trainings.js.erb index d29ac27b9..22ed4e5dd 100644 --- a/app/assets/javascripts/controllers/trainings.js.erb +++ b/app/assets/javascripts/controllers/trainings.js.erb @@ -47,15 +47,15 @@ Application.Controllers.controller('ShowTrainingController', ['$scope', '$state' $scope.delete = function (training) { // check the permissions if ($scope.currentUser.role !== 'admin') { - console.error(_t('unauthorized_operation')); + growl.error(_t('app.public.training_show.unauthorized_operation')); } else { dialogs.confirm( { resolve: { object () { return { - title: _t('confirmation_required'), - msg: _t('do_you_really_want_to_delete_this_training') + title: _t('app.public.training_show.confirmation_required'), + msg: _t('app.public.training_show.do_you_really_want_to_delete_this_training') }; } } @@ -65,7 +65,7 @@ Application.Controllers.controller('ShowTrainingController', ['$scope', '$state' training.$delete( function () { $state.go('app.public.trainings_list'); }, function (error) { - growl.warning(_t('the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users')); + growl.warning(_t('app.public.training_show.the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users')); console.error(error); } ); @@ -208,7 +208,7 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta */ $scope.markSlotAsModifying = function () { $scope.selectedEvent.backgroundColor = '#eee'; - $scope.selectedEvent.title = $scope.selectedEvent.training.name + ' - ' + _t('i_change'); + $scope.selectedEvent.title = $scope.selectedEvent.training.name + ' - ' + _t('app.logged.trainings_reserve.i_change'); return updateCalendar(); }; @@ -222,7 +222,7 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta } if (!$scope.events.placable || ($scope.events.placable._id !== $scope.selectedEvent._id)) { $scope.selectedEvent.backgroundColor = '#bbb'; - $scope.selectedEvent.title = $scope.selectedEvent.training.name + ' - ' + _t('i_shift'); + $scope.selectedEvent.title = $scope.selectedEvent.training.name + ' - ' + _t('app.logged.trainings_reserve.i_shift'); } return updateCalendar(); }; @@ -231,7 +231,7 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta * When modifying an already booked reservation, callback when the modification was successfully done. */ $scope.modifyTrainingSlot = function () { - $scope.events.placable.title = $scope.currentUser.role !== 'admin' ? $scope.events.placable.training.name + ' - ' + _t('i_ve_reserved') : $scope.events.placable.training.name; + $scope.events.placable.title = $scope.currentUser.role !== 'admin' ? $scope.events.placable.training.name + ' - ' + _t('app.logged.trainings_reserve.i_ve_reserved') : $scope.events.placable.training.name; $scope.events.placable.backgroundColor = 'white'; $scope.events.placable.borderColor = $scope.events.modifiable.borderColor; $scope.events.placable.id = $scope.events.modifiable.id; @@ -257,7 +257,7 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta $scope.events.placable.backgroundColor = 'white'; $scope.events.placable.title = $scope.events.placable.training.name; } - $scope.events.modifiable.title = $scope.currentUser.role !== 'admin' ? $scope.events.modifiable.training.name + ' - ' + _t('i_ve_reserved') : $scope.events.modifiable.training.name; + $scope.events.modifiable.title = $scope.currentUser.role !== 'admin' ? $scope.events.modifiable.training.name + ' - ' + _t('app.logged.trainings_reserve.i_ve_reserved') : $scope.events.modifiable.training.name; $scope.events.modifiable.backgroundColor = 'white'; return updateCalendar(); @@ -329,7 +329,7 @@ Application.Controllers.controller('ReserveTrainingController', ['$scope', '$sta $scope.events.paid[0].can_modify = true; updateTrainingSlotId($scope.events.paid[0], reservation); $scope.events.paid[0].borderColor = '#b2e774'; - $scope.events.paid[0].title = $scope.events.paid[0].training.name + ' - ' + _t('i_ve_reserved'); + $scope.events.paid[0].title = $scope.events.paid[0].training.name + ' - ' + _t('app.logged.trainings_reserve.i_ve_reserved'); if ($scope.selectedPlan) { $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan); diff --git a/app/assets/javascripts/directives/cart.js.erb b/app/assets/javascripts/directives/cart.js.erb index 0eb1dd94e..70e258be0 100644 --- a/app/assets/javascripts/directives/cart.js.erb +++ b/app/assets/javascripts/directives/cart.js.erb @@ -117,7 +117,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs', return $scope.modePlans = true; } else { // otherwise we alert, this error musn't occur when the current user hasn't the admin role - return growl.error(_t('cart.please_select_a_member_first')); + return growl.error(_t('app.shared.cart.please_select_a_member_first')); } }; @@ -133,7 +133,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs', const amountToPay = helpers.getAmountToPay($scope.amountTotal, wallet.amount); if (!$scope.isAdmin() && (amountToPay > 0)) { if ($rootScope.fablabWithoutOnlinePayment) { - growl.error(_t('cart.online_payment_disabled')); + growl.error(_t('app.shared.cart.online_payment_disabled')); } else { return payByStripe(reservation); } @@ -145,7 +145,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs', }); } else { // otherwise we alert, this error musn't occur when the current user is not admin - return growl.error(_t('cart.please_select_a_member_first')); + return growl.error(_t('app.shared.cart.please_select_a_member_first')); } }; @@ -173,7 +173,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs', return $scope.events.modifiable = null; } , function (err) { // failure - growl.error(_t('cart.unable_to_change_the_reservation')); + growl.error(_t('app.shared.cart.unable_to_change_the_reservation')); return console.error(err); }); }; @@ -315,19 +315,19 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs', resolve: { object () { return { - title: _t('cart.confirmation_required'), - msg: _t('cart.do_you_really_want_to_cancel_this_reservation') + title: _t('app.shared.cart.confirmation_required'), + msg: _t('app.shared.cart.do_you_really_want_to_cancel_this_reservation') }; } } }, function () { // cancel confirmed Slot.cancel({ id: $scope.slot.id }, function () { // successfully canceled - growl.success(_t('cart.reservation_was_cancelled_successfully')); + growl.success(_t('app.shared.cart.reservation_was_cancelled_successfully')); if (typeof $scope.onSlotCancelSuccess === 'function') { return $scope.onSlotCancelSuccess(); } } , function () { // error while canceling - growl.error(_t('cart.cancellation_failed')); + growl.error(_t('app.shared.cart.cancellation_failed')); }); } ); @@ -403,7 +403,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs', }); } else { // otherwise we alert, this error musn't occur when the current user is not admin - growl.warning(_t('cart.please_select_a_member_first')); + growl.warning(_t('app.shared.cart.please_select_a_member_first')); return $scope.amountTotal = null; } }; @@ -556,12 +556,12 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs', // Button label if ($scope.amount > 0) { - $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }); + $scope.validButtonName = _t('app.shared.cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')($scope.amount) }); } else { if ((price.price > 0) && ($scope.walletAmount === 0)) { - $scope.validButtonName = _t('cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')(price.price) }); + $scope.validButtonName = _t('app.shared.cart.confirm_payment_of_html', { ROLE: $rootScope.currentUser.role, AMOUNT: $filter('currency')(price.price) }); } else { - $scope.validButtonName = _t('confirm'); + $scope.validButtonName = _t('app.shared.buttons.confirm'); } } @@ -576,7 +576,7 @@ Application.Directives.directive('cart', [ '$rootScope', '$uibModal', 'dialogs', } , function (response) { $scope.alerts = []; - $scope.alerts.push({ msg: _t('cart.a_problem_occurred_during_the_payment_process_please_try_again_later'), type: 'danger' }); + $scope.alerts.push({ msg: _t('app.shared.cart.a_problem_occurred_during_the_payment_process_please_try_again_later'), type: 'danger' }); return $scope.attempting = false; }); }; diff --git a/app/assets/javascripts/directives/coupon.js.erb b/app/assets/javascripts/directives/coupon.js.erb index fe0c0f861..0d8e6316a 100644 --- a/app/assets/javascripts/directives/coupon.js.erb +++ b/app/assets/javascripts/directives/coupon.js.erb @@ -53,15 +53,15 @@ Application.Directives.directive('coupon', [ '$rootScope', 'Coupon', '_t', funct $scope.status = 'valid'; $scope.coupon = res; if (res.type === 'percent_off') { - return $scope.messages.push({ type: 'success', message: _t('the_coupon_has_been_applied_you_get_PERCENT_discount', { PERCENT: res.percent_off }) }); + return $scope.messages.push({ type: 'success', message: _t('app.shared.coupon_input.the_coupon_has_been_applied_you_get_PERCENT_discount', { PERCENT: res.percent_off }) }); } else { - return $scope.messages.push({ type: 'success', message: _t('the_coupon_has_been_applied_you_get_AMOUNT_CURRENCY', { AMOUNT: res.amount_off, CURRENCY: $rootScope.currencySymbol }) }); + return $scope.messages.push({ type: 'success', message: _t('app.shared.coupon_input.the_coupon_has_been_applied_you_get_AMOUNT_CURRENCY', { AMOUNT: res.amount_off, CURRENCY: $rootScope.currencySymbol }) }); } } , function (err) { $scope.status = 'invalid'; $scope.coupon = null; - return $scope.messages.push({ type: 'danger', message: _t(`unable_to_apply_the_coupon_because_${err.data.status}`) }); + return $scope.messages.push({ type: 'danger', message: _t(`app.shared.coupon_input.unable_to_apply_the_coupon_because_${err.data.status}`) }); }); } }; diff --git a/app/assets/javascripts/directives/stripe-form.js.erb b/app/assets/javascripts/directives/stripe-form.js.erb index 15835c91c..4f125e4b4 100644 --- a/app/assets/javascripts/directives/stripe-form.js.erb +++ b/app/assets/javascripts/directives/stripe-form.js.erb @@ -73,7 +73,7 @@ Application.Directives.directive('stripeForm', ['Payment', 'growl', '_t', if (response.error.statusText) { growl.error(response.error.statusText); } else { - growl.error(`${_t('payment_card_error')} ${response.error}`); + growl.error(`${_t('app.shared.messages.payment_card_error')} ${response.error}`); } confirmButton.prop('disabled', false); } else if (response.requires_action) { diff --git a/app/assets/templates/admin/admins/new.html.erb b/app/assets/templates/admin/admins/new.html.erb index 8eeebbb34..4164626ab 100644 --- a/app/assets/templates/admin/admins/new.html.erb +++ b/app/assets/templates/admin/admins/new.html.erb @@ -7,7 +7,7 @@
-

{{ 'add_an_administrator' }}

+

{{ 'app.admin.admins_new.add_an_administrator' }}

@@ -25,7 +25,7 @@
- +
diff --git a/app/assets/templates/admin/calendar/eventModal.html.erb b/app/assets/templates/admin/calendar/eventModal.html.erb index 291e19351..fd526eea3 100644 --- a/app/assets/templates/admin/calendar/eventModal.html.erb +++ b/app/assets/templates/admin/calendar/eventModal.html.erb @@ -176,6 +176,6 @@
- +
diff --git a/app/assets/templates/admin/invoices/index.html.erb b/app/assets/templates/admin/invoices/index.html.erb index e6ebf5f7d..2037f4887 100644 --- a/app/assets/templates/admin/invoices/index.html.erb +++ b/app/assets/templates/admin/invoices/index.html.erb @@ -49,7 +49,7 @@
- {{ "invoices.date_" | translate }} + {{ "app.admin.invoices.date_" | translate }}
@@ -193,14 +193,14 @@
diff --git a/app/assets/templates/admin/plans/_form.html.erb b/app/assets/templates/admin/plans/_form.html.erb index b215683f1..32994fd17 100644 --- a/app/assets/templates/admin/plans/_form.html.erb +++ b/app/assets/templates/admin/plans/_form.html.erb @@ -20,8 +20,8 @@ ng-model="plan.type" required="required" ng-disabled="method == 'PATCH'"> - - + + {{ 'app.shared.plan.type_is_required' }}
diff --git a/app/assets/templates/admin/plans/edit.html.erb b/app/assets/templates/admin/plans/edit.html.erb index 3d27d64c6..6181358da 100644 --- a/app/assets/templates/admin/plans/edit.html.erb +++ b/app/assets/templates/admin/plans/edit.html.erb @@ -31,7 +31,7 @@ '">
- + - {{ 'plan_form.disable_plan_will_not_unsubscribe_users' }} + {{ 'app.shared.plans.disable_plan_will_not_unsubscribe_users' }}

{{ 'app.admin.plans.edit.prices' }}

diff --git a/app/assets/templates/admin/settings/general.html b/app/assets/templates/admin/settings/general.html index 7fdc8b997..f49b7785e 100644 --- a/app/assets/templates/admin/settings/general.html +++ b/app/assets/templates/admin/settings/general.html @@ -53,7 +53,7 @@

{{ 'app.admin.settings.message_of_the_machine_booking_page' }}

-
@@ -62,7 +62,7 @@

{{ 'app.admin.settings.warning_message_of_the_training_booking_page'}}

-
@@ -71,7 +71,7 @@

{{ 'app.admin.settings.information_message_of_the_training_reservation_page'}}

-
@@ -80,7 +80,7 @@

{{ 'app.admin.settings.message_of_the_subscriptions_page' }}

-
@@ -88,7 +88,7 @@

{{ 'app.admin.settings.message_of_the_events_page' }}

-
@@ -96,7 +96,7 @@

{{ 'app.admin.settings.message_of_the_spaces_page' }}

-
@@ -125,8 +125,8 @@ {{cgvFile.custom_asset_file_attributes.attachment}}
- {{ 'browse' }} - {{ 'change' }} + {{ 'app.shared.buttons.browse' }} + {{ 'app.shared.buttons.change' }} {{cguFile.custom_asset_file_attributes.attachment}}
- {{ 'browse' }} - {{ 'change' }} + {{ 'app.shared.buttons.browse' }} + {{ 'app.shared.buttons.change' }} -

{{ 'expiration_date' }}

+

{{ 'app.admin.members_edit.expiration_date' }}

-

{{ 'you_intentionally_decide_to_extend_the_user_s_subscription_by_offering_him_free_days' }}

-

{{ 'credits_will_remain_unchanged' }}

+

{{ 'app.admin.members_edit.you_intentionally_decide_to_extend_the_user_s_subscription_by_offering_him_free_days' }}

+

{{ 'app.admin.members_edit.credits_will_remain_unchanged' }}

-

{{ 'you_intentionally_decide_to_extend_the_user_s_subscription_by_charging_him_again_for_his_current_subscription' }}

-

{{ 'credits_will_be_reset' }}

+

{{ 'app.admin.members_edit.you_intentionally_decide_to_extend_the_user_s_subscription_by_charging_him_again_for_his_current_subscription' }}

+

{{ 'app.admin.members_edit.credits_will_be_reset' }}

- +
- - + +
diff --git a/app/assets/templates/admin/trainings/modal_edit.html.erb b/app/assets/templates/admin/trainings/modal_edit.html.erb index 2c51871fa..0d3969227 100644 --- a/app/assets/templates/admin/trainings/modal_edit.html.erb +++ b/app/assets/templates/admin/trainings/modal_edit.html.erb @@ -1,14 +1,14 @@
-

{{ 'edition_of_the_description_tooltip' }}

+

{{ 'app.admin.trainings.edition_of_the_description_tooltip' }}

- - {{ 'description_is_limited_to_255_characters' }} + + {{ 'app.admin.trainings.description_is_limited_to_255_characters' }}
- +
diff --git a/app/assets/templates/admin/trainings/new.html.erb b/app/assets/templates/admin/trainings/new.html.erb index 05a9a9177..c144bb421 100644 --- a/app/assets/templates/admin/trainings/new.html.erb +++ b/app/assets/templates/admin/trainings/new.html.erb @@ -7,7 +7,7 @@
-

{{ 'trainings_new.add_a_new_training' }}

+

{{ 'app.admin.trainings_new.add_a_new_training' }}

@@ -22,11 +22,11 @@
- + '">
diff --git a/app/assets/templates/calendar/filter.html.erb b/app/assets/templates/calendar/filter.html.erb index 7242f3c47..3983289c0 100644 --- a/app/assets/templates/calendar/filter.html.erb +++ b/app/assets/templates/calendar/filter.html.erb @@ -1,6 +1,6 @@
-

{{ 'calendar.trainings' }}

+

{{ 'app.public.calendar.trainings' }}

@@ -10,7 +10,7 @@
-

{{ 'calendar.machines' }}

+

{{ 'app.public.calendar.machines' }}

@@ -20,7 +20,7 @@
-

{{ 'calendar.spaces' }}

+

{{ 'app.public.calendar.spaces' }}

@@ -29,16 +29,16 @@
-

{{ 'calendar.events' }}

+

{{ 'app.public.calendar.events' }}

-

{{ 'calendar.show_unavailables' }}

+

{{ 'app.public.calendar.show_unavailables' }}

-

{{ 'calendar.externals' }}

+

{{ 'app.public.calendar.externals' }}

diff --git a/app/assets/templates/plans/_plan.html.erb b/app/assets/templates/plans/_plan.html.erb index c7eb3296c..287c3fc9e 100644 --- a/app/assets/templates/plans/_plan.html.erb +++ b/app/assets/templates/plans/_plan.html.erb @@ -23,12 +23,12 @@
- +
- {{ 'do_not_subscribe' | translate }} + {{ 'app.shared.plan_subscribe.do_not_subscribe' | translate }}
diff --git a/app/assets/templates/profile/_token.html.erb b/app/assets/templates/profile/_token.html.erb index 3017b18ed..ca4e99d26 100644 --- a/app/assets/templates/profile/_token.html.erb +++ b/app/assets/templates/profile/_token.html.erb @@ -1,9 +1,9 @@
-

{{ 'do_you_already_have_an_account' }}

-

{{ 'do_not_fill_the_form_beside_but_specify_here_the_code_you_ve_received_by_email_to_recover_your_access' }}

-

{{ 'just_specify_code_here_to_recover_access' }}

-

{{ 'i_did_not_receive_the_code' }}

+

{{ 'app.logged.profile_completion.do_you_already_have_an_account' }}

+

{{ 'app.logged.profile_completion.do_not_fill_the_form_beside_but_specify_here_the_code_you_ve_received_by_email_to_recover_your_access' }}

+

{{ 'app.logged.profile_completion.just_specify_code_here_to_recover_access' }}

+

{{ 'app.logged.profile_completion.i_did_not_receive_the_code' }}

@@ -14,7 +14,7 @@ ng-model="user.auth_token" class="form-control" name="user[auth_token]" - placeholder="{{ 'authentification_code' | translate }}"/> + placeholder="{{ 'app.logged.profile_completion.authentification_code' | translate }}"/>
@@ -22,9 +22,9 @@
- \ No newline at end of file + diff --git a/app/assets/templates/profile/complete.html.erb b/app/assets/templates/profile/complete.html.erb index 57a104e1f..808ad0933 100644 --- a/app/assets/templates/profile/complete.html.erb +++ b/app/assets/templates/profile/complete.html.erb @@ -9,7 +9,7 @@
-

{{ 'confirm_your_new_account' }}

+

{{ 'app.logged.profile_completion.confirm_your_new_account' }}

@@ -25,11 +25,11 @@
- {{ 'you_ve_just_created_a_new_account_on_the_fablab_by_logging_from' | translate:{ GENDER: nameGenre, NAME: fablabName } }}
+ {{ 'app.logged.profile_completion.you_ve_just_created_a_new_account_on_the_fablab_by_logging_from' | translate:{ GENDER: nameGenre, NAME: fablabName } }}
{{activeProvider.name}} ({{ssoEmail()}})
-

{{ 'we_need_some_more_details' }}.

-

{{ 'your_email_is_already_used_by_another_account_on_the_platform' }}

+

{{ 'app.logged.profile_completion.we_need_some_more_details' }}.

+

{{ 'app.logged.profile_completion.your_email_is_already_used_by_another_account_on_the_platform' }}

@@ -37,7 +37,7 @@ @@ -46,10 +46,10 @@
-

{{ 'new_on_this_platform' }}

-

{{ 'please_fill_the_following_form'}}.

-

{{ 'some_data_may_have_already_been_provided_by_provider_and_cannot_be_modified' | translate:{NAME:activeProvider.name} }}.
- {{ 'then_click_on_' | translate }} {{ 'confirm_changes' }} {{ '_to_start_using_the_application' | translate }}.

+

{{ 'app.logged.profile_completion.new_on_this_platform' }}

+

{{ 'app.logged.profile_completion.please_fill_the_following_form'}}.

+

{{ 'app.logged.profile_completion.some_data_may_have_already_been_provided_by_provider_and_cannot_be_modified' | translate:{NAME:activeProvider.name} }}.
+ {{ 'app.logged.profile_completion.then_click_on_' | translate }} {{ 'app.shared.buttons.confirm_changes' }} {{ 'app.logged.profile_completion._to_start_using_the_application' | translate }}.

- + '">
@@ -73,16 +73,16 @@
- +
- {{ 'user_s_profile_is_required' }} + {{ 'app.logged.profile_completion.user_s_profile_is_required' }}
@@ -91,8 +91,8 @@ name="cgu" ng-model="user.cgu" value="true" - ng-required="cgu != null"/> {{ 'i_ve_read_and_i_accept_' | translate }} - {{ '_the_fablab_policy' }} + ng-required="cgu != null"/> {{ 'app.logged.profile_completion.i_ve_read_and_i_accept_' | translate }} + {{ 'app.logged.profile_completion._the_fablab_policy' }}
@@ -103,7 +103,7 @@
@@ -114,21 +114,29 @@
-

{{ 'new_on_this_platform' }}

+

{{ 'app.logged.profile_completion.new_on_this_platform' }}

- {{ 'your_email_' | translate }} ({{ssoEmail()}}) {{ '_is_currently_associated_with_another_account_on_this_platform' | translate }} - {{ 'please_click_to_change_email_associated_with_your_PROVIDER_account' | translate:{PROVDER: activeProvider.name} }} + {{ 'app.logged.profile_completion.your_email_' | translate }} + ({{ssoEmail()}}) + {{ 'app.logged.profile_completion._is_currently_associated_with_another_account_on_this_platform' | translate }} + {{ 'app.logged.profile_completion.please_click_to_change_email_associated_with_your_PROVIDER_account' | translate:{PROVDER: activeProvider.name} }}

- {{ 'change_my_data' | translate }} + {{ 'app.logged.profile_completion.change_my_data' | translate }} -

{{ 'once_your_data_are_up_to_date_' | translate }} {{ '_click_on_the_synchronization_button_opposite_' }} {{ 'or' | translate}} {{ '_disconnect_then_reconnect_' }} {{ '_for_your_changes_to_take_effect' | translate }}

+

+ {{ 'app.logged.profile_completion.once_your_data_are_up_to_date_' | translate }} + {{ 'app.logged.profile_completion._click_on_the_synchronization_button_opposite_' }} + {{ 'app.logged.profile_completion.or' | translate}} + {{ 'app.logged.profile_completion._disconnect_then_reconnect_' }} + {{ 'app.logged.profile_completion._for_your_changes_to_take_effect' | translate }} +

- {{ 'sync_my_profile' | translate }} + {{ 'app.logged.profile_completion.sync_my_profile' | translate }}
@@ -138,11 +146,11 @@
- + '">
diff --git a/app/assets/templates/profile/resend_code_modal.html b/app/assets/templates/profile/resend_code_modal.html index b3e04dd02..f2eedc9f2 100644 --- a/app/assets/templates/profile/resend_code_modal.html +++ b/app/assets/templates/profile/resend_code_modal.html @@ -1,11 +1,11 @@
-

{{ 'send_code_again' }}

+

{{ 'app.logged.profile_completion.send_code_again' }}

- +
- {{'email_is_required'}} - {{'email_format_is_incorrect'}} + {{'app.logged.profile_completion.email_is_required'}} + {{'app.logged.profile_completion.email_format_is_incorrect'}}
- - + +
diff --git a/app/assets/templates/shared/_admin_form.html b/app/assets/templates/shared/_admin_form.html index 8470d9e70..53fb425cf 100644 --- a/app/assets/templates/shared/_admin_form.html +++ b/app/assets/templates/shared/_admin_form.html @@ -7,14 +7,14 @@ ng-model="admin.statistic_profile_attributes.gender" ng-value="true" required/> - {{ 'man' | translate }} + {{ 'app.admin.admins_new.man' | translate }} @@ -26,10 +26,10 @@ type="text" name="admin[username]" class="form-control" id="user_username" - placeholder="{{ 'pseudonym' | translate }}" + placeholder="{{ 'app.admin.admins_new.pseudonym' | translate }}" required> - {{ 'pseudonym_is_required' }} + {{ 'app.admin.admins_new.pseudonym_is_required' }}
@@ -40,10 +40,10 @@ name="admin[profile_attributes][last_name]" class="form-control" id="user_last_name" - placeholder="{{ 'surname' | translate }}" + placeholder="{{ 'app.admin.admins_new.surname' | translate }}" required>
- {{ 'surname_is_required' }} + {{ 'app.admin.admins_new.surname_is_required' }}
@@ -54,10 +54,10 @@ name="admin[profile_attributes][first_name]" class="form-control" id="user_first_name" - placeholder="{{ 'first_name' | translate }}" + placeholder="{{ 'app.admin.admins_new.first_name' | translate }}" required>
- {{ 'first_name_is_required' }} + {{ 'app.admin.admins_new.first_name_is_required' }}
@@ -68,10 +68,10 @@ name="admin[email]" class="form-control" id="user_email" - placeholder="{{ 'email_address' | translate }}" + placeholder="{{ 'app.admin.admins_new.email_address' | translate }}" required>
- {{ 'email_is_required' }} + {{ 'app.admin.admins_new.email_is_required' }}
@@ -84,7 +84,7 @@ uib-datepicker-popup="{{datePicker.format}}" datepicker-options="datePicker.options" is-open="datePicker.opened" - placeholder="{{ 'birth_date' | translate }}" + placeholder="{{ 'app.admin.admins_new.birth_date' | translate }}" ng-click="openDatePicker($event)" /> + placeholder="{{ 'app.admin.admins_new.address' | translate }}">
@@ -115,7 +115,7 @@ type="text" name="admin[profile_attributes][phone]" class="form-control" id="user_phone" - placeholder="{{ 'phone_number' | translate }}"> + placeholder="{{ 'app.admin.admins_new.phone_number' | translate }}"> diff --git a/app/assets/templates/shared/_cart.html.erb b/app/assets/templates/shared/_cart.html.erb index ce0313a29..e60c057aa 100644 --- a/app/assets/templates/shared/_cart.html.erb +++ b/app/assets/templates/shared/_cart.html.erb @@ -140,7 +140,7 @@
- +
diff --git a/app/assets/templates/shared/_coupon.html.erb b/app/assets/templates/shared/_coupon.html.erb index 163d92493..d24ce74d5 100644 --- a/app/assets/templates/shared/_coupon.html.erb +++ b/app/assets/templates/shared/_coupon.html.erb @@ -1,8 +1,8 @@
- {{ 'i_have_a_coupon' }} + {{ 'app.shared.coupon_input.i_have_a_coupon' }}
- +
-

{{ 'plan_form.new_partner' }}

+

{{ 'app.shared.plan.new_partner' }}

- +
- {{ 'first_name_is_required' }} + {{ 'app.shared.plan.first_name_is_required' }}
- +
- {{ 'surname_is_required' }} + {{ 'app.shared.plan.surname_is_required' }}
- +
- {{ 'email_address_is_required' }} + {{ 'app.shared.plan.email_address_is_required' }}
- - + +
diff --git a/app/assets/templates/shared/_wallet_amount_info.html.erb b/app/assets/templates/shared/_wallet_amount_info.html.erb index 84c2d0bd5..40a06cf87 100644 --- a/app/assets/templates/shared/_wallet_amount_info.html.erb +++ b/app/assets/templates/shared/_wallet_amount_info.html.erb @@ -1,10 +1,10 @@
-

-

{{'wallet_pay_reservation' | translate}}

-

+

+

{{'app.shared.wallet.wallet_pay_reservation' | translate}}

+

-

-

{{'client_wallet_pay_reservation' | translate}}

-

+

+

{{'app.shared.wallet.client_wallet_pay_reservation' | translate}}

+

diff --git a/app/assets/templates/shared/about.html.erb b/app/assets/templates/shared/about.html.erb index beb56722d..33cce5a6d 100644 --- a/app/assets/templates/shared/about.html.erb +++ b/app/assets/templates/shared/about.html.erb @@ -11,18 +11,18 @@

- {{ 'about.read_the_fablab_policy' }} + {{ 'app.public.about.read_the_fablab_policy' }}

- {{ 'about.read_the_fablab_s_general_terms_and_conditions' }} + {{ 'app.public.about.read_the_fablab_s_general_terms_and_conditions' }}

- {{ 'about.privacy_policy' }} + {{ 'app.public.about.privacy_policy' }}

-

{{ 'about.your_fablab_s_contacts' }}

+

{{ 'app.public.about.your_fablab_s_contacts' }}

diff --git a/app/assets/templates/shared/confirm_modify_slot_modal.html.erb b/app/assets/templates/shared/confirm_modify_slot_modal.html.erb index 92bd20d3d..b157a3d00 100644 --- a/app/assets/templates/shared/confirm_modify_slot_modal.html.erb +++ b/app/assets/templates/shared/confirm_modify_slot_modal.html.erb @@ -1,14 +1,14 @@
-

{{ 'change_the_slot' }}

+

{{ 'app.shared.confirm_modify_slot_modal.change_the_slot' }}

-

{{ 'do_you_want_to_change_your_booking_slot_initially_planned_at' }}

-

{{ 'do_you_want_to_change_NAME_s_booking_slot_initially_planned_at' }}

+

{{ 'app.shared.confirm_modify_slot_modal.do_you_want_to_change_your_booking_slot_initially_planned_at' }}

+

{{ 'app.shared.confirm_modify_slot_modal.do_you_want_to_change_NAME_s_booking_slot_initially_planned_at' }}

{{object.start | amDateFormat: 'LL'}} : {{object.start | amDateFormat:'LT'}} - {{object.end | amDateFormat:'LT'}}

- - - + + +
diff --git a/app/assets/templates/shared/cookies.html b/app/assets/templates/shared/cookies.html index 4a17b759f..39caef0e6 100644 --- a/app/assets/templates/shared/cookies.html +++ b/app/assets/templates/shared/cookies.html @@ -1,10 +1,10 @@

- {{ 'cookies.about_cookies' }} - {{ 'cookies.learn_more' }} + {{ 'app.public.common.cookies.about_cookies' }} + {{ 'app.public.common.cookies.learn_more' }}

- - + +
diff --git a/app/assets/templates/shared/deviseModal.html.erb b/app/assets/templates/shared/deviseModal.html.erb index 4af3a8164..511ff8c63 100644 --- a/app/assets/templates/shared/deviseModal.html.erb +++ b/app/assets/templates/shared/deviseModal.html.erb @@ -2,7 +2,7 @@

- {{ 'connection' }} + {{ 'app.public.common.connection' }}

@@ -24,7 +24,7 @@ required="required" ng-blur="emailError = !!loginForm.email.$error.email" ng-focus="emailError = false" - placeholder="{{ 'your_email_address' | translate }}" /> + placeholder="{{ 'app.public.common.your_email_address' | translate }}" />
@@ -38,13 +38,13 @@ class="form-control" ng-model="user.password" required="required" - placeholder="{{ 'your_password' | translate }}" + placeholder="{{ 'app.public.common.your_password' | translate }}" ng-minlength="8"/> - {{ 'password_forgotten' | translate }} + {{ 'app.public.common.password_forgotten' | translate }} @@ -53,13 +53,13 @@
- +

- {{ 'not_registered_to_the_fablab' }} + {{ 'app.public.common.not_registered_to_the_fablab' }}
- {{ 'create_an_account' }}
+ {{ 'app.public.common.create_an_account' }}

diff --git a/app/assets/templates/shared/passwordEditModal.html.erb b/app/assets/templates/shared/passwordEditModal.html.erb index 702c7db0f..00149b9a9 100644 --- a/app/assets/templates/shared/passwordEditModal.html.erb +++ b/app/assets/templates/shared/passwordEditModal.html.erb @@ -1,7 +1,7 @@
-

{{ 'change_your_password' }}

+

{{ 'app.public.common.change_your_password' }}

{{alert.msg}} @@ -16,12 +16,12 @@ name="password" ng-model="user.password" class="form-control" - placeholder="{{ 'your_new_password' | translate }}" + placeholder="{{ 'app.public.common.your_new_password' | translate }}" required ng-minlength="8">
- {{ 'password_is_required' }} - {{ 'password_is_too_short' }} + {{ 'app.public.common.password_is_required' }} + {{ 'app.public.common.password_is_too_short' }}
@@ -33,20 +33,20 @@ name="password_confirmation" ng-model="user.password_confirmation" class="form-control" - placeholder="{{ 'type_your_password_again' | translate }}" + placeholder="{{ 'app.public.common.type_your_password_again' | translate }}" required ng-minlength="8" match="user.password"> - {{ 'password_confirmation_is_required' }} - {{ 'password_does_not_match_with_confirmation' }} + {{ 'app.public.common.password_confirmation_is_required' }} + {{ 'app.public.common.password_does_not_match_with_confirmation' }}
- +
diff --git a/app/assets/templates/shared/passwordNewModal.html.erb b/app/assets/templates/shared/passwordNewModal.html.erb index c91595708..37bfcc48d 100644 --- a/app/assets/templates/shared/passwordNewModal.html.erb +++ b/app/assets/templates/shared/passwordNewModal.html.erb @@ -1,7 +1,7 @@
-

{{ 'password_forgotten' }}

+

{{ 'app.public.common.password_forgotten' }}

{{alert.msg}} @@ -19,7 +19,7 @@ required="required" ng-blur="emailError = !!passwordNewForm.email.$error.email" ng-focus="emailError = false" - placeholder="{{ 'your_email_address' | translate }}" /> + placeholder="{{ 'app.public.common.your_email_address' | translate }}" />
@@ -27,9 +27,9 @@
- +
- \ No newline at end of file + diff --git a/app/assets/templates/shared/privacy.html.erb b/app/assets/templates/shared/privacy.html.erb index d7e8220c0..63f212996 100644 --- a/app/assets/templates/shared/privacy.html.erb +++ b/app/assets/templates/shared/privacy.html.erb @@ -2,7 +2,7 @@
-

{{ 'privacy.title' }}

+

{{ 'app.public.privacy.title' }}

@@ -10,14 +10,14 @@
- {{ 'privacy.last_update' }} + {{ 'app.public.privacy.last_update' }} {{ privacyBody.last_update | amDateFormat:'LL' }}
-

{{ 'privacy.dpo' }}

+

{{ 'app.public.privacy.dpo' }}

diff --git a/app/assets/templates/shared/publicProfile.html.erb b/app/assets/templates/shared/publicProfile.html.erb index 21d7c88cc..eb053147c 100644 --- a/app/assets/templates/shared/publicProfile.html.erb +++ b/app/assets/templates/shared/publicProfile.html.erb @@ -104,7 +104,7 @@
- {{project.author_id == user.id ? 'author' : 'collaborator' | translate}} + {{project.author_id == user.id ? 'author' : 'app.shared.public_profile.collaborator' | translate}} {{ 'app.shared.public_profile.rough_draft' }}
diff --git a/app/assets/templates/shared/signupModal.html.erb b/app/assets/templates/shared/signupModal.html.erb index f138bc513..df1714463 100644 --- a/app/assets/templates/shared/signupModal.html.erb +++ b/app/assets/templates/shared/signupModal.html.erb @@ -1,6 +1,6 @@
-

{{ 'create_your_account' }}

+

{{ 'app.public.common.create_your_account' }}

{{alert.msg}} @@ -14,16 +14,16 @@ name="gender" ng-model="user.statistic_profile_attributes.gender" value="true" - required/> {{ 'man' | translate }} + required/> {{ 'app.public.common.man' | translate }} - - {{ 'gender_is_required'}} + + {{ 'app.public.common.gender_is_required'}}
@@ -34,10 +34,10 @@ name="first_name" ng-model="user.profile_attributes.first_name" class="form-control" - placeholder="{{ 'your_first_name' | translate }}" + placeholder="{{ 'app.public.common.your_first_name' | translate }}" required> - {{ 'first_name_is_required' }} + {{ 'app.public.common.first_name_is_required' }}
@@ -45,10 +45,10 @@ name="last_name" ng-model="user.profile_attributes.last_name" class="form-control" - placeholder="{{ 'your_surname' | translate }}" + placeholder="{{ 'app.public.common.your_surname' | translate }}" required> - {{ 'surname_is_required' }} + {{ 'app.public.common.surname_is_required' }}
@@ -60,11 +60,11 @@ name="username" ng-model="user.username" class="form-control" - placeholder="{{ 'your_pseudonym' | translate }}" + placeholder="{{ 'app.public.common.your_pseudonym' | translate }}" required> - {{ 'pseudonym_is_required' }} + {{ 'app.public.common.pseudonym_is_required' }} @@ -76,11 +76,11 @@ name="email" ng-model="user.email" class="form-control" - placeholder="{{ 'your_email_address' | translate }}" + placeholder="{{ 'app.public.common.your_email_address' | translate }}" required> - - {{ 'email_is_required' }} + + {{ 'app.public.common.email_is_required' }} @@ -92,13 +92,13 @@ name="password" ng-model="user.password" class="form-control" - placeholder="{{ 'your_password' | translate }}" + placeholder="{{ 'app.public.common.your_password' | translate }}" required ng-minlength="8"> - {{ 'password_is_required' }} - {{ 'password_is_too_short' }} + {{ 'app.public.common.password_is_required' }} + {{ 'app.public.common.password_is_too_short' }} @@ -110,13 +110,13 @@ name="password_confirmation" ng-model="user.password_confirmation" class="form-control" - placeholder="{{ 'type_your_password_again' | translate }}" + placeholder="{{ 'app.public.common.type_your_password_again' | translate }}" required ng-minlength="8" match="user.password"> - {{ 'password_confirmation_is_required' }} - {{ 'password_does_not_match_with_confirmation' }} + {{ 'app.public.common.password_confirmation_is_required' }} + {{ 'app.public.common.password_does_not_match_with_confirmation' }} @@ -127,7 +127,7 @@ id="organization" ng-model="user.organization" value="false"/> - + @@ -139,11 +139,11 @@ name="organization_name" ng-model="user.profile_attributes.organization_attributes.name" class="form-control" - placeholder="{{ 'name_of_your_organization' | translate }}" + placeholder="{{ 'app.public.common.name_of_your_organization' | translate }}" ng-required="user.organization"> - - {{ 'organization_name_is_required' }} + + {{ 'app.public.common.organization_name_is_required' }} @@ -155,11 +155,11 @@ name="organization_address" ng-model="user.profile_attributes.organization_attributes.address_attributes.address" class="form-control" - placeholder="{{ 'address_of_your_organization' | translate }}" + placeholder="{{ 'app.public.common.address_of_your_organization' | translate }}" ng-required="user.organization"> - - {{ 'organization_address_is_required' }} + + {{ 'app.public.common.organization_address_is_required' }} @@ -167,11 +167,11 @@
- +
- {{ 'user_s_profile_is_required' }} + {{ 'app.public.common.user_s_profile_is_required' }}
@@ -186,12 +186,12 @@ uib-datepicker-popup="{{datePicker.format}}" datepicker-options="datePicker.options" is-open="datePicker.opened" - placeholder="{{ 'birth_date' | translate }}" + placeholder="{{ 'app.public.common.birth_date' | translate }}" ng-click="openDatePicker($event)" required/> - - {{ 'birth_date_is_required' }} + + {{ 'app.public.common.birth_date_is_required' }} @@ -203,13 +203,13 @@ type="text" name="phone" class="form-control" - placeholder="{{ 'phone_number' | translate }}" + placeholder="{{ 'app.public.common.phone_number' | translate }}" ng-required="phoneRequired"> - + - {{ 'phone_number_is_required' }} + {{ 'app.public.common.phone_number_is_required' }} @@ -220,7 +220,7 @@ id="is_allow_contact" ng-model="user.is_allow_contact" value="true"/> - + @@ -231,7 +231,7 @@ id="is_allow_newsletter" ng-model="user.is_allow_newsletter" value="true"/> - + @@ -244,8 +244,8 @@ value="true" ng-required="cgu != null"/> @@ -257,7 +257,7 @@ - {{ 'field_required' }} + {{ 'app.public.common.field_required' }}
@@ -266,5 +266,5 @@
- +
diff --git a/app/assets/templates/shared/valid_reservation_modal.html.erb b/app/assets/templates/shared/valid_reservation_modal.html.erb index 510b44029..b74fb1ce1 100644 --- a/app/assets/templates/shared/valid_reservation_modal.html.erb +++ b/app/assets/templates/shared/valid_reservation_modal.html.erb @@ -1,17 +1,17 @@
-

{{ 'booking_confirmation' }}

+

{{ 'app.shared.valid_reservation_modal.booking_confirmation' }}

{{alert.msg}} - + '"> -

{{ 'here_is_the_summary_of_the_slots_to_book_for_the_current_user' }}

+

{{ 'app.shared.valid_reservation_modal.here_is_the_summary_of_the_slots_to_book_for_the_current_user' }}

- +
diff --git a/app/assets/templates/stripe/payment_modal.html.erb b/app/assets/templates/stripe/payment_modal.html.erb index b6f76e509..7f6f70be8 100644 --- a/app/assets/templates/stripe/payment_modal.html.erb +++ b/app/assets/templates/stripe/payment_modal.html.erb @@ -1,7 +1,7 @@
-

{{ 'online_payment' }}

+

{{ 'app.shared.stripe.online_payment' }}

{{alert.msg}} @@ -10,8 +10,8 @@
-

-

+

+

@@ -19,7 +19,9 @@
- +
@@ -28,7 +30,7 @@
- +
diff --git a/app/assets/templates/trainings/reserve.html.erb b/app/assets/templates/trainings/reserve.html.erb index 0889d42bf..4d1994bba 100644 --- a/app/assets/templates/trainings/reserve.html.erb +++ b/app/assets/templates/trainings/reserve.html.erb @@ -7,8 +7,8 @@
-

{{ 'trainings_planning' }}

-

{{ 'planning_of' }} {{training.name}}

+

{{ 'app.logged.trainings_reserve.trainings_planning' }}

+

{{ 'app.logged.trainings_reserve.planning_of' }} {{training.name}}

@@ -17,7 +17,7 @@ ui-sref="app.logged.trainings_reserve({id:'all'})" ng-hide="mode == 'all'" role="button" - translate>{{ 'all_trainings' }} + translate>{{ 'app.logged.trainings_reserve.all_trainings' }}
@@ -27,7 +27,7 @@
- + '">
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index e95f9030b..6d903b5ca 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -86,6 +86,7 @@ fr: edit_event: "Modifier l'évènement" view_reservations: "Voir les réservations" legend: "Légende" + and: "et" icalendar: icalendar_import: "Import iCalendar" @@ -147,7 +148,8 @@ fr: description_is_limited_to_255_characters: "La description est limitée à 255 caractères." description_was_successfully_saved: "La description a bien été enregistrée." training_successfully_deleted: "La formation a bien été supprimée." - unable_to_delete_the_training_because_some_users_alredy_booked_it: "La formation ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." + unable_to_delete_the_training_because_some_users_already_booked_it: "La formation ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." + confirmation_required: "Confirmation requise" do_you_really_want_to_delete_this_training: "Êtes-vous sur de vouloir supprimer cette formation ?" status_enabled: "Actifs" status_disabled: "Désactivés" @@ -155,10 +157,9 @@ fr: trainings_new: # créer une nouvelle formation - trainings_new: - add_a_new_training: "Ajouter une nouvelle formation" - beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Attention, lors de la création d'une formation, ses tarifs de réservation sont initialisés à zero." - dont_forget_to_change_them_before_creating_slots_for_this_training: "Pensez à les modifier avant de créer des créneaux pour cette formation." + add_a_new_training: "Ajouter une nouvelle formation" + beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Attention, lors de la création d'une formation, ses tarifs de réservation sont initialisés à zero." + dont_forget_to_change_them_before_creating_slots_for_this_training: "Pensez à les modifier avant de créer des créneaux pour cette formation." events: # gestion et suivi des évènements @@ -590,6 +591,7 @@ fr: groups: "Groupes" tags: "Étiquettes" authentication: "Authentification" + confirmation_required: "Confirmation requise" confirm_delete_member: "Êtes-vous sûr de vouloir supprimer ce membre ? Cette opération est irréversible." member_successfully_deleted: "Le membre a bien été supprimé." unable_to_delete_the_member: "Le membre n'a pas pu être supprimé." @@ -599,6 +601,7 @@ fr: unable_to_delete_the_administrator: "L'administrateur n'a pas pu être supprimé." changes_successfully_saved: "Les modifications ont bien été enregistrées." an_error_occurred_while_saving_changes: "Une erreur est survenue lors de l'enregistrement des modifications." + export_is_running_you_ll_be_notified_when_its_ready: "L'export est en cours. Vous serez notifié lorsqu'il sera prêt." tag_form: tags: "Étiquettes" add_a_tag: "Ajouter une étiquette" @@ -736,6 +739,19 @@ fr: add_an_administrator: "Ajouter un administrateur" administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "L'administrateur a bien été créé. {GENDER, select, female{Elle} other{Il}} recevra ses instructions de connexion par email." failed_to_create_admin: "Impossible de créer l'administrateur :" + man: "Homme" + woman: "Femme" + pseudonym: "Pseudonyme" + pseudonym_is_required: "Le pseudonyme est requis." + first_name: "Votre prénom" + first_name_is_required: "Le prénom est requis." + surname: "Votre nom" + surname_is_required: "Le nom est requis." + email_address: "Votre adresse de courriel" + email_is_required: "L'adresse de courriel est requise." + birth_date: "Date de naissance" + address: "Adresse" + phone_number: "Numéro de téléphone" authentication_new: # ajouter un nouveau fournisseur d'authentification (SSO) diff --git a/config/locales/app.logged.fr.yml b/config/locales/app.logged.fr.yml index 48f44667c..87f3fd526 100644 --- a/config/locales/app.logged.fr.yml +++ b/config/locales/app.logged.fr.yml @@ -1,12 +1,13 @@ fr: app: logged: - profileCompletion: + profile_completion: # page de complétion du profil utilisateur, à la première connexion depuis un SSO confirm_your_new_account: "Confirmez votre nouveau compte" you_ve_just_created_a_new_account_on_the_fablab_by_logging_from: "Vous venez de créer un nouveau compte sur {GENDER, select, male{le} female{la} neutral{} other{les}} {NAME}, en vous connectant depuis" we_need_some_more_details: "Afin de finaliser le paramétrage de la plate-forme, nous avons besoin de quelques renseignements supplémentaires" your_email_is_already_used_by_another_account_on_the_platform: "Il semblerait que votre adresse de courriel soit déjà utilisée par un autre utilisateur. Vérifiez votre adresse électronique et veuillez saisir ci-dessous le code qui vient de vous être envoyé." + or: "ou" please_fill_the_following_form: "Merci de compléter le formulaire suivant" some_data_may_have_already_been_provided_by_provider_and_cannot_be_modified: "Certaines informations peuvent nous avoir été déjà fournies par {NAME} et ne sont pas modifiables" then_click_on_: "Cliquez ensuite sur" @@ -24,8 +25,20 @@ fr: an_unexpected_error_occurred_check_your_authentication_code: "Une erreur inattendue est survenue, vérifiez votre code d'authentification." send_code_again: "Renvoyer le code" email_address_associated_with_your_account: "Adresse électronique associée à votre compte" + email_is_required: "L'adresse mail est requise" email_format_is_incorrect: "Le format de l'adresse email est incorrect" code_successfully_sent_again: "Le code a bien été renvoyé" + used_for_statistics: "Cette donnée sera utilisée à des fins statistiques" + your_user_s_profile: "Votre profil utilisateur" + user_s_profile_is_required: "Le profil utilisateur est requis." + i_ve_read_and_i_accept_: "J'ai lu et j'accepte" + _the_fablab_policy: "la charte d'utilisation du Fab Lab" + change_my_data: "Modifier mes données" + sync_my_profile: "Synchroniser mon profil" + once_your_data_are_up_to_date_: "Une fois vos données à jour," + _click_on_the_synchronization_button_opposite_: "cliquez sur le bouton de synchronisation ci-contre" + _disconnect_then_reconnect_: "déconnectez-vous puis re-connectez vous" + _for_your_changes_to_take_effect: "pour que les modifications soient prises en compte." dashboard: # tableau de bord: profile publique @@ -53,6 +66,7 @@ fr: edit_my_profile: "Éditer votre profil" your_group_has_been_successfully_changed: "Votre groupe a bien été changé." an_unexpected_error_prevented_your_group_from_being_changed: "Une erreur inattendue a empêché votre changement de groupe." + confirmation_required: "Confirmation requise" confirm_delete_your_account: "Êtes-vous sûr de vouloir supprimer votre compte ?" all_data_will_be_lost: "Toutes vos données seront détruites et ne pourront pas être récupérées." invoicing_data_kept: "Conformément à la réglementation, les données relatives à vos facturations seront conservées de manière séparée pendant 10 ans." @@ -156,6 +170,8 @@ fr: planning_of: "Planning de la" # suivi du nom de la formation (eg. "Planning de la formation imprimante 3d") all_trainings: "Toutes les formations" cancel_my_selection: "Annuler ma sélection" + i_change: "Je change" + i_shift: "Je déplace" i_ve_reserved: "J'ai réservé" space_reserve: diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index cd53baa4f..884cf6f16 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -124,18 +124,16 @@ fr: about: # page à propos - about: - read_the_fablab_policy: "Consulter les règles d'utilisation du Fab Lab" - read_the_fablab_s_general_terms_and_conditions: "Consulter les conditions générales de vente du Fab Lab" - your_fablab_s_contacts: "Vos contacts au Fab Lab" - privacy_policy: "Politique de confidentialité" + read_the_fablab_policy: "Consulter les règles d'utilisation du Fab Lab" + read_the_fablab_s_general_terms_and_conditions: "Consulter les conditions générales de vente du Fab Lab" + your_fablab_s_contacts: "Vos contacts au Fab Lab" + privacy_policy: "Politique de confidentialité" privacy: # page 'politique de confidentialité' - privacy: - title: "Politique de confidentialité" - dpo: "Délégué à la protection des données" - last_update: "Dernière mise à jour," + title: "Politique de confidentialité" + dpo: "Délégué à la protection des données" + last_update: "Dernière mise à jour," home: # page d'accueil @@ -239,6 +237,7 @@ fr: book_this_training: "Réserver cette formation" do_you_really_want_to_delete_this_training: "Êtes-vous sur de vouloir supprimer cette formation ?" unauthorized_operation: "Opération non autorisée" + confirmation_required: "Confirmation requise" the_training_cant_be_deleted_because_it_is_already_reserved_by_some_users: "La formation ne peut pas être supprimée car elle a déjà été réservée par des utilisateurs." plans: @@ -269,6 +268,7 @@ fr: subscription_confirmation: "Validation de l'abonnement" here_is_the_NAME_subscription_summary: "Voici le récapitulatif de l'abonnement de {NAME} :" confirm_payment_of_html: "{ROLE, select, admin{Encaisser} other{Payer}} : {AMOUNT}" # (contexte : valider un paiement de 20,00 €) + online_payment_disabled: "Le payment par carte bancaire n'est pas disponible. Merci de contacter directement l'accueil du Fablab." events_list: # liste des évènements du fablab diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 1da4a0449..240be47d6 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -19,38 +19,10 @@ fr: "no": "Non" apply: "Appliquer" - elements: - # traductions variées utilisées à plusieurs reprises dans l'application - group: "Groupe" - confirmation_required: "Confirmation requise" - events: "Évènements" - email_address: "Adresse de courriel" - pseudonym: "Pseudonyme" - all_day: "Toute la journée" - total_: "TOTAL :" - name: "Nom" - step_N: "Étape {INDEX}" - online_payment: "Paiement en ligne" - type: "Type" - partner: "Partenaire" - standard: "Standard" - year: "Année" - or: "ou" - and: "et" - change_my_data: "Modifier mes données" - sync_my_profile: "Synchroniser mon profil" - once_your_data_are_up_to_date_: "Une fois vos données à jour," - _click_on_the_synchronization_button_opposite_: "cliquez sur le bouton de synchronisation ci-contre" - _disconnect_then_reconnect_: "déconnectez-vous puis re-connectez vous" - _for_your_changes_to_take_effect: "pour que les modifications soient prises en compte." - all_themes: "Toutes les thématiques" - filter: 'Filtre' - payment_card_error: "Un problème est survenu avec votre carte bancaire :" - unexpected_error_occurred: "Une erreur inattendue est survenue" - messages: you_will_lose_any_unsaved_modification_if_you_quit_this_page: "Vous perdrez les modifications non enregistrées si vous quittez cette page" you_will_lose_any_unsaved_modification_if_you_reload_this_page: "Vous perdrez les modifications non enregistrées si vous rechargez cette page" + payment_card_error: "Un problème est survenu avec votre carte bancaire :" user: # formulaire d'édition du profil utilisateur @@ -151,10 +123,12 @@ fr: stripe: # fenêtre de paiement stripe + online_payment: "Paiement en ligne" i_have_read_and_accept_: "J'ai bien pris connaissance, et accepte" _the_general_terms_and_conditions: "les conditions générales de vente." credit_amount_for_pay_reservation: "Il vous reste {amount} {currency} à payer pour valider votre réservation" client_credit_amount_for_pay_reservation: "Il reste {amount} {currency} à payer pour valider la réservation" + confirm_payment_of_: "Payer : {AMOUNT}" valid_reservation_modal: # fenêtre de paiement sur place d'une réservation @@ -194,6 +168,8 @@ fr: name_is_required: "Le nom est requis" name_length_must_be_less_than_24_characters: "Le nom doit faire moins de 24 caractères." type: "Type" + partner: "Partenaire" + standard: "Standard" type_is_required: "Le type est requis." group: "Groupe" transversal_all_groups: "Transversal (tout les groupes)" @@ -219,6 +195,11 @@ fr: new_user: "Nouvel utilisateur ..." as_part_of_a_partner_subscription_some_notifications_may_be_sent_to_this_user: "Dans le cadre d'un abonnement partenaire, certaines notifications pourront être adressées à cet utilisateur." new_partner: "Nouveau partenaire" + first_name: "Prénom" + first_name_is_required: "Le prénom est requis" + surname: "Nom" + surname_is_required: "le nom est requis" + email_address: "Adresse de courriel" email_address_is_required: "L'adresse e-mail est requise." disabled: "Désactiver l'abonnement" disable_plan_will_not_unsubscribe_users: "Attention : désactiver l'abonnement ne désabonnera pas les utilisateurs ayant actuellement cet abonnement actif."