rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-19 13:54:25 +01:00
Code Issues Releases Activity

fix typo + remove wrong todo

Browse Source
This commit is contained in:
Sylvain 2016-03-30 17:31:12 +02:00
parent 9a4eff08d0
commit fe9fea2748
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,6 @@
<span class="btn btn-default btn-file" <span class="btn btn-default btn-file"
ng-click="user.profile.user_avatar._destory = false" ng-click="user.profile.user_avatar._destory = false"
ng-hide="preventField['profile.avatar'] && user.profile.user_avatar.attachment_url && !userForm['user[profile_attributes][user_avatar_attributes]'].$dirty"> ng-hide="preventField['profile.avatar'] && user.profile.user_avatar.attachment_url && !userForm['user[profile_attributes][user_avatar_attributes]'].$dirty">
<!-- FIXME: still able to add an avatar if none is present when SSO is activated -->
<span class="fileinput-new" translate>{{ 'add_an_avatar' }}</span> <span class="fileinput-new" translate>{{ 'add_an_avatar' }}</span>
<span class="fileinput-exists" translate>{{ 'change' }}</span> <span class="fileinput-exists" translate>{{ 'change' }}</span>
<input type="file" name="user[profile_attributes][user_avatar_attributes][attachment]"> <input type="file" name="user[profile_attributes][user_avatar_attributes][attachment]">

4
config/locales/en.yml
View File

@ -37,11 +37,11 @@ en:
<<: *errors <<: *errors
omniauth: omniauth:
# messages d'erreur lors de l'import d'un compte depuis un SSO # error messages when importing an account from a SSO
email_already_linked_to_another_account_please_input_your_authentication_code: "E-mail address \"%{OLD_MAIL}\" is already linked to another account, please input your authentication code." email_already_linked_to_another_account_please_input_your_authentication_code: "E-mail address \"%{OLD_MAIL}\" is already linked to another account, please input your authentication code."
your_username_is_already_linked_to_another_account_unable_to_update_it: "Your username (%{USERNAME}) is already linked to another account, unable to update it." your_username_is_already_linked_to_another_account_unable_to_update_it: "Your username (%{USERNAME}) is already linked to another account, unable to update it."
your_email_address_is_already_linked_to_another_account_unable_to_update_it: "Your e-mail address (%{EMAIL}) is already linked to another account, unable to update it." your_email_address_is_already_linked_to_another_account_unable_to_update_it: "Your e-mail address (%{EMAIL}) is already linked to another account, unable to update it."
this_account_is_already_linked_to_an_user_of_the_platform: "This account %{NAME} is already linked to an user of the platform." this_account_is_already_linked_to_an_user_of_the_platform: "This %{NAME} account is already linked to an user of the platform."
availabilities: availabilities:
# availability slots in the calendar # availability slots in the calendar