rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-18 07:52:23 +01:00
Code Issues Releases Activity

display data collection purpose on each input field + fix notifications on deleted user

Browse Source
This commit is contained in:
Sylvain 2019-06-12 15:34:03 +02:00
parent 12cf9cfd7d
commit ddce997e12
22 changed files with 105 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/app.utilities.scss
View File

@ -346,6 +346,10 @@ p, .widget p {
vertical-align: super vertical-align: super
} }
.help-cursor {
cursor: help;
}
@media screen and (min-width: $screen-lg-min) { @media screen and (min-width: $screen-lg-min) {
.b-r-lg {border-right: 1px solid $border-color; } .b-r-lg {border-right: 1px solid $border-color; }
.hide-b-r-lg { border: none !important; } .hide-b-r-lg { border: none !important; }

58
app/assets/templates/shared/_member_form.html.erb
View File

@ -57,7 +57,7 @@
ng-disabled="preventField['profile.gender'] && user.statistic_profile.gender && !userForm['user[statistic_profile_attributes][gender]'].$dirty"/> ng-disabled="preventField['profile.gender'] && user.statistic_profile.gender && !userForm['user[statistic_profile_attributes][gender]'].$dirty"/>
<i class="fa fa-female m-l-sm"></i> {{ 'woman' | translate }} <i class="fa fa-female m-l-sm"></i> {{ 'woman' | translate }}
</label> </label>
<span class="exponent m-l-xs"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent m-l-xs help-cursor" title="{{ 'used_for_statistics' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="userForm['user[statistic_profile_attributes][gender]'].$dirty && userForm['user[statistic_profile_attributes][gender]'].$error.required" translate>{{ 'gender_is_required' }}</span> <span class="help-block" ng-show="userForm['user[statistic_profile_attributes][gender]'].$dirty && userForm['user[statistic_profile_attributes][gender]'].$error.required" translate>{{ 'gender_is_required' }}</span>
</div> </div>
@ -65,7 +65,7 @@
<div class="form-group" ng-class="{'has-error': userForm['user[username]'].$dirty && userForm['user[username]'].$invalid}"> <div class="form-group" ng-class="{'has-error': userForm['user[username]'].$dirty && userForm['user[username]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-user"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-user"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
</span> </span>
<input type="text" <input type="text"
name="user[username]" name="user[username]"
@ -83,7 +83,7 @@
<div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][last_name]'].$dirty && userForm['user[profile_attributes][last_name]'].$invalid}"> <div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][last_name]'].$dirty && userForm['user[profile_attributes][last_name]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-user"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-user"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span>
<input type="text" <input type="text"
name="user[profile_attributes][last_name]" name="user[profile_attributes][last_name]"
ng-model="user.profile.last_name" ng-model="user.profile.last_name"
@ -98,7 +98,7 @@
<div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][first_name]'].$dirty && userForm['user[profile_attributes][first_name]'].$invalid}"> <div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][first_name]'].$dirty && userForm['user[profile_attributes][first_name]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-user"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-user"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span>
<input type="text" <input type="text"
name="user[profile_attributes][first_name]" name="user[profile_attributes][first_name]"
ng-model="user.profile.first_name" ng-model="user.profile.first_name"
@ -113,7 +113,7 @@
<div class="form-group" ng-class="{'has-error': userForm['user[email]'].$dirty && userForm['user[email]'].$invalid}"> <div class="form-group" ng-class="{'has-error': userForm['user[email]'].$dirty && userForm['user[email]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-envelope"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-envelope"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span>
<input type="email" <input type="email"
name="user[email]" name="user[email]"
ng-model="user.email" ng-model="user.email"
@ -169,7 +169,7 @@
<div class="form-group" ng-if="user.invoicing_profile.organization" ng-class="{'has-error': userForm['user[invoicing_profile_attributes][organization_attributes][name]'].$dirty && userForm['user[invoicing_profile_attributes][organization_attributes][name]'].$invalid}"> <div class="form-group" ng-if="user.invoicing_profile.organization" ng-class="{'has-error': userForm['user[invoicing_profile_attributes][organization_attributes][name]'].$dirty && userForm['user[invoicing_profile_attributes][organization_attributes][name]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-building-o"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-building-o"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span>
<input type="hidden" <input type="hidden"
name="user[invoicing_profile_attributes][organization_attributes][id]" name="user[invoicing_profile_attributes][organization_attributes][id]"
ng-value="user.invoicing_profile.organization.id" /> ng-value="user.invoicing_profile.organization.id" />
@ -186,7 +186,7 @@
<div class="form-group" ng-if="user.invoicing_profile.organization" ng-class="{'has-error': userForm['user[invoicing_profile_attributes][organization_attributes][address_attributes][address]'].$dirty && userForm['user[invoicing_profile_attributes][organization_attributes][address_attributes][address]'].$invalid}"> <div class="form-group" ng-if="user.invoicing_profile.organization" ng-class="{'has-error': userForm['user[invoicing_profile_attributes][organization_attributes][address_attributes][address]'].$dirty && userForm['user[invoicing_profile_attributes][organization_attributes][address_attributes][address]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-map-marker"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-map-marker"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span>
<input type="hidden" <input type="hidden"
name="user[invoicing_profile_attributes][organization_attributes][address_attributes][id]" name="user[invoicing_profile_attributes][organization_attributes][address_attributes][id]"
ng-value="user.invoicing_profile.organization.address.id" /> ng-value="user.invoicing_profile.organization.address.id" />
@ -203,7 +203,7 @@
<div class="form-group" ng-class="{'has-error': userForm['user[statistic_profile_attributes][birthday]'].$dirty && userForm['user[statistic_profile_attributes][birthday]'].$invalid}"> <div class="form-group" ng-class="{'has-error': userForm['user[statistic_profile_attributes][birthday]'].$dirty && userForm['user[statistic_profile_attributes][birthday]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-calendar-o"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_statistics' | translate }}"><i class="fa fa-calendar-o"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span>
<input type="text" <input type="text"
id="user_birthday" id="user_birthday"
class="form-control" class="form-control"
@ -224,7 +224,7 @@
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-map-marker"></i> </span> <span class="input-group-addon help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-map-marker"></i> </span>
<input type="hidden" <input type="hidden"
name="user[invoicing_profile_attributes][address_attributes][id]" name="user[invoicing_profile_attributes][address_attributes][id]"
ng-value="user.invoicing_profile.address.id" /> ng-value="user.invoicing_profile.address.id" />
@ -240,7 +240,7 @@
<div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][phone]'].$dirty && userForm['user[profile_attributes][phone]'].$invalid}"> <div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][phone]'].$dirty && userForm['user[profile_attributes][phone]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-phone"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_reservation' | translate }}"><i class="fa fa-phone"></i> <span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span></span>
<input type="text" <input type="text"
name="user[profile_attributes][phone]" name="user[profile_attributes][phone]"
ng-model="user.profile.phone" ng-model="user.profile.phone"
@ -255,7 +255,7 @@
<div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][website]'].$dirty && userForm['user[profile_attributes][website]'].$invalid}"> <div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][website]'].$dirty && userForm['user[profile_attributes][website]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-globe"></i> </span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-globe"></i> </span>
<input type="url" <input type="url"
name="user[profile_attributes][website]" name="user[profile_attributes][website]"
ng-model="user.profile.website" ng-model="user.profile.website"
@ -269,7 +269,7 @@
<div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][job]'].$dirty && userForm['user[profile_attributes][job]'].$invalid}"> <div class="form-group" ng-class="{'has-error': userForm['user[profile_attributes][job]'].$dirty && userForm['user[profile_attributes][job]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-briefcase"></i> </span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-briefcase"></i> </span>
<input type="text" <input type="text"
name="user[profile_attributes][job]" name="user[profile_attributes][job]"
ng-model="user.profile.job" ng-model="user.profile.job"
@ -281,7 +281,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="user_interest" translate>{{ 'interests' }}</label> <label for="user_interest" class="help-cursor" title="{{ 'used_for_profile' | translate }}" translate>{{ 'interests' }}</label>
<textarea name="user[profile_attributes][interest]" <textarea name="user[profile_attributes][interest]"
ng-model="user.profile.interest" ng-model="user.profile.interest"
rows="5" rows="5"
@ -292,7 +292,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="user_software_mastered" translate>{{ 'CAD_softwares_mastered' }}</label> <label for="user_software_mastered" class="help-cursor" title="{{ 'used_for_profile' | translate }}" translate>{{ 'CAD_softwares_mastered' }}</label>
<textarea name="user[profile_attributes][software_mastered]" <textarea name="user[profile_attributes][software_mastered]"
ng-model="user.profile.software_mastered" ng-model="user.profile.software_mastered"
rows="5" rows="5"
@ -304,7 +304,7 @@
<!-- allow contact--> <!-- allow contact-->
<div class="form-group"> <div class="form-group">
<label for="allowContact" translate>{{ 'i_authorize_Fablab_users_registered_on_the_site_to_contact_me' }}</label> <label for="allowContact" class="help-cursor" title="{{ 'public_profile' | translate }}" translate>{{ 'i_authorize_Fablab_users_registered_on_the_site_to_contact_me' }}</label>
<input bs-switch <input bs-switch
ng-model="user.is_allow_contact" ng-model="user.is_allow_contact"
id="allowContact" id="allowContact"
@ -333,7 +333,7 @@
<div id="social" ng-init="social={}"> <div id="social" ng-init="social={}">
<div class="form-group" ng-show="social.facebook || user.profile.facebook" ng-class="{'has-error': userForm['user[profile_attributes][facebook]'].$dirty && userForm['user[profile_attributes][facebook]'].$invalid}"> <div class="form-group" ng-show="social.facebook || user.profile.facebook" ng-class="{'has-error': userForm['user[profile_attributes][facebook]'].$dirty && userForm['user[profile_attributes][facebook]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-facebook"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-facebook"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][facebook]" name="user[profile_attributes][facebook]"
ng-model="user.profile.facebook" ng-model="user.profile.facebook"
@ -348,7 +348,7 @@
<div class="form-group" ng-show="social.twitter || user.profile.twitter" ng-class="{'has-error': userForm['user[profile_attributes][twitter]'].$dirty && userForm['user[profile_attributes][twitter]'].$invalid}"> <div class="form-group" ng-show="social.twitter || user.profile.twitter" ng-class="{'has-error': userForm['user[profile_attributes][twitter]'].$dirty && userForm['user[profile_attributes][twitter]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-twitter"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-twitter"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][twitter]" name="user[profile_attributes][twitter]"
ng-model="user.profile.twitter" ng-model="user.profile.twitter"
@ -363,7 +363,7 @@
<div class="form-group" ng-show="social.google_plus || user.profile.google_plus" ng-class="{'has-error': userForm['user[profile_attributes][google_plus]'].$dirty && userForm['user[profile_attributes][google_plus]'].$invalid}"> <div class="form-group" ng-show="social.google_plus || user.profile.google_plus" ng-class="{'has-error': userForm['user[profile_attributes][google_plus]'].$dirty && userForm['user[profile_attributes][google_plus]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-google-plus"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-google-plus"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][google_plus]" name="user[profile_attributes][google_plus]"
ng-model="user.profile.google_plus" ng-model="user.profile.google_plus"
@ -378,7 +378,7 @@
<div class="form-group" ng-show="social.viadeo || user.profile.viadeo" ng-class="{'has-error': userForm['user[profile_attributes][viadeo]'].$dirty && userForm['user[profile_attributes][viadeo]'].$invalid}"> <div class="form-group" ng-show="social.viadeo || user.profile.viadeo" ng-class="{'has-error': userForm['user[profile_attributes][viadeo]'].$dirty && userForm['user[profile_attributes][viadeo]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-viadeo"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-viadeo"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][viadeo]" name="user[profile_attributes][viadeo]"
ng-model="user.profile.viadeo" ng-model="user.profile.viadeo"
@ -393,7 +393,7 @@
<div class="form-group" ng-show="social.linkedin || user.profile.linkedin" ng-class="{'has-error': userForm['user[profile_attributes][linkedin]'].$dirty && userForm['user[profile_attributes][linkedin]'].$invalid}"> <div class="form-group" ng-show="social.linkedin || user.profile.linkedin" ng-class="{'has-error': userForm['user[profile_attributes][linkedin]'].$dirty && userForm['user[profile_attributes][linkedin]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-linkedin"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-linkedin"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][linkedin]" name="user[profile_attributes][linkedin]"
ng-model="user.profile.linkedin" ng-model="user.profile.linkedin"
@ -408,7 +408,7 @@
<div class="form-group" ng-show="social.instagram || user.profile.instragram" ng-class="{'has-error': userForm['user[profile_attributes][instagram]'].$dirty && userForm['user[profile_attributes][instagram]'].$invalid}"> <div class="form-group" ng-show="social.instagram || user.profile.instragram" ng-class="{'has-error': userForm['user[profile_attributes][instagram]'].$dirty && userForm['user[profile_attributes][instagram]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-instagram"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-instagram"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][instagram]" name="user[profile_attributes][instagram]"
ng-model="user.profile.instagram" ng-model="user.profile.instagram"
@ -423,7 +423,7 @@
<div class="form-group" ng-show="social.youtube || user.profile.youtube" ng-class="{'has-error': userForm['user[profile_attributes][youtube]'].$dirty && userForm['user[profile_attributes][youtube]'].$invalid}"> <div class="form-group" ng-show="social.youtube || user.profile.youtube" ng-class="{'has-error': userForm['user[profile_attributes][youtube]'].$dirty && userForm['user[profile_attributes][youtube]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-youtube"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-youtube"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][youtube]" name="user[profile_attributes][youtube]"
ng-model="user.profile.youtube" ng-model="user.profile.youtube"
@ -438,7 +438,7 @@
<div class="form-group" ng-show="social.vimeo || user.profile.vimeo" ng-class="{'has-error': userForm['user[profile_attributes][vimeo]'].$dirty && userForm['user[profile_attributes][vimeo]'].$invalid}"> <div class="form-group" ng-show="social.vimeo || user.profile.vimeo" ng-class="{'has-error': userForm['user[profile_attributes][vimeo]'].$dirty && userForm['user[profile_attributes][vimeo]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-vimeo"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-vimeo"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][vimeo]" name="user[profile_attributes][vimeo]"
ng-model="user.profile.vimeo" ng-model="user.profile.vimeo"
@ -453,7 +453,7 @@
<div class="form-group" ng-show="social.dailymotion || user.profile.dailymotion" ng-class="{'has-error': userForm['user[profile_attributes][dailymotion]'].$dirty && userForm['user[profile_attributes][dailymotion]'].$invalid}"> <div class="form-group" ng-show="social.dailymotion || user.profile.dailymotion" ng-class="{'has-error': userForm['user[profile_attributes][dailymotion]'].$dirty && userForm['user[profile_attributes][dailymotion]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><img src="<%= asset_path('social/dailymotion.png') %>" alt="d" class="fa-img"/></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><img src="<%= asset_path('social/dailymotion.png') %>" alt="d" class="fa-img"/></span>
<input type="text" <input type="text"
name="user[profile_attributes][dailymotion]" name="user[profile_attributes][dailymotion]"
ng-model="user.profile.dailymotion" ng-model="user.profile.dailymotion"
@ -469,7 +469,7 @@
<div class="form-group" ng-show="social.github || user.profile.github" ng-class="{'has-error': userForm['user[profile_attributes][github]'].$dirty && userForm['user[profile_attributes][github]'].$invalid}"> <div class="form-group" ng-show="social.github || user.profile.github" ng-class="{'has-error': userForm['user[profile_attributes][github]'].$dirty && userForm['user[profile_attributes][github]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-github"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-github"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][github]" name="user[profile_attributes][github]"
ng-model="user.profile.github" ng-model="user.profile.github"
@ -484,7 +484,7 @@
<div class="form-group" ng-show="social.echosciences || user.profile.echosciences" ng-class="{'has-error': userForm['user[profile_attributes][echosciences]'].$dirty && userForm['user[profile_attributes][echosciences]'].$invalid}"> <div class="form-group" ng-show="social.echosciences || user.profile.echosciences" ng-class="{'has-error': userForm['user[profile_attributes][echosciences]'].$dirty && userForm['user[profile_attributes][echosciences]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><img src="<%= asset_path('social/echosciences.png') %>" alt="d" class="fa-img"/></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><img src="<%= asset_path('social/echosciences.png') %>" alt="d" class="fa-img"/></span>
<input type="text" <input type="text"
name="user[profile_attributes][echosciences]" name="user[profile_attributes][echosciences]"
ng-model="user.profile.echosciences" ng-model="user.profile.echosciences"
@ -499,7 +499,7 @@
<div class="form-group" ng-show="social.pinterest || user.profile.pinterest" ng-class="{'has-error': userForm['user[profile_attributes][pinterest]'].$dirty && userForm['user[profile_attributes][pinterest]'].$invalid}"> <div class="form-group" ng-show="social.pinterest || user.profile.pinterest" ng-class="{'has-error': userForm['user[profile_attributes][pinterest]'].$dirty && userForm['user[profile_attributes][pinterest]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-pinterest"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-pinterest"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][pinterest]" name="user[profile_attributes][pinterest]"
ng-model="user.profile.pinterest" ng-model="user.profile.pinterest"
@ -514,7 +514,7 @@
<div class="form-group" ng-show="social.lastfm || user.profile.lastfm" ng-class="{'has-error': userForm['user[profile_attributes][lastfm]'].$dirty && userForm['user[profile_attributes][lastfm]'].$invalid}"> <div class="form-group" ng-show="social.lastfm || user.profile.lastfm" ng-class="{'has-error': userForm['user[profile_attributes][lastfm]'].$dirty && userForm['user[profile_attributes][lastfm]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-lastfm"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-lastfm"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][lastfm]" name="user[profile_attributes][lastfm]"
ng-model="user.profile.lastfm" ng-model="user.profile.lastfm"
@ -529,7 +529,7 @@
<div class="form-group" ng-show="social.flickr || user.profile.flickr" ng-class="{'has-error': userForm['user[profile_attributes][flickr]'].$dirty && userForm['user[profile_attributes][flickr]'].$invalid}"> <div class="form-group" ng-show="social.flickr || user.profile.flickr" ng-class="{'has-error': userForm['user[profile_attributes][flickr]'].$dirty && userForm['user[profile_attributes][flickr]'].$invalid}">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="fa fa-flickr"></i></span> <span class="input-group-addon help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-flickr"></i></span>
<input type="text" <input type="text"
name="user[profile_attributes][flickr]" name="user[profile_attributes][flickr]"
ng-model="user.profile.flickr" ng-model="user.profile.flickr"

22
app/assets/templates/shared/signupModal.html.erb
View File

@ -22,7 +22,7 @@
ng-model="user.statistic_profile_attributes.gender" ng-model="user.statistic_profile_attributes.gender"
value="false"/> {{ 'woman' | translate }} value="false"/> {{ 'woman' | translate }}
</label> </label>
<span class="exponent m-l-xs"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent m-l-xs help-cursor" title="{{ 'used_for_statistics' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="signupForm.gender.$dirty && signupForm.gender.$error.required" translate>{{ 'gender_is_required'}}</span> <span class="help-block" ng-show="signupForm.gender.$dirty && signupForm.gender.$error.required" translate>{{ 'gender_is_required'}}</span>
</div> </div>
</div> </div>
@ -36,7 +36,7 @@
class="form-control" class="form-control"
placeholder="{{ 'your_first_name' | translate }}" placeholder="{{ 'your_first_name' | translate }}"
required> required>
<span class="exponent m-l-xs"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent m-l-xs help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="signupForm.first_name.$dirty && signupForm.first_name.$error.required" translate>{{ 'first_name_is_required' }}</span> <span class="help-block" ng-show="signupForm.first_name.$dirty && signupForm.first_name.$error.required" translate>{{ 'first_name_is_required' }}</span>
</div> </div>
<div class="m-b visible-xs"></div> <div class="m-b visible-xs"></div>
@ -47,7 +47,7 @@
class="form-control" class="form-control"
placeholder="{{ 'your_surname' | translate }}" placeholder="{{ 'your_surname' | translate }}"
required> required>
<span class="exponent m-l-xs"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent m-l-xs help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="signupForm.last_name.$dirty && signupForm.last_name.$error.required" translate>{{ 'surname_is_required' }}</span> <span class="help-block" ng-show="signupForm.last_name.$dirty && signupForm.last_name.$error.required" translate>{{ 'surname_is_required' }}</span>
</div> </div>
</div> </div>
@ -63,7 +63,7 @@
placeholder="{{ 'your_pseudonym' | translate }}" placeholder="{{ 'your_pseudonym' | translate }}"
required> required>
</div> </div>
<span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent help-cursor" title="{{ 'used_for_profile' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="signupForm.username.$dirty && signupForm.username.$error.required" translate>{{ 'pseudonym_is_required' }}</span> <span class="help-block" ng-show="signupForm.username.$dirty && signupForm.username.$error.required" translate>{{ 'pseudonym_is_required' }}</span>
</div> </div>
</div> </div>
@ -79,7 +79,7 @@
placeholder="{{ 'your_email_address' | translate }}" placeholder="{{ 'your_email_address' | translate }}"
required> required>
</div> </div>
<span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="signupForm.email.$dirty && signupForm.email.$error.required" translate>{{ 'email_is_required' }}</span> <span class="help-block" ng-show="signupForm.email.$dirty && signupForm.email.$error.required" translate>{{ 'email_is_required' }}</span>
</div> </div>
</div> </div>
@ -142,7 +142,7 @@
placeholder="{{ 'name_of_your_organization' | translate }}" placeholder="{{ 'name_of_your_organization' | translate }}"
ng-required="user.organization"> ng-required="user.organization">
</div> </div>
<span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="signupForm.organization_name.$dirty && signupForm.organization_name.$error.required" translate>{{ 'organization_name_is_required' }}</span> <span class="help-block" ng-show="signupForm.organization_name.$dirty && signupForm.organization_name.$error.required" translate>{{ 'organization_name_is_required' }}</span>
</div> </div>
</div> </div>
@ -158,7 +158,7 @@
placeholder="{{ 'address_of_your_organization' | translate }}" placeholder="{{ 'address_of_your_organization' | translate }}"
ng-required="user.organization"> ng-required="user.organization">
</div> </div>
<span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="signupForm.organization_address.$dirty && signupForm.organization_address.$error.required" translate>{{ 'organization_address_is_required' }}</span> <span class="help-block" ng-show="signupForm.organization_address.$dirty && signupForm.organization_address.$error.required" translate>{{ 'organization_address_is_required' }}</span>
</div> </div>
</div> </div>
@ -169,7 +169,7 @@
<select ng-model="user.group_id" class="form-control" name="group_id" ng-options="g.id as g.name for g in groups" required> <select ng-model="user.group_id" class="form-control" name="group_id" ng-options="g.id as g.name for g in groups" required>
<option value="" translate>{{ 'your_user_s_profile' }}</option> <option value="" translate>{{ 'your_user_s_profile' }}</option>
</select> </select>
<span class="exponent exponent-select"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent exponent-select help-cursor" title="{{ 'used_for_invoicing' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
</div> </div>
<span class="help-block" ng-show="signupForm.group_id.$dirty && signupForm.group_id.$error.required" translate>{{ 'user_s_profile_is_required' }}</span> <span class="help-block" ng-show="signupForm.group_id.$dirty && signupForm.group_id.$error.required" translate>{{ 'user_s_profile_is_required' }}</span>
</div> </div>
@ -190,7 +190,7 @@
ng-click="openDatePicker($event)" ng-click="openDatePicker($event)"
required/> required/>
</div> </div>
<span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent help-cursor" title="{{ 'used_for_statistics' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="signupForm.birthday.$dirty && signupForm.birthday.$error.required" translate>{{ 'birth_date_is_required' }}</span> <span class="help-block" ng-show="signupForm.birthday.$dirty && signupForm.birthday.$error.required" translate>{{ 'birth_date_is_required' }}</span>
</div> </div>
</div> </div>
@ -206,7 +206,7 @@
placeholder="{{ 'phone_number' | translate }}" placeholder="{{ 'phone_number' | translate }}"
required> required>
</div> </div>
<span class="exponent"><i class="fa fa-asterisk" aria-hidden="true"></i></span> <span class="exponent help-cursor" title="{{ 'used_for_reservation' | translate }}"><i class="fa fa-asterisk" aria-hidden="true"></i></span>
<span class="help-block" ng-show="signupForm.phone.$dirty && signupForm.phone.$error.required" translate>{{ 'phone_number_is_required' }}</span> <span class="help-block" ng-show="signupForm.phone.$dirty && signupForm.phone.$error.required" translate>{{ 'phone_number_is_required' }}</span>
</div> </div>
</div> </div>
@ -218,7 +218,7 @@
id="is_allow_contact" id="is_allow_contact"
ng-model="user.is_allow_contact" ng-model="user.is_allow_contact"
value="true"/> value="true"/>
<label for="is_allow_contact" translate>{{ 'i_authorize_Fablab_users_registered_on_the_site_to_contact_me' }}</label> <label for="is_allow_contact" class="help-cursor" title="{{ 'public_profile' | translate }}" translate>{{ 'i_authorize_Fablab_users_registered_on_the_site_to_contact_me' }}</label>
</div> </div>
</div> </div>

2
app/views/api/notifications/_notify_admin_slot_is_canceled.json.jbuilder
View File

@ -1,5 +1,5 @@
json.title notification.notification_type json.title notification.notification_type
json.description t('.USER_s_reservation_on_the_DATE_was_cancelled_remember_to_generate_a_refund_invoice_if_applicable_html', json.description t('.USER_s_reservation_on_the_DATE_was_cancelled_remember_to_generate_a_refund_invoice_if_applicable_html',
USER: notification.attached_object.reservation.user.profile.full_name, USER: notification.attached_object.reservation.user&.profile&.full_name,
DATE: I18n.l(notification.attached_object.start_at, format: :long)) DATE: I18n.l(notification.attached_object.start_at, format: :long))
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

2
app/views/api/notifications/_notify_admin_subscription_canceled.json.jbuilder
View File

@ -1,4 +1,4 @@
json.title notification.notification_type json.title notification.notification_type
json.description t('.USER_s_subscription_has_been_cancelled', json.description t('.USER_s_subscription_has_been_cancelled',
USER: notification.attached_object.user.profile.full_name) USER: notification.attached_object.user&.profile&.full_name)
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

2
app/views/api/notifications/_notify_admin_subscription_extended.json.jbuilder
View File

@ -2,7 +2,7 @@ json.title notification.notification_type
json.description _t('.subscription_PLAN_of_the_member_USER_has_been_extended_FREE_until_DATE_html', json.description _t('.subscription_PLAN_of_the_member_USER_has_been_extended_FREE_until_DATE_html',
{ {
PLAN: notification.attached_object.plan.name, PLAN: notification.attached_object.plan.name,
USER: notification.attached_object.user.profile.full_name, USER: notification.attached_object.user&.profile&.full_name,
FREE: notification.get_meta_data(:free_days).to_s, FREE: notification.get_meta_data(:free_days).to_s,
DATE: I18n.l(notification.attached_object.expired_at.to_date) DATE: I18n.l(notification.attached_object.expired_at.to_date)
}) # messageFormat }) # messageFormat

2
app/views/api/notifications/_notify_admin_subscription_is_expired.json.jbuilder
View File

@ -1,4 +1,4 @@
json.title notification.notification_type json.title notification.notification_type
json.description t('.USER_s_subscription_has_expired', json.description t('.USER_s_subscription_has_expired',
USER:notification.attached_object.user.profile.full_name) USER:notification.attached_object.user&.profile&.full_name)
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

2
app/views/api/notifications/_notify_admin_subscription_will_expire_in_7_days.json.jbuilder
View File

@ -1,4 +1,4 @@
json.title notification.notification_type json.title notification.notification_type
json.description t('.USER_s_subscription_will_expire_in_7_days', json.description t('.USER_s_subscription_will_expire_in_7_days',
USER: notification.attached_object.user.profile.full_name) USER: notification.attached_object.user&.profile&.full_name)
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

4
app/views/api/notifications/_notify_admin_user_group_changed.json.jbuilder
View File

@ -1,7 +1,7 @@
json.title notification.notification_type json.title notification.notification_type
json.description _t('.user_NAME_changed_his_group_html', json.description _t('.user_NAME_changed_his_group_html',
{ {
NAME: notification.attached_object.profile.full_name, NAME: notification.attached_object&.profile&.full_name,
GENDER: bool_to_sym(notification.attached_object.statistic_profile.gender) GENDER: bool_to_sym(notification.attached_object&.statistic_profile&.gender)
}) # messageFormat }) # messageFormat
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

8
app/views/api/notifications/_notify_admin_user_merged.json.jbuilder
View File

@ -1,9 +1,9 @@
json.title notification.notification_type json.title notification.notification_type
json.description _t('.user_NAME_has_merged_his_account_with_the_one_imported_from_PROVIDER_UID_html', json.description _t('.user_NAME_has_merged_his_account_with_the_one_imported_from_PROVIDER_UID_html',
{ {
NAME: notification.attached_object.profile.full_name, NAME: notification.attached_object&.profile&.full_name,
GENDER: bool_to_sym(notification.attached_object.statistic_profile.gender), GENDER: bool_to_sym(notification.attached_object&.statistic_profile&.gender),
PROVIDER: notification.attached_object.provider, PROVIDER: notification.attached_object&.provider,
UID: notification.attached_object.uid UID: notification.attached_object&.uid
}) # messageFormat }) # messageFormat
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

4
app/views/api/notifications/_notify_admin_user_wallet_is_credited.json.jbuilder
View File

@ -2,6 +2,6 @@ json.title notification.notification_type
amount = notification.attached_object.amount amount = notification.attached_object.amount
json.description t('.wallet_is_credited', json.description t('.wallet_is_credited',
AMOUNT: number_to_currency(amount), AMOUNT: number_to_currency(amount),
USER: notification.attached_object.wallet.user.profile.full_name, USER: notification.attached_object.wallet.user&.profile&.full_name,
ADMIN: notification.attached_object.user.profile.full_name) ADMIN: notification.attached_object.user&.profile&.full_name)
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

4
app/views/api/notifications/_notify_admin_when_user_is_created.json.jbuilder
View File

@ -1,5 +1,5 @@
json.title notification.notification_type json.title notification.notification_type
json.description t('.a_new_user_account_has_been_created_NAME_EMAIL_html', json.description t('.a_new_user_account_has_been_created_NAME_EMAIL_html',
NAME: notification.attached_object.profile.full_name, NAME: notification.attached_object&.profile&.full_name,
EMAIL: notification.attached_object.email) EMAIL: notification.attached_object&.email)
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

2
app/views/api/notifications/_notify_partner_subscribed_plan.json.jbuilder
View File

@ -2,6 +2,6 @@ json.title notification.notification_type
json.description t('.subscription_partner_PLAN_has_been_subscribed_by_USER_html', json.description t('.subscription_partner_PLAN_has_been_subscribed_by_USER_html',
{ {
PLAN: notification.attached_object.plan.name, PLAN: notification.attached_object.plan.name,
USER: notification.attached_object.user.profile.full_name USER: notification.attached_object.user&.profile&.full_name
}) # messageFormat }) # messageFormat
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

2
app/views/api/notifications/_notify_project_author_when_collaborator_valid.json.jbuilder
View File

@ -1,5 +1,5 @@
json.title notification.notification_type json.title notification.notification_type
json.description t('.USER_became_collaborator_of_your_project', json.description t('.USER_became_collaborator_of_your_project',
USER: notification.attached_object.user.profile.full_name) + USER: notification.attached_object.user&.profile&.full_name) +
"<a href='/#!/projects/#{notification.attached_object.project.slug}'><strong><em> #{notification.attached_object.project.name}</em></strong></a>." "<a href='/#!/projects/#{notification.attached_object.project.slug}'><strong><em> #{notification.attached_object.project.name}</em></strong></a>."
json.url notification_url(notification, format: :json) json.url notification_url(notification, format: :json)

5
config/locales/app.logged.en.yml
View File

@ -55,6 +55,11 @@ en:
no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them."
your_user_account_has_been_successfully_deleted_goodbye: "Your user account has been successfully deleted. Goodbye." your_user_account_has_been_successfully_deleted_goodbye: "Your user account has been successfully deleted. Goodbye."
an_error_occured_preventing_your_account_from_being_deleted: "An error occurred, preventing your account from being deleted." an_error_occured_preventing_your_account_from_being_deleted: "An error occurred, preventing your account from being deleted."
used_for_statistics: "This data will be used for statistical purposes"
used_for_invoicing: "This data will be used for billing purposes"
used_for_reservation: "This data will be used in case of change on one of your bookings"
used_for_profile: "This data will only be displayed on your profile"
public_profile: "You will have a public profile and other users will be able to associate you in their projects"
projects: projects:
# dashboard: my projects # dashboard: my projects
you_dont_have_any_projects: "You don't have any projects." you_dont_have_any_projects: "You don't have any projects."

5
config/locales/app.logged.es.yml
View File

@ -55,6 +55,11 @@ es:
no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation
your_user_account_has_been_successfully_deleted_goodbye: "Su cuenta ha sido eliminada con éxito. Adiós" your_user_account_has_been_successfully_deleted_goodbye: "Su cuenta ha sido eliminada con éxito. Adiós"
an_error_occured_preventing_your_account_from_being_deleted: "Un error inesperado impidió que su cuenta fuese eliminada." an_error_occured_preventing_your_account_from_being_deleted: "Un error inesperado impidió que su cuenta fuese eliminada."
used_for_statistics: "This data will be used for statistical purposes" # translation missing
used_for_invoicing: "This data will be used for billing purposes" # translation missing
used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing
used_for_profile: "This data will only be displayed on your profile" # translation missing
public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing
projects: projects:
# dashboard: my projects # dashboard: my projects
you_dont_have_any_projects: "Aún no tiene proyectos." you_dont_have_any_projects: "Aún no tiene proyectos."

5
config/locales/app.logged.fr.yml
View File

@ -55,6 +55,11 @@ fr:
no_further_access_to_projects: "Vos projets publiés seront anonymisés et vous n'aurez plus de possibilité de les modifier." no_further_access_to_projects: "Vos projets publiés seront anonymisés et vous n'aurez plus de possibilité de les modifier."
your_user_account_has_been_successfully_deleted_goodbye: "Votre compte utilisateur a bien été supprimé. Au revoir." your_user_account_has_been_successfully_deleted_goodbye: "Votre compte utilisateur a bien été supprimé. Au revoir."
an_error_occured_preventing_your_account_from_being_deleted: "Une erreur est survenue qui a empêché la suppression de votre compte." an_error_occured_preventing_your_account_from_being_deleted: "Une erreur est survenue qui a empêché la suppression de votre compte."
used_for_statistics: "Cette donnée sera utilisée à des fins statistiques"
used_for_invoicing: "Cette donnée sera utilisée à des fins de facturation"
used_for_reservation: "Cette donnée sera utilisée en cas de changement sur une de vos réservations"
used_for_profile: "Cette donnée sera seulement affichée sur votre profil"
public_profile: "Vous aurez un profil public et les autres utilisateurs pourront vous associer à leurs projets"
projects: projects:
# tableau de bord : mes projets # tableau de bord : mes projets
you_dont_have_any_projects: "Vous n'avez aucun projet." you_dont_have_any_projects: "Vous n'avez aucun projet."

5
config/locales/app.logged.pt.yml
View File

@ -55,6 +55,11 @@ pt:
no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation no_further_access_to_projects: "Your published projects will be anonymized and you won't get any further ability to edit them." # missing translation
your_user_account_has_been_successfully_deleted_goodbye: "Sua conta de usuário foi excluída com êxito. Até mais." your_user_account_has_been_successfully_deleted_goodbye: "Sua conta de usuário foi excluída com êxito. Até mais."
an_error_occured_preventing_your_account_from_being_deleted: "Ocorreu um erro, impedindo que sua conta fosse excluída." an_error_occured_preventing_your_account_from_being_deleted: "Ocorreu um erro, impedindo que sua conta fosse excluída."
used_for_statistics: "This data will be used for statistical purposes" # translation missing
used_for_invoicing: "This data will be used for billing purposes" # translation missing
used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing
used_for_profile: "This data will only be displayed on your profile" # translation missing
public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing
projects: projects:
# dashboard: my projects # dashboard: my projects
you_dont_have_any_projects: "Você não tem nenhum projeto." you_dont_have_any_projects: "Você não tem nenhum projeto."

5
config/locales/app.public.en.yml
View File

@ -87,6 +87,11 @@ en:
_the_fablab_policy: "the FabLab policy" _the_fablab_policy: "the FabLab policy"
field_required: "Field required" field_required: "Field required"
unexpected_error_occurred: "An unexpected error occurred. Please try again later." unexpected_error_occurred: "An unexpected error occurred. Please try again later."
used_for_statistics: "This data will be used for statistical purposes"
used_for_invoicing: "This data will be used for billing purposes"
used_for_reservation: "This data will be used in case of change on one of your bookings"
used_for_profile: "This data will only be displayed on your profile"
public_profile: "You will have a public profile and other users will be able to associate you in their projects"
# password modification modal # password modification modal
change_your_password: "Change your password" change_your_password: "Change your password"

9
config/locales/app.public.es.yml
View File

@ -84,8 +84,13 @@ es:
i_accept_to_receive_information_from_the_fablab: "Acepto recibir información del FabLab" i_accept_to_receive_information_from_the_fablab: "Acepto recibir información del FabLab"
i_ve_read_and_i_accept_: "He leido y acepto" i_ve_read_and_i_accept_: "He leido y acepto"
_the_fablab_policy: "la política de FabLab" _the_fablab_policy: "la política de FabLab"
field_required: "Field required" # translation missing field_required: "Field required" # translation missing
unexpected_error_occurred: "An unexpected error occurred. Please try again later." # translation missing unexpected_error_occurred: "An unexpected error occurred. Please try again later." # translation missing
used_for_statistics: "This data will be used for statistical purposes" # translation missing
used_for_invoicing: "This data will be used for billing purposes" # translation missing
used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing
used_for_profile: "This data will only be displayed on your profile" # translation missing
public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing
# password modification modal # password modification modal
change_your_password: "Cambiar contraseña" change_your_password: "Cambiar contraseña"

5
config/locales/app.public.fr.yml
View File

@ -87,6 +87,11 @@ fr:
_the_fablab_policy: "la charte d'utilisation du Fab Lab" _the_fablab_policy: "la charte d'utilisation du Fab Lab"
field_required: "Champ requis" field_required: "Champ requis"
unexpected_error_occurred: "Une erreur inattendue s'est produite. Veuillez réessayer ultérieurement." unexpected_error_occurred: "Une erreur inattendue s'est produite. Veuillez réessayer ultérieurement."
used_for_statistics: "Cette donnée sera utilisée à des fins statistiques"
used_for_invoicing: "Cette donnée sera utilisée à des fins de facturation"
used_for_reservation: "Cette donnée sera utilisée en cas de changement sur une de vos réservations"
used_for_profile: "Cette donnée sera seulement affichée sur votre profil"
public_profile: "Vous aurez un profil public et les autres utilisateurs pourront vous associer à leurs projets"
# fenêtre de changement de mot de passe # fenêtre de changement de mot de passe
change_your_password: "Modifier votre mot de passe" change_your_password: "Modifier votre mot de passe"

9
config/locales/app.public.pt.yml
View File

@ -85,8 +85,13 @@ pt:
i_accept_to_receive_information_from_the_fablab: "Eu aceito receber informações do FabLab" i_accept_to_receive_information_from_the_fablab: "Eu aceito receber informações do FabLab"
i_ve_read_and_i_accept_: "Eu li e aceito" i_ve_read_and_i_accept_: "Eu li e aceito"
_the_fablab_policy: "a política do FabLab" _the_fablab_policy: "a política do FabLab"
field_required: "Field required" # translation missing field_required: "Field required" # translation missing
unexpected_error_occurred: "An unexpected error occurred. Please try again later." # translation missing unexpected_error_occurred: "An unexpected error occurred. Please try again later." # translation missing
used_for_statistics: "This data will be used for statistical purposes" # translation missing
used_for_invoicing: "This data will be used for billing purposes" # translation missing
used_for_reservation: "This data will be used in case of change on one of your bookings" # translation missing
used_for_profile: "This data will only be displayed on your profile" # translation missing
public_profile: "You will have a public profile and other users will be able to associate you in their projects" # translation missing
# password modification modal # password modification modal
change_your_password: "Mudar sua senha" change_your_password: "Mudar sua senha"