rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-03-14 11:29:15 +01:00
Code Issues Releases Activity

I guess I am still finding files to translate.

Browse Source
This commit is contained in:
lpgn 2016-01-19 15:45:38 +00:00
parent 432fc1e60c
commit 112a571b40
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/templates/dashboard/projects.html.erb
View File

@ -27,7 +27,7 @@
<div class="widget-content no-bg wrapper text-black-light">
<!-- TODO -->
<!-- <div class="text-sm font-sbold "><i>By {{project.author.first_name}}</i></div>
<small class="text-xs m-b"><i>posté le {{project.created_at | amDateFormat: 'Do MMMM YYYY'}}</i></small> -->
<small class="text-xs m-b"><i>posted on {{project.created_at | amDateFormat: 'Do MMMM YYYY'}}</i></small> -->
<div ng-bind-html="project.description | humanize : 180 | toTrusted"></div>
</div>
</div>

2
app/assets/templates/events/show.html.erb
View File

@ -68,7 +68,7 @@
<dt><i class="fa fa-calendar"></i> Dates :</dt>
<dd>Start: <span class="text-u-l">{{event.start_date | amDateFormat:'DD/MM/YYYY'}}</span><br>Ends: <span class="text-u-l">{{event.end_date | amDateFormat:'DD/MM/YYYY'}}</span></dd>
<dt><i class="fa fa-clock-o"></i> Hours :</dt>
<dd ng-if="event.all_day == 'true'"><span>Toute la journée</span></dd>
<dd ng-if="event.all_day == 'true'"><span>All day</span></dd>
<dd ng-if="event.all_day == 'false'">From <span class="text-u-l">{{event.start_date | amDateFormat:'HH:mm'}}</span> to <span class="text-u-l">{{event.end_date | amDateFormat:'HH:mm'}}</span></dd>
</dl>

2
app/assets/templates/projects/_form.html.erb
View File

@ -159,7 +159,7 @@
<h3>Licences Creative Commons</h3>
</div>
<div class="widget-content no-bg wrapper">
<%# TODO: Bug concerne qu'on ne peut pas déselectionner un option %>
<%# TODO: Bug concerns that you can not select an option %>
<select ng-model="project.licence_id" class="form-control" name="project[licence_id]" ui-select2>
<option value="{{l.id}}" ng-repeat="l in licences">{{l.name}}</option>
</select>

4
app/assets/templates/projects/index.html.erb
View File

@ -73,10 +73,10 @@
<div class="box-footer">
<div class="btn-group">
<div class="btn btn-default" ui-sref="app.logged.projects_edit({id:project.id})" ng-if="projectEditableBy(currentUser) || isAuthorized('admin')">
<i class="fa fa-edit"></i> Éditer
<i class="fa fa-edit"></i> Edit
</div>
<div class="btn btn-default" ng-click="showProject(project)">
<i class="fa fa-eye"></i> Consulter
<i class="fa fa-eye"></i> Consult
</div>
</div>

2
app/assets/templates/shared/_member_select.html.erb
View File

@ -1,6 +1,6 @@
<div class="widget panel b-a m">
<div class="panel-heading b-b small">
<h3 class="panel-title">Sélectionnez un membre</h3>
<h3 class="panel-title">Select a member</h3>
</div>
<div class="widget-content no-bg auto wrapper">
<select ng-model="ctrl.member_id" class="form-control form-control-ui-select" ui-select2 ng-change="updateMember()">

2
app/assets/templates/shared/header.html.erb
View File

@ -2,7 +2,7 @@
<div class="navbar-header">
<a ng-click="toggleNavSize($event)" class="btn btn-link visible-xs" data-toggle="class:nav-off-screen" data-target="#nav"><i class="fa fa-bars"></i></a>
<a ui-sref="app.public.home" class="navbar-brand" ng-click="goabout = false"><%= image_tag("fablab.png", class: 'm-r-sm') %>
<%= raw "<label class='label-staging label label-warning text-sm hidden-sm hidden-xs'>Démo</label>" if Rails.env.staging? %></a>
<%= raw "<label class='label-staging label label-warning text-sm hidden-sm hidden-xs'>Demo</label>" if Rails.env.staging? %></a>
</div>
<ul class="nav navbar-nav hidden-xs">

2
app/mailers/users_mailer.rb
View File

@ -2,6 +2,6 @@ class UsersMailer < BaseMailer
def notify_member_account_is_created(user, generated_password)
@user = user
@generated_password = generated_password
mail(to: @user.email, subject: "Votre compte Fab Lab a bien été créé.")
mail(to: @user.email, subject: "Your Fab Lab account has been created.")
end
end

8
app/views/devise/mailer/confirmation_instructions.html.erb
View File

@ -1,7 +1,7 @@
<p>Bonjour <%= @user.profile.full_name %> !</p>
<p>Hello <%= @user.profile.full_name %> !</p>
<p>Vous pouvez finaliser votre inscription en confirmant votre adresse mail en cliquant sur le lien suivant :</p>
<p>You can complete your registration by confirming your email address by clicking on the following link :</p>
<p><%= link_to 'Confirmer mon e-mail !', confirmation_url(@resource, confirmation_token: @token) %></p>
<p><%= link_to 'Confirm my email !', confirmation_url(@resource, confirmation_token: @token) %></p>
<p>L'équipe Fab Lab.</p>
<p>The Fablab team.</p>

4
app/views/notifications_mailer/notify_admin_when_user_is_created.html.erb
View File

@ -1,3 +1,3 @@
<p>Bonjour,</p>
<p>Hello,</p>
<p>Un nouveau compte utilisateur vient d'être créé sur la plateforme : "<%= @attached_object.profile.full_name %> &lt;<%= @attached_object.email%>&gt;"</p>
<p>A user account just created on the platform : "<%= @attached_object.profile.full_name %> &lt;<%= @attached_object.email%>&gt;"</p>