mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2024-12-01 12:24:28 +01:00
Merge branch 'dev' into l10n_dev
This commit is contained in:
Sylvain
GitHub
commit
c29f017763
@ -1,5 +1,8 @@
|
||||
# Changelog Fab-manager
|
||||
|
||||
- Secure the session cookie
|
||||
- Refactored translations to help merging Crowdin PR
|
||||
|
||||
## v4.3.1 2020 March 04
|
||||
|
||||
- Updated user's manual for v4.3 (fr)
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
# Be sure to restart your server when you modify this file.
|
||||
|
||||
Rails.application.config.session_store :cookie_store, key: '_fablab_session'
|
||||
Rails.application.config.session_store :cookie_store, key: '_Fab-manager_session', secure: (Rails.env.production? || Rails.env.staging?)
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
en:
|
||||
app:
|
||||
admin:
|
||||
#add a new machine
|
||||
machines_new:
|
||||
#add a new machine
|
||||
declare_a_new_machine: "Declare a new machine"
|
||||
watch_out_when_creating_a_new_machine_its_prices_are_initialized_at_0_for_all_subscriptions: "Watch out! When creating a new machine, its prices are initialized at 0 for all subscriptions."
|
||||
consider_changing_them_before_creating_any_reservation_slot: "Consider changing them before creating any reservation slot."
|
||||
#machine edition
|
||||
machines_edit:
|
||||
#machine edition
|
||||
machine_edit: "Edit a machine"
|
||||
#manage the trainings & machines slots
|
||||
calendar:
|
||||
#manage the trainings & machines slots
|
||||
calendar_management: "Calendar management"
|
||||
trainings: "Trainings"
|
||||
machines: "Machines"
|
||||
@ -98,6 +98,7 @@ en:
|
||||
legend: "legend"
|
||||
and: "and"
|
||||
external_sync: "Calendar synchronization"
|
||||
# import external iCal calendar
|
||||
icalendar:
|
||||
icalendar_import: "iCalendar import"
|
||||
intro: "Fab-manager allows to automatically import calendar events, at RFC 5545 iCalendar format, from external URL. These URL are synchronized every hours and the events are shown in the public calendar. You can trigger a synchronisation too, by clicking on the corresponding button, in front of each import."
|
||||
@ -118,8 +119,8 @@ en:
|
||||
confirmation_required: "Confirmation required"
|
||||
confirm_delete_import: "Do you really want to delete this iCalendar import?"
|
||||
delete_success: "iCalendar import successfully deleted"
|
||||
#management of the projects' components
|
||||
project_elements:
|
||||
#management of the projects' components
|
||||
name: "Name"
|
||||
projects_elements_management: "Projects elements management"
|
||||
materials: "Materials"
|
||||
@ -130,8 +131,8 @@ en:
|
||||
description: "Description"
|
||||
add_a_new_licence: "Add a new licence"
|
||||
manage_abuses: "Manage the reports"
|
||||
#track and monitor the trainings
|
||||
trainings:
|
||||
#track and monitor the trainings
|
||||
trainings_monitoring: "Trainings monitoring"
|
||||
plan_session: "Schedule a new session"
|
||||
trainings: "Trainings"
|
||||
@ -163,13 +164,13 @@ en:
|
||||
status_enabled: "Enabled"
|
||||
status_disabled: "Disabled"
|
||||
status_all: "All"
|
||||
#create a new training
|
||||
trainings_new:
|
||||
#create a new training
|
||||
add_a_new_training: "Add a new training"
|
||||
beware_when_creating_a_training_its_reservation_prices_are_initialized_to_zero: "Beware, when creating a training, its reservation prices are initialized at zero."
|
||||
dont_forget_to_change_them_before_creating_slots_for_this_training: "Don't forget to change them before creating slots for this training."
|
||||
#events tracking and management
|
||||
events:
|
||||
#events tracking and management
|
||||
events_monitoring: "Events monitoring"
|
||||
manage_filters: "Manage filters"
|
||||
fablab_events: "Fablab events"
|
||||
@ -222,16 +223,16 @@ en:
|
||||
do_you_really_want_to_delete_this_price_category: "Do you really want to delete this price category?"
|
||||
price_category_successfully_deleted: "Price category successfully deleted."
|
||||
price_category_deletion_failed: "Price category deletion failed."
|
||||
#add a new event
|
||||
events_new:
|
||||
#add a new event
|
||||
add_an_event: "Add an event"
|
||||
none: "None"
|
||||
every_days: "Every days"
|
||||
every_week: "Every week"
|
||||
every_month: "Every month"
|
||||
every_year: "Every year"
|
||||
#edit an existing event
|
||||
events_edit:
|
||||
#edit an existing event
|
||||
edit_the_event: "Edit the event"
|
||||
confirmation_required: "Confirmation required"
|
||||
edit_recurring_event: "You're about to update a periodic event. What do you want to update ?"
|
||||
@ -245,8 +246,8 @@ en:
|
||||
events_not_updated: "On {TOTAL} events, {COUNT, plural, =1{one was not updated} other{{COUNT} were not deleted}}."
|
||||
error_deleting_reserved_price: "Unable to delete the requested price because it is associated with some reservations"
|
||||
other_error: "An unexpected error occurred while updating the event"
|
||||
#event reservations list
|
||||
event_reservations:
|
||||
#event reservations list
|
||||
the_reservations: "Reservations:"
|
||||
user: "User"
|
||||
payment_date: "Payment date"
|
||||
@ -256,8 +257,8 @@ en:
|
||||
no_reservations_for_now: "No reservation for now."
|
||||
back_to_monitoring: "Back to monitoring"
|
||||
canceled: "Canceled"
|
||||
#subscriptions, prices, credits and coupons management
|
||||
pricing:
|
||||
#subscriptions, prices, credits and coupons management
|
||||
pricing_management: "Pricing management"
|
||||
subscriptions: "Subscriptions"
|
||||
trainings: "Trainings"
|
||||
@ -336,23 +337,23 @@ en:
|
||||
status_enabled: "Enabled"
|
||||
status_disabled: "Disabled"
|
||||
status_all: "All"
|
||||
#ajouter un code promotionnel
|
||||
coupons_new:
|
||||
#ajouter un code promotionnel
|
||||
add_a_coupon: "Add a coupon"
|
||||
unable_to_create_the_coupon_check_code_already_used: "Unable to create the coupon. Please check that the code is not already used"
|
||||
#mettre à jour un code promotionnel
|
||||
coupons_edit:
|
||||
#mettre à jour un code promotionnel
|
||||
coupon: "Coupon:"
|
||||
unable_to_update_the_coupon_an_error_occurred: "Unable to update the coupon: an error occurred."
|
||||
plans:
|
||||
#add a subscription plan on the platform
|
||||
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_subscriptions_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 a subscription plan / machine slots prices
|
||||
edit:
|
||||
#edit a subscription plan / machine slots prices
|
||||
subscription_plan: "Subscription plan:"
|
||||
prices: "Prices"
|
||||
copy_prices_from: "Copy prices from"
|
||||
@ -363,8 +364,8 @@ en:
|
||||
space: "Space"
|
||||
unable_to_save_subscription_changes_please_try_again: "Unable to save subscription changes. Please try again."
|
||||
subscription_successfully_changed: "Subscription successfully changed."
|
||||
#list of all invoices & invoicing parameters
|
||||
invoices:
|
||||
#list of all invoices & invoicing parameters
|
||||
invoices: "Invoices"
|
||||
accounting_periods: "Accounting periods"
|
||||
invoices_list: "Invoices list"
|
||||
@ -410,7 +411,7 @@ en:
|
||||
year: "Year"
|
||||
month: "Month"
|
||||
day: "Day"
|
||||
num_of_invoice: "#of invoice"
|
||||
num_of_invoice: "Num. of invoice"
|
||||
online_sales: "Online sales"
|
||||
wallet: "Wallet"
|
||||
refund: "Refund"
|
||||
@ -580,8 +581,8 @@ en:
|
||||
debit_euro: "Euro debit"
|
||||
credit_euro: "Euro credit"
|
||||
lettering: "Lettering"
|
||||
#management of users, labels, groups, and so on
|
||||
members:
|
||||
#management of users, labels, groups, and so on
|
||||
users_management: "Users management"
|
||||
members: "Members"
|
||||
subscriptions: "Subscriptions"
|
||||
@ -659,12 +660,12 @@ en:
|
||||
member_filter_all: "All"
|
||||
member_filter_not_confirmed: "Unconfirmed"
|
||||
member_filter_inactive_for_3_years: "Inactive for 3 years"
|
||||
#add a member
|
||||
members_new:
|
||||
#add a member
|
||||
add_a_member: "Add a member"
|
||||
user_is_an_organization: "User is an organization"
|
||||
#members bulk import
|
||||
members_import:
|
||||
#members bulk import
|
||||
import_members: "Import members"
|
||||
info: "You can upload a CSV file to create new members or update existing ones. Your file must user the identifiers below to specify the group, the trainings and the tags of the members."
|
||||
required_fields: "Your file must contain, at least, the following information for each user to create: email, name, first name and group. If the password is empty, it will be generated. On updates, the empty fields will be kept as is."
|
||||
@ -688,8 +689,8 @@ en:
|
||||
update_on_id: "ID"
|
||||
update_on_username: "Username"
|
||||
update_on_email: "Email address"
|
||||
#import results
|
||||
members_import_result:
|
||||
#import results
|
||||
import_results: "Import results"
|
||||
import_details: "Import #{ID}, of {DATE}, initiated by {USER}"
|
||||
results: "Results"
|
||||
@ -699,8 +700,8 @@ en:
|
||||
success: "Success"
|
||||
failed: "Failed"
|
||||
error_details: "Error's details:"
|
||||
#edit a member
|
||||
members_edit:
|
||||
#edit a member
|
||||
subscription: "Subscription"
|
||||
duration: "Duration:"
|
||||
expires_at: "Expires at:"
|
||||
@ -742,8 +743,8 @@ en:
|
||||
a_problem_occurred_while_taking_the_subscription: "A problem occurred while taking the subscription"
|
||||
wallet: "Wallet"
|
||||
to_credit: 'Credit'
|
||||
#add a new administrator to the platform
|
||||
admins_new:
|
||||
#add a new administrator to the platform
|
||||
add_an_administrator: "Add an administrator"
|
||||
administrator_successfully_created_he_will_receive_his_connection_directives_by_email: "Administrator successfully created. {GENDER, select, female{She} other{He}} receive {GENDER, select, female{her} other{his}} connection directives by e-mail."
|
||||
failed_to_create_admin: "Unable to create the administrator:"
|
||||
@ -760,8 +761,8 @@ en:
|
||||
birth_date: "Date of birth"
|
||||
address: "Address"
|
||||
phone_number: "Phone number"
|
||||
#add a new authentication provider (SSO)
|
||||
authentication_new:
|
||||
#add a new authentication provider (SSO)
|
||||
local_database: "Local Database"
|
||||
o_auth2: "OAuth 2.0"
|
||||
add_a_new_authentication_provider: "Add a new authentication provider"
|
||||
@ -774,14 +775,14 @@ en:
|
||||
do_you_really_want_to_continue: "Do you really want to continue?"
|
||||
unsecured_oauth2_provider_successfully_added: "Unsecured OAuth 2.0 provider successfully added."
|
||||
oauth2_provider_successfully_added: "OAuth 2.0 provider successfully added."
|
||||
#edit an authentication provider (SSO)
|
||||
authentication_edit:
|
||||
#edit an authentication provider (SSO)
|
||||
provider: "Provider :"
|
||||
it_is_required_to_set_the_matching_between_User.uid_and_the_API_to_add_this_provider: "It is required to set the matching between User.uid and the API to add this provider"
|
||||
provider_successfully_updated: "Provider successfully updated"
|
||||
an_error_occurred_unable_to_update_the_provider: "An error occurred: unable to update the provider."
|
||||
#statistics tables
|
||||
statistics:
|
||||
#statistics tables
|
||||
statistics: "Statistics"
|
||||
evolution: "Evolution"
|
||||
age_filter: "Age filter"
|
||||
@ -823,8 +824,8 @@ en:
|
||||
export_is_running_you_ll_be_notified_when_its_ready: "Export is running. You'll be notified when it's ready."
|
||||
create_plans_to_start: "Start by creating new subscription plans."
|
||||
click_here: "Click here to create your first one."
|
||||
#statistics graphs
|
||||
stats_graphs:
|
||||
#statistics graphs
|
||||
statistics: "Statistics"
|
||||
data: "Data"
|
||||
day: "Day"
|
||||
@ -842,8 +843,8 @@ en:
|
||||
week_of_START_to_END: "Week of {START} to {END}"
|
||||
no_data_for_this_period: "No data for this period"
|
||||
date: "Date"
|
||||
#global application parameters and customization
|
||||
settings:
|
||||
#global application parameters and customization
|
||||
title: "Title"
|
||||
customize_the_application: "Customize the application"
|
||||
general: "General"
|
||||
@ -1020,18 +1021,18 @@ en:
|
||||
client_successfully_updated: "Client successfully updated."
|
||||
client_successfully_deleted: "Client successfully deleted."
|
||||
access_successfully_revoked: "Access successfully revoked."
|
||||
#create a new space
|
||||
space_new:
|
||||
#create a new space
|
||||
add_a_new_space: "Add a new space"
|
||||
watch_out_when_creating_a_new_space_its_prices_are_initialized_at_0_for_all_subscriptions: "Watch out! When creating a new space, its prices are initialized at 0 for all subscriptions."
|
||||
consider_changing_its_prices_before_creating_any_reservation_slot: "Consider changing its prices before creating any reservation slot."
|
||||
add_this_space: "Add this space"
|
||||
#modify an exiting space
|
||||
space_edit:
|
||||
#modify an exiting space
|
||||
edit_the_space_NAME: "Edit the space: {NAME}"
|
||||
validate_the_changes: "Validate the changes"
|
||||
#process and delete abuses reports
|
||||
manage_abuses:
|
||||
#process and delete abuses reports
|
||||
abuses_list: "Reports list"
|
||||
no_reports: "No reports for now"
|
||||
published_by: "published by"
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
en:
|
||||
app:
|
||||
logged:
|
||||
#user's profile completion page when logging from an SSO provider
|
||||
profile_completion:
|
||||
#user's profile completion page when logging from an SSO provider
|
||||
confirm_your_new_account: "Confirm your new account"
|
||||
you_ve_just_created_a_new_account_on_the_fablab_by_logging_from: "You've just created a new account on {GENDER, select, neutral{} other{the}} {NAME}, by logging from"
|
||||
we_need_some_more_details: "To finalize the platform setup, we need some more details"
|
||||
@ -43,8 +43,8 @@ en:
|
||||
#dashboard: public profile
|
||||
profile:
|
||||
empty: ''
|
||||
#dashboard: edit my profile
|
||||
settings:
|
||||
#dashboard: edit my profile
|
||||
last_activity_on_: "Last activity on"
|
||||
i_want_to_change_group: "I want to change group!"
|
||||
your_subscription_expires_on_: "Your subscription expires on"
|
||||
@ -91,8 +91,8 @@ en:
|
||||
_click_on_the_synchronization_button_opposite_: "click on the synchronization button opposite"
|
||||
_disconnect_then_reconnect_: "disconnect then reconnect"
|
||||
_for_your_changes_to_take_effect: "for your changes to take effect."
|
||||
#dashboard: my projects
|
||||
projects:
|
||||
#dashboard: my projects
|
||||
you_dont_have_any_projects: "You don't have any projects."
|
||||
add_a_project: "Add a project"
|
||||
author: "Author"
|
||||
@ -103,33 +103,33 @@ en:
|
||||
machines: "Machines"
|
||||
materials: "Materials"
|
||||
collaborators: "Collaborators"
|
||||
#dashboard: my trainings
|
||||
trainings:
|
||||
#dashboard: my trainings
|
||||
your_next_trainings: "Your next trainings"
|
||||
your_previous_trainings: "Your previous trainings"
|
||||
your_approved_trainings: "Your approved trainings"
|
||||
no_trainings: "No trainings"
|
||||
#dashboard: my events
|
||||
events:
|
||||
#dashboard: my events
|
||||
your_next_events: "Your next events"
|
||||
no_events_to_come: "No events to come"
|
||||
your_previous_events: "Your previous events"
|
||||
no_passed_events: "No passed events"
|
||||
NUMBER_normal_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{normal place reserved} other{normal places reserved}}"
|
||||
NUMBER_of_NAME_places_reserved: "{NUMBER} {NUMBER, plural, =0{} =1{of {NAME} place reserved} other{of {NAME} places reserved}}"
|
||||
#dashboard: my invoices
|
||||
invoices:
|
||||
#dashboard: my invoices
|
||||
reference_number: "Reference number"
|
||||
date: "Date"
|
||||
price: "Price"
|
||||
download_the_invoice: "Download the invoice"
|
||||
download_the_credit_note: "Download the refund invoice"
|
||||
no_invoices_for_now: "No invoices for now."
|
||||
#public profil of a member
|
||||
members_show:
|
||||
#public profil of a member
|
||||
members_list: "Members list"
|
||||
#list of members accepting to be contacted
|
||||
members:
|
||||
#list of members accepting to be contacted
|
||||
the_fablab_members: "The Fab Lab members"
|
||||
display_more_members: "Display more members..."
|
||||
no_members_for_now: "No members for now"
|
||||
@ -137,16 +137,16 @@ en:
|
||||
user: "User"
|
||||
pseudonym: "Pseudonym"
|
||||
email_address: "Email address"
|
||||
#add a new project
|
||||
projects_new:
|
||||
#add a new project
|
||||
add_a_new_project: "Add a new project"
|
||||
#modify an existing project
|
||||
projects_edit:
|
||||
#modify an existing project
|
||||
edit_the_project: "Edit the project"
|
||||
rough_draft: "Draft"
|
||||
publish: "Publish"
|
||||
#book a machine
|
||||
machines_reserve:
|
||||
#book a machine
|
||||
machine_planning: "Machine planning"
|
||||
i_ve_reserved: "I've reserved"
|
||||
not_available: "Not available"
|
||||
@ -157,17 +157,17 @@ en:
|
||||
reservation_was_cancelled_successfully: "Reservation was cancelled successfully."
|
||||
cancellation_failed: "Cancellation failed."
|
||||
a_problem_occured_during_the_payment_process_please_try_again_later: "A problem occurred during the payment process. Please try again later."
|
||||
#book a training
|
||||
trainings_reserve:
|
||||
#book a training
|
||||
trainings_planning: "Trainings planning"
|
||||
planning_of: "Planning of" #followed by the training name (eg. Planning of 3d printer training)
|
||||
planning_of: "Planning of " #eg. Planning of 3d printer training
|
||||
all_trainings: "All trainings"
|
||||
cancel_my_selection: "Cancel my selection"
|
||||
i_change: "I change"
|
||||
i_shift: "I shift"
|
||||
i_ve_reserved: "I've reserved"
|
||||
#book a space
|
||||
space_reserve:
|
||||
#book a space
|
||||
planning_of_space_NAME: "Planning of the {NAME} space"
|
||||
i_ve_reserved: "I've reserved"
|
||||
i_shift: "I shift"
|
||||
|
||||
@ -160,7 +160,7 @@ es:
|
||||
#book a training
|
||||
trainings_reserve:
|
||||
trainings_planning: "Plan de curso"
|
||||
planning_of: "Planning of " #eg. Planning of 3d printer training
|
||||
planning_of: "Plan de " #eg. Planning of 3d printer training
|
||||
all_trainings: "Todos los cursos"
|
||||
cancel_my_selection: "Cancelar mi selección"
|
||||
i_change: "I change"
|
||||
|
||||
@ -160,7 +160,7 @@ pt:
|
||||
#book a training
|
||||
trainings_reserve:
|
||||
trainings_planning: "Planos de treinamento"
|
||||
planning_of: "Planning of " #eg. Planning of 3d printer training
|
||||
planning_of: "Planejamento de " #eg. Planning of 3d printer training
|
||||
all_trainings: "Todos treinamentos"
|
||||
cancel_my_selection: "Cancelar minha seleção"
|
||||
i_change: "I change"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user