From 1554cfe65d453b73b7bb6a5f437b410269a06094 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 14 Feb 2017 16:09:07 +0100 Subject: [PATCH] refactor plan translations mapping --- .../controllers/admin/plans.coffee.erb | 10 ++++---- .../templates/admin/plans/edit.html.erb | 12 ++++----- app/assets/templates/admin/plans/new.html.erb | 2 +- config/locales/app.admin.en.yml | 25 +++++++++++-------- config/locales/app.admin.fr.yml | 25 +++++++++++-------- 5 files changed, 40 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/controllers/admin/plans.coffee.erb b/app/assets/javascripts/controllers/admin/plans.coffee.erb index c632790b8..cd653e5d8 100644 --- a/app/assets/javascripts/controllers/admin/plans.coffee.erb +++ b/app/assets/javascripts/controllers/admin/plans.coffee.erb @@ -146,7 +146,7 @@ Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', $scope.partner.name = "#{user.first_name} #{user.last_name}" $uibModalInstance.close($scope.partner) , (error)-> - growl.error(_t('unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name')) + growl.error(_t('new_plan.unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name')) $scope.cancel = -> $uibModalInstance.dismiss('cancel') ] @@ -164,9 +164,9 @@ Application.Controllers.controller 'NewPlanController', ['$scope', '$uibModal', ## $scope.afterSubmit = (content) -> if !content.id? and !content.plan_ids? - growl.error(_t('unable_to_create_the_subscription_please_try_again')) + growl.error(_t('new_plan.unable_to_create_the_subscription_please_try_again')) else - growl.success(_t('successfully_created_subscription(s)_dont_forget_to_redefine_prices')) + growl.success(_t('new_plan.successfully_created_subscription(s)_dont_forget_to_redefine_prices')) if content.plan_ids? $state.go('app.admin.pricing') else @@ -231,9 +231,9 @@ Application.Controllers.controller 'EditPlanController', ['$scope', 'groups', 'p ## $scope.afterSubmit = (content) -> if !content.id? and !content.plan_ids? - growl.error(_t('unable_to_save_subscription_changes_please_try_again')) + growl.error(_t('confirm_changes.unable_to_save_subscription_changes_please_try_again')) else - growl.success(_t('subscription_successfully_changed')) + growl.success(_t('confirm_changes.subscription_successfully_changed')) $state.go('app.admin.pricing') diff --git a/app/assets/templates/admin/plans/edit.html.erb b/app/assets/templates/admin/plans/edit.html.erb index cca5e564e..0de6998ec 100644 --- a/app/assets/templates/admin/plans/edit.html.erb +++ b/app/assets/templates/admin/plans/edit.html.erb @@ -7,7 +7,7 @@
-

{{ 'subscription_plan' | translate }} {{ plan.base_name }}

+

{{ 'edit_plan.subscription_plan' | translate }} {{ plan.base_name }}

@@ -30,19 +30,19 @@ -

{{ 'prices' }}

+

{{ 'edit_plan.prices' }}

- +
-

{{ 'machines' }}

+

{{ 'edit_plan.machines' }}

- - + + diff --git a/app/assets/templates/admin/plans/new.html.erb b/app/assets/templates/admin/plans/new.html.erb index f8c3d3a19..d1acc9cc6 100644 --- a/app/assets/templates/admin/plans/new.html.erb +++ b/app/assets/templates/admin/plans/new.html.erb @@ -7,7 +7,7 @@
-

{{ 'add_a_subscription_plan' }}

+

{{ 'new_plan.add_a_subscription_plan' }}

diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 91a611c2b..81fc43e03 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -214,19 +214,22 @@ en: plans: new: # add a subscription plan on the platform - add_a_subscription_plan: "Add a subscription plan" - unable_to_create_the_subscription_please_try_again: "Unable to create the subscription plan. Please try again." - successfully_created_subscription(s)_dont_forget_to_redefine_prices: "Subscription(s) successfully created. Don't forget to redefine prices." - unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Unable to save this user. Check that there isn't an already defined user with the same name." + new_plan: + add_a_subscription_plan: "Add a subscription plan" + unable_to_create_the_subscription_please_try_again: "Unable to create the subscription plan. Please try again." + successfully_created_subscription(s)_dont_forget_to_redefine_prices: "Subscription(s) successfully created. Don't forget to redefine prices." + unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Unable to save this user. Check that there isn't an already defined user with the same name." edit: # edit a subscription plan / machine hours prices - subscription_plan: "Subscription plan:" - prices: "Prices" - copy_prices_from: "Copy prices from" - machine: "Machine" - hourly_rate: "Hourly rate" - unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again." - subscription_successfully_changed: "Subscription successfully changed." + edit_plan: + subscription_plan: "Subscription plan:" + prices: "Prices" + copy_prices_from: "Copy prices from" + machines: "Machines" + machine: "Machine" + hourly_rate: "Hourly rate" + unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again." + subscription_successfully_changed: "Subscription successfully changed." invoices: # list of all invoices & invoicing parameters diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index e745e53e0..625274924 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -214,19 +214,22 @@ fr: plans: new: # ajouter une formule d'abonnement sur la plate-forme - add_a_subscription_plan: "Ajouter une formule d'abonnement" - unable_to_create_the_subscription_please_try_again: "L'abonnement n'a pas pu être créé. Veuillez réessayer." - successfully_created_subscription(s)_dont_forget_to_redefine_prices: "Création du/des abonnement(s) réussie. N'oubliez pas de redéfinir les tarifs." - unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossible d'enregistrer cet utilisateur. Vérifiez qu'il n'existe pas déjà un utilisateur du même nom." + new_plan: + add_a_subscription_plan: "Ajouter une formule d'abonnement" + unable_to_create_the_subscription_please_try_again: "L'abonnement n'a pas pu être créé. Veuillez réessayer." + successfully_created_subscription(s)_dont_forget_to_redefine_prices: "Création du/des abonnement(s) réussie. N'oubliez pas de redéfinir les tarifs." + unable_to_save_this_user_check_that_there_isnt_an_already_a_user_with_the_same_name: "Impossible d'enregistrer cet utilisateur. Vérifiez qu'il n'existe pas déjà un utilisateur du même nom." edit: # modifier une formule d'abonnement / les prix des heures machines - subscription_plan: "Formule d'abonnement :" - prices: "Tarifs" - copy_prices_from: "Copier les prix depuis" - machine: "Machine" - hourly_rate: "Tarif horaire" - unable_to_save_subscription_changes_please_try_again: "Les modifications de l'abonnement n'ont pas pu être enregistrées. Veuillez réessayer." - subscription_successfully_changed: "Modification de l'abonnement réussie." + edit_plan: + subscription_plan: "Formule d'abonnement :" + prices: "Tarifs" + copy_prices_from: "Copier les prix depuis" + machines: "Machines" + machine: "Machine" + hourly_rate: "Tarif horaire" + unable_to_save_subscription_changes_please_try_again: "Les modifications de l'abonnement n'ont pas pu être enregistrées. Veuillez réessayer." + subscription_successfully_changed: "Modification de l'abonnement réussie." invoices: # liste de toutes les factures & paramètres de facturation
{{ 'machine' }}{{ 'hourly_rate' }}{{ 'edit_plan.machine' }}{{ 'edit_plan.hourly_rate' }}