diff --git a/CHANGELOG.md b/CHANGELOG.md index aedce2ecb..a2a8d9215 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog Fab Manager +- Fix a bug: (spanish) some translations are not loaded correctly - Fix a bug: some users may not appear in the admin's general listing +- Improved translations syntax according to YML specifications - [TODO DEPLOY] `rake fablab:fix:users_group_ids` ## v3.1.1 2019 April 8 diff --git a/app/assets/javascripts/controllers/admin/plans.js.erb b/app/assets/javascripts/controllers/admin/plans.js.erb index b7846bc21..7cfd3e2e3 100644 --- a/app/assets/javascripts/controllers/admin/plans.js.erb +++ b/app/assets/javascripts/controllers/admin/plans.js.erb @@ -145,7 +145,7 @@ Application.Controllers.controller('NewPlanController', ['$scope', '$uibModal', if ((content.id == null) && (content.plan_ids == null)) { return growl.error(_t('new_plan.unable_to_create_the_subscription_please_try_again')); } else { - growl.success(_t('new_plan.successfully_created_subscription(s)_dont_forget_to_redefine_prices')); + growl.success(_t('new_plan.successfully_created_subscriptions_dont_forget_to_redefine_prices')); if (content.plan_ids != null) { return $state.go('app.admin.pricing'); } else { diff --git a/app/assets/templates/admin/calendar/eventModal.html.erb b/app/assets/templates/admin/calendar/eventModal.html.erb index a0d851ef1..938b91668 100644 --- a/app/assets/templates/admin/calendar/eventModal.html.erb +++ b/app/assets/templates/admin/calendar/eventModal.html.erb @@ -78,7 +78,7 @@
{{ 'admin_calendar.restrict_this_slot_with_labels_(optional)' }}
+{{ 'admin_calendar.restrict_this_slot_with_labels_optional' }}
{{ 'invoices.will_appear_on_the_refund_invoice' }}
{{ 'invoice_#' }} | +{{ 'invoice_num' }} | {{ 'date' }} | {{ 'price' }} | diff --git a/app/assets/templates/admin/plans/_form.html.erb b/app/assets/templates/admin/plans/_form.html.erb index f77fcfe55..c555aefac 100644 --- a/app/assets/templates/admin/plans/_form.html.erb +++ b/app/assets/templates/admin/plans/_form.html.erb @@ -33,7 +33,7 @@ ng-model="plan.group_id" required="required" ng-disabled="method == 'PATCH'"> - + diff --git a/app/assets/templates/admin/settings/general.html b/app/assets/templates/admin/settings/general.html index 0f5658a27..2822ad1ba 100644 --- a/app/assets/templates/admin/settings/general.html +++ b/app/assets/templates/admin/settings/general.html @@ -118,7 +118,7 @@ |
---|