From b1095866b8ac792de08f748e5e92086290e496f7 Mon Sep 17 00:00:00 2001 From: lpgn Date: Mon, 18 Jan 2016 12:49:59 +0000 Subject: [PATCH] Making the translation neutral (no brands) changing calendar locale to English --- app/assets/javascripts/application.js | 4 ++-- app/assets/templates/admin/events/index.html.erb | 2 +- app/assets/templates/events/_form.html.erb | 4 ++-- app/assets/templates/events/index.html.erb | 4 ++-- app/assets/templates/home.html.erb | 2 +- app/assets/templates/machines/index.html.erb | 2 +- app/assets/templates/members/index.html.erb | 2 +- app/assets/templates/projects/index.html.erb | 2 +- app/assets/templates/shared/about.html.erb | 10 +++++----- app/assets/templates/shared/deviseModal.html.erb | 2 +- app/assets/templates/shared/header.html.erb | 2 +- app/assets/templates/shared/signupModal.html.erb | 2 +- app/views/devise/registrations/new.html.erb | 2 +- app/views/layouts/notifications_mailer.html.erb | 4 ++-- .../notify_member_account_is_created.html.erb | 4 ++-- db/seeds.rb | 4 ++-- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 2a275ace3..490af3904 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -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 \ No newline at end of file diff --git a/app/assets/templates/admin/events/index.html.erb b/app/assets/templates/admin/events/index.html.erb index 2cca311c3..9b4972168 100644 --- a/app/assets/templates/admin/events/index.html.erb +++ b/app/assets/templates/admin/events/index.html.erb @@ -7,7 +7,7 @@
-

Fablab XinFab courses and workshops

+

Fablab courses and workshops

diff --git a/app/assets/templates/events/_form.html.erb b/app/assets/templates/events/_form.html.erb index 1cb25561d..aeed2ad14 100644 --- a/app/assets/templates/events/_form.html.erb +++ b/app/assets/templates/events/_form.html.erb @@ -187,7 +187,7 @@
-
¥
+
$
0 = free
@@ -197,7 +197,7 @@
-
¥
+
$
diff --git a/app/assets/templates/events/index.html.erb b/app/assets/templates/events/index.html.erb index ee2b2e7ef..5df889c61 100644 --- a/app/assets/templates/events/index.html.erb +++ b/app/assets/templates/events/index.html.erb @@ -7,7 +7,7 @@
-

Fablab XinFab courses and workshops

+

Fablab courses and workshops

@@ -34,7 +34,7 @@

{{event.title}}

{{event.start_date | amDateFormat:'DD/MM'}} au {{event.end_date | amDateFormat:'DD/MM'}}

-
Full price: {{event.amount}}¥ /Reduced price: {{event.reduced_amount}}¥
+
Full price: {{event.amount}} $ /Reduced price: {{event.reduced_amount}} $
diff --git a/app/assets/templates/home.html.erb b/app/assets/templates/home.html.erb index 03b8409b7..acae466a7 100644 --- a/app/assets/templates/home.html.erb +++ b/app/assets/templates/home.html.erb @@ -104,7 +104,7 @@
Free entry - Free admission{{event.amount}} ¥ Full price
{{event.reduced_amount}} ¥ Reduced price + Free admission{{event.amount}} $ Full price
{{event.reduced_amount}} $ Reduced price
Event full.
diff --git a/app/assets/templates/machines/index.html.erb b/app/assets/templates/machines/index.html.erb index c553a5f12..b1022393d 100644 --- a/app/assets/templates/machines/index.html.erb +++ b/app/assets/templates/machines/index.html.erb @@ -7,7 +7,7 @@
-

FabLab XinFab's Machines

+

FabLab Machines

diff --git a/app/assets/templates/members/index.html.erb b/app/assets/templates/members/index.html.erb index 22ecaa199..6ab04aba2 100644 --- a/app/assets/templates/members/index.html.erb +++ b/app/assets/templates/members/index.html.erb @@ -7,7 +7,7 @@
-

Members of Fablab XinFab

+

Members of Fablab

diff --git a/app/assets/templates/projects/index.html.erb b/app/assets/templates/projects/index.html.erb index 9c0e4c114..27bcff5e1 100644 --- a/app/assets/templates/projects/index.html.erb +++ b/app/assets/templates/projects/index.html.erb @@ -7,7 +7,7 @@
-

XinFab's PROJECTS

+

Fab Lab PROJECTS

diff --git a/app/assets/templates/shared/about.html.erb b/app/assets/templates/shared/about.html.erb index c7fbb7db4..0e52f4179 100644 --- a/app/assets/templates/shared/about.html.erb +++ b/app/assets/templates/shared/about.html.erb @@ -2,7 +2,7 @@
-

Imagine, Make,
Share at Fablab XinFab

+

Imagine, Make,
Share at Fablab

@@ -15,14 +15,14 @@
-

Fab Lab XinFab contacts

+

Fab Lab contacts

Fab Lab Manager:
-
spacemanager@xinfab.com
+
spacemanager@fabmanager.com
Staff:
-
info@xinfab.com
+
info@fabmanager.com
Information:
-
info@xinfab.com
+
info@fabmanager.com
diff --git a/app/assets/templates/shared/deviseModal.html.erb b/app/assets/templates/shared/deviseModal.html.erb index c0aba2765..b45264904 100644 --- a/app/assets/templates/shared/deviseModal.html.erb +++ b/app/assets/templates/shared/deviseModal.html.erb @@ -38,7 +38,7 @@

- Aren't you registerd in Fablab XinFab?
+ Aren't you registerd in Fablab?
Create an account

diff --git a/app/assets/templates/shared/header.html.erb b/app/assets/templates/shared/header.html.erb index 52ee0b98a..53387f8a8 100644 --- a/app/assets/templates/shared/header.html.erb +++ b/app/assets/templates/shared/header.html.erb @@ -8,7 +8,7 @@