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' }}

diff --git a/app/assets/templates/admin/invoices/avoirModal.html.erb b/app/assets/templates/admin/invoices/avoirModal.html.erb index 6d49ebdff..a8e24049c 100644 --- a/app/assets/templates/admin/invoices/avoirModal.html.erb +++ b/app/assets/templates/admin/invoices/avoirModal.html.erb @@ -49,7 +49,7 @@
- +

{{ 'invoices.will_appear_on_the_refund_invoice' }}

diff --git a/app/assets/templates/admin/invoices/index.html.erb b/app/assets/templates/admin/invoices/index.html.erb index 2ff43d5ba..0f12a229b 100644 --- a/app/assets/templates/admin/invoices/index.html.erb +++ b/app/assets/templates/admin/invoices/index.html.erb @@ -29,7 +29,7 @@
- {{ 'invoices.invoice_#_' }} + {{ 'invoices.invoice_num_' }}
@@ -62,7 +62,7 @@ - {{ 'invoices.invoice_#' | translate }} + {{ 'invoices.invoice_num' | translate }} {{ 'invoices.date' | translate }} @@ -128,12 +128,12 @@
{{ 'invoices.john_smith' }} -
{{ 'invoices.john_smith@example_com' }}
+
{{ 'invoices.john_smith_at_example_com' }}
{{ 'invoices.invoice_reference_' | translate }} {{mkReference()}}
{{ 'invoices.code_' | translate }} {{invoice.code.model}}
{{ 'invoices.code_disabled' }}
-
{{ 'invoices.order_#' | translate }} {{mkNumber()}}
+
{{ 'invoices.order_num' | translate }} {{mkNumber()}}
{{ 'invoices.invoice_issued_on_DATE_at_TIME' | translate:{DATE:(today | amDateFormat:'L'), TIME:(today | amDateFormat:'LT')} }}
{{ 'invoices.object_reservation_of_john_smith_on_DATE_at_TIME' | translate:{DATE:(inOneWeek | amDateFormat:'L'), TIME:(inOneWeek | amDateFormat:'LT')} }} @@ -217,7 +217,7 @@
  • {{ 'invoices.year' | translate }}
  • {{ 'invoices.month' | translate }}
  • {{ 'invoices.day' | translate }}
  • -
  • {{ 'invoices.#_of_invoice' | translate }}
  • +
  • {{ 'invoices.num_of_invoice' | translate }}
  • {{ 'invoices.online_sales' | translate }}
  • <%#
  • {{ 'invoices.wallet' | translate }}
  • %>
  • {{ 'invoices.refund' | translate }}
  • @@ -244,60 +244,60 @@ @@ -345,7 +345,7 @@
  • {{ 'invoices.year' | translate }}
  • {{ 'invoices.month' | translate }}
  • {{ 'invoices.day' | translate }}
  • -
  • {{ 'invoices.order_#' | translate }}
  • +
  • {{ 'invoices.order_num' | translate }}
  • diff --git a/app/assets/templates/admin/members/edit.html.erb b/app/assets/templates/admin/members/edit.html.erb index 0e5117e46..4321ea378 100644 --- a/app/assets/templates/admin/members/edit.html.erb +++ b/app/assets/templates/admin/members/edit.html.erb @@ -194,7 +194,7 @@ - + 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 @@ - +
    @@ -142,7 +142,7 @@ - +
    @@ -181,7 +181,7 @@ -

    {{ 'settings.logo_(white_background)' }}

    +

    {{ 'settings.logo_white_background' }}

    \ No newline at end of file +
    diff --git a/app/assets/templates/admin/settings/reservations.html b/app/assets/templates/admin/settings/reservations.html index 80b3856d2..532931a8b 100644 --- a/app/assets/templates/admin/settings/reservations.html +++ b/app/assets/templates/admin/settings/reservations.html @@ -65,7 +65,7 @@
    - +
    @@ -94,7 +94,7 @@
    - +
    @@ -132,7 +132,7 @@
    - +
    @@ -172,4 +172,4 @@
    -
    \ No newline at end of file +
    diff --git a/app/assets/templates/admin/subscriptions/expired_at_modal.html.erb b/app/assets/templates/admin/subscriptions/expired_at_modal.html.erb index b2c945523..be8372cd7 100644 --- a/app/assets/templates/admin/subscriptions/expired_at_modal.html.erb +++ b/app/assets/templates/admin/subscriptions/expired_at_modal.html.erb @@ -12,7 +12,7 @@
    - + @@ -246,7 +246,7 @@
    {{currencySymbol}}
    - {{ '0_=_free' }} + {{ '0_equal_free' }}
    diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 382fe0f85..b0351a0aa 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -152,7 +152,7 @@ {{ 'you_can_find_your_reservation_s_details_on_your_' | translate }} {{ 'dashboard' }}
    -
    {{ 'you_booked_(DATE)' | translate:{DATE:(reservation.created_at | amDateFormat:'L LT')} }}
    +
    {{ 'you_booked_DATE' | translate:{DATE:(reservation.created_at | amDateFormat:'L LT')} }}
    {{ 'full_price_' | translate }} {{reservation.nb_reserve_places}} {{ 'ticket' | translate:{NUMBER:reservation.nb_reserve_places}:"messageformat" }}
    {{ticket.event_price_category.price_category.name}} : {{ticket.booked}} {{ 'ticket' | translate:{NUMBER:ticket.booked}:"messageformat" }} diff --git a/app/assets/templates/machines/_form.html.erb b/app/assets/templates/machines/_form.html.erb index b00031a1e..02cb5a1f1 100644 --- a/app/assets/templates/machines/_form.html.erb +++ b/app/assets/templates/machines/_form.html.erb @@ -91,7 +91,7 @@
    - +
    diff --git a/app/assets/templates/shared/_member_form.html.erb b/app/assets/templates/shared/_member_form.html.erb index ac40d0053..f3d00c46d 100644 --- a/app/assets/templates/shared/_member_form.html.erb +++ b/app/assets/templates/shared/_member_form.html.erb @@ -144,7 +144,7 @@ required/>
    {{ 'password_is_required' }} - {{ 'password_is_too_short_(minimum_8_characters)' }} + {{ 'password_is_too_short' }}
    @@ -161,7 +161,7 @@ match="user.password"/>
    {{ 'confirmation_of_password_is_required' }} - {{ 'confirmation_of_password_is_too_short_(minimum_8_characters)' }} + {{ 'confirmation_of_password_is_too_short' }} {{ 'confirmation_mismatch_with_password' }}
    diff --git a/app/assets/templates/shared/passwordEditModal.html.erb b/app/assets/templates/shared/passwordEditModal.html.erb index e1a697fe6..702c7db0f 100644 --- a/app/assets/templates/shared/passwordEditModal.html.erb +++ b/app/assets/templates/shared/passwordEditModal.html.erb @@ -21,7 +21,7 @@ ng-minlength="8">
    {{ 'password_is_required' }} - {{ 'password_is_too_short_(minimum_8_characters)' }} + {{ 'password_is_too_short' }}
    @@ -51,4 +51,4 @@
    -
    \ No newline at end of file +
    diff --git a/app/assets/templates/shared/signupModal.html.erb b/app/assets/templates/shared/signupModal.html.erb index ba356e4ca..eecde8559 100644 --- a/app/assets/templates/shared/signupModal.html.erb +++ b/app/assets/templates/shared/signupModal.html.erb @@ -98,7 +98,7 @@ {{ 'password_is_required' }} - {{ 'password_is_too_short_(minimum_8_characters)' }} + {{ 'password_is_too_short' }} diff --git a/app/assets/templates/spaces/_form.html b/app/assets/templates/spaces/_form.html index ee19adf49..117c03543 100644 --- a/app/assets/templates/spaces/_form.html +++ b/app/assets/templates/spaces/_form.html @@ -88,7 +88,7 @@
    - +
    diff --git a/app/assets/templates/wallet/credit_modal.html.erb b/app/assets/templates/wallet/credit_modal.html.erb index 80e0baf54..da54b17a5 100644 --- a/app/assets/templates/wallet/credit_modal.html.erb +++ b/app/assets/templates/wallet/credit_modal.html.erb @@ -75,7 +75,7 @@
    - +

    {{ 'will_appear_on_the_refund_invoice' }}

    {{ 'invoice_#' }}{{ 'invoice_num' }} {{ 'date' }} {{ 'price' }}