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

Making the translation neutral (no brands)

Browse Source 
changing calendar locale to English
This commit is contained in:
lpgn 2016-01-18 12:49:59 +00:00
parent fafb221608
commit b1095866b8
16 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/application.js
View File

@ -20,7 +20,7 @@
//= require jquery-ui/ui/jquery.ui.droppable
//= require jquery-ui/ui/jquery.ui.resizable
//= require angular
//= require angular-i18n/angular-locale_fr-fr.js
//= require angular-i18n/angular-locale_en-us.js
//= require angular-cookies
//= require angular-resource
//= require angular-sanitize
@ -59,4 +59,4 @@
//= require summernote/dist/summernote
//= require summernote/lang/summernote-fr-FR
//= require summernote/plugin/summernote-ext-video
//= require angular-summernote/dist/angular-summernote
//= require angular-summernote/dist/angular-summernote

2
app/assets/templates/admin/events/index.html.erb
View File

@ -7,7 +7,7 @@
</div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
<section class="heading-title">
<h1>Fablab XinFab courses and workshops</h1>
<h1>Fablab courses and workshops</h1>
</section>
</div>

4
app/assets/templates/events/_form.html.erb
View File

@ -187,7 +187,7 @@
<div class="col-sm-5">
<div class="input-group">
<input ng-model="event.amount" type="number" name="event[amount]" class="form-control" id="event_amount" required>
<div class="input-group-addon">¥</div>
<div class="input-group-addon"> $ </div>
</div>
<span class="help-block">0 = free</span>
</div>
@ -197,7 +197,7 @@
<div class="col-sm-5">
<div class="input-group">
<input ng-model="event.reduced_amount" type="number" name="event[reduced_amount]" class="form-control" id="event_reduced_amount">
<div class="input-group-addon">¥</div>
<div class="input-group-addon"> $ </div>
</div>
</div>
</div>

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

@ -7,7 +7,7 @@
</div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
<section class="heading-title">
<h1>Fablab XinFab courses and workshops</h1>
<h1>Fablab courses and workshops</h1>
</section>
</div>
@ -34,7 +34,7 @@
<h4 class="m-n text-sm clear l-n">{{event.title}}</h4>
<h3 class="m-n">{{event.start_date | amDateFormat:'DD/MM'}}<span class="text-sm font-thin"> au </span>{{event.end_date | amDateFormat:'DD/MM'}}</h3>
<h6 class="m-n" ng-if="event.amount">Full price: {{event.amount}}¥ <span ng-if="event.reduced_amount > 0">/Reduced price: {{event.reduced_amount}}¥</span></h6>
<h6 class="m-n" ng-if="event.amount">Full price: {{event.amount}} $ <span ng-if="event.reduced_amount > 0">/Reduced price: {{event.reduced_amount}} $ </span></h6>
</div>
<!-- Event Image -->
<div class="pull-right crop-130">

2
app/assets/templates/home.html.erb
View File

@ -104,7 +104,7 @@
<i class="fa fa-bookmark red col-xs-1 padder-icon"></i>
<h6 class="m-n col-xs-10">
<span ng-if="!event.nb_total_places">Free entry</span>
<span ng-if="event.nb_total_places && event.amount == 0">Free admission</span><span ng-if="event.amount > 0">{{event.amount}} ¥ Full price</span><span ng-if="event.reduced_amount > 0"><br/>{{event.reduced_amount}} ¥ Reduced price</span>
<span ng-if="event.nb_total_places && event.amount == 0">Free admission</span><span ng-if="event.amount > 0">{{event.amount}} $ Full price</span><span ng-if="event.reduced_amount > 0"><br/>{{event.reduced_amount}} $ Reduced price</span>
<div ng-if="event.nb_free_places == 0"><span class="badge font-sbold bg-red">Event full.</span></div>
</h6>

2
app/assets/templates/machines/index.html.erb
View File

@ -7,7 +7,7 @@
</div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
<section class="heading-title">
<h1>FabLab XinFab's Machines</h1>
<h1>FabLab Machines</h1>
</section>
</div>

2
app/assets/templates/members/index.html.erb
View File

@ -7,7 +7,7 @@
</div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l">
<section class="heading-title">
<h1>Members of Fablab XinFab</h1>
<h1>Members of Fablab</h1>
</section>
</div>

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

@ -7,7 +7,7 @@
</div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l b-r-md">
<section class="heading-title">
<h1>XinFab's PROJECTS</h1>
<h1>Fab Lab PROJECTS</h1>
</section>
</div>

10
app/assets/templates/shared/about.html.erb
View File

@ -2,7 +2,7 @@
<div class="row padder">
<header class="about-picture">
<div class="col-sm-offset-2 col-md-offset-3 col-sm-10 col-md-8">
<h1 class="about-title text-u-c">Imagine, Make, <br>Share at Fablab XinFab</h1>
<h1 class="about-title text-u-c">Imagine, Make, <br>Share at Fablab</h1>
</div>
</header>
</div>
@ -15,14 +15,14 @@
</div>
<div class="col-sm-offset-0 col-md-offset-0 col-lg-offset-1 col-sm-4 col-md-4">
<h2 class="about-title-aside text-u-c">Fab Lab XinFab contacts</h2>
<h2 class="about-title-aside text-u-c">Fab Lab contacts</h2>
<dl>
<dt>Fab Lab Manager:</dt>
<dd>spacemanager@xinfab.com</dd>
<dd>spacemanager@fabmanager.com</dd>
<dt>Staff:</dt>
<dd>info@xinfab.com</dd>
<dd>info@fabmanager.com</dd>
<dt>Information:</dt>
<dd>info@xinfab.com</dd>
<dd>info@fabmanager.com</dd>
</dl>
</div>
</div>

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

@ -38,7 +38,7 @@
</div>
</div>
<p class="text-center font-sbold">
Aren't you registerd in Fablab XinFab?<br>
Aren't you registerd in Fablab?<br>
<a href="#" ng-click="openSignup($event)" class="text-u-l">Create an account</a></br>
</p>
</div>

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

@ -8,7 +8,7 @@
<ul class="nav navbar-nav hidden-xs">
<li>
<a href class="about-link font-sbold text-sm" ng-click="goabout = !goabout" ui-sref="app.public.about" ng-show="!goabout">
<span class="label label-danger rounded text-lg text-white m-r-sm font-ebold">?</span>About Fablab XinFab
<span class="label label-danger rounded text-lg text-white m-r-sm font-ebold">?</span>About Fablab
</a>
<a href class="about-link font-sbold text-sm" ng-click="goabout = !goabout" ui-sref="app.public.home" ng-show="goabout">
<span class="label label-danger label-icon rounded text-lg text-white m-r-sm font-ebold"><i class="fa fa-caret-up" ng-show="goabout"></i></span>Back

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

@ -116,7 +116,7 @@
<div class="form-group" ng-class="{'has-error': signupForm.is_allow_contact.$dirty && signupForm.is_allow_contact.$invalid}">
<div class="col-sm-12">
<input type="checkbox" name="is_allow_contact" ng-model="user.is_allow_contact" value="true"/> I authorize Fablab XinFab users registered on the site to contact me
<input type="checkbox" name="is_allow_contact" ng-model="user.is_allow_contact" value="true"/> I authorize Fablab users registered on the site to contact me
</div>
</div>

2
app/views/devise/registrations/new.html.erb
View File

@ -79,7 +79,7 @@
<div class="checkbox">
<label>
<%= f.check_box :cgu %> I have read and I accept the rules of the Fab Lab XinFab
<%= f.check_box :cgu %> I have read and I accept the rules of the Fab Lab
</label>
</div>
<button type="submit" class="btn btn-default">Sign in</button>

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

@ -31,8 +31,8 @@
</tr>
<tr>
<td>
<p>See you soon on<a href="<%= root_url %>" style="color:#D92227">at FabLab XinFab</a>.</p>
<p>Cordially,<br>L&#39;FabLab XinFab team.</p>
<p>See you soon on<a href="<%= root_url %>" style="color:#D92227">at FabLab</a>.</p>
<p>Cordially,<br>L&#39;FabLab team.</p>
</td>
</tr>
<tr>

4
app/views/users_mailer/notify_member_account_is_created.html.erb
View File

@ -1,10 +1,10 @@
<p>Hi <%= @user.profile.full_name %>, </p>
<p>The FabLab team has created an account on www.xinfab.com. <%= link_to 'www.xinfab.com', root_url %> <br> Here is your connection settings : </p>
<p>The FabLab team has created an account on www.fabmanager.com. <%= link_to 'www.fabmanager.com', root_url %> <br> Here is your connection settings : </p>
<p>Username : <b><%= @user.email %></b></p>
<p>Password : <b><%= @generated_password %></b></p>
<p>This password is temporary, you can change it by accessing the "My Account". With this account, you retain all the benefits of course related to your user profile Fab Lab (subscription, training).</p>
<p>The team Fablab XinFab.</p>
<p>The team Fablab.</p>

4
db/seeds.rb
View File

@ -12,8 +12,8 @@ if Group.count == 0
])
end
if User.find_by(email: "admin@xinfab.com").nil?
admin = User.new(username: 'admin', email: 'admin@xinfab.com', password: 'adminadmin', password_confirmation: 'adminadmin', group_id: Group.first.id,
if User.find_by(email: "admin@fabmanager.com").nil?
admin = User.new(username: 'admin', email: 'admin@fabmanager.com', password: 'adminadmin', password_confirmation: 'adminadmin', group_id: Group.first.id,
profile_attributes: {first_name: 'Admin', last_name: 'Admin', gender: true, phone: '0000000000', birthday: Time.now})
#admin.skip_confirmation!
admin.add_role "admin"