Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit ef7abc8

Browse files
DanielBriertonWardormeur
authored andcommitted
Use cp-translations for i18n (#247)
* Make service actually use cp-translations * Use cp-translations for messages.po * Removed unused email templates * Removed unused messages.po file * Updated circle.yml to build cp-translations in pre step * Update to NPM 2.x
1 parent b198624 commit ef7abc8

File tree

15 files changed

+9
-4064
lines changed

15 files changed

+9
-4064
lines changed

circle.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ machine:
55
LANG: en_US.utf8
66
dependencies:
77
pre:
8-
- if [ "$CIRCLE_BRANCH" = "master" ]; then gem install mime-types -v 2.6.2; fi
9-
- if [ "$CIRCLE_BRANCH" = "master" ]; then gem install rest-client -v 1.8; fi
10-
- if [ "$CIRCLE_BRANCH" = "master" ]; then gem install crowdin-cli -v 0.5.5; fi
11-
- if [ "$CIRCLE_BRANCH" = "master" ]; then crowdin-cli upload sources; fi
12-
- if [ "$CIRCLE_BRANCH" = "master" ]; then for lang in it pt-PT de nl ro mt sl sk fr uk es-ES es-AR el pl et bg tr ja hi lt; do crowdin-cli download -l $lang; done; fi
8+
- npm -g install npm@latest-2
9+
- if [ "$CIRCLE_BRANCH" = "master" ]; then cd ~/ && git clone [email protected]:CoderDojo/cp-translations.git && cd cp-translations && ./build.sh; fi
1310
override:
1411
- npm install
1512
test:

config/config.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'use strict';
22
var path = require('path');
3+
var CpTranslations = require('cp-translations');
34

45
var generator = require('xoauth2').createXOAuth2Generator({
56
user: process.env.GMAIL_USER,
@@ -31,7 +32,7 @@ module.exports = function (options) {
3132
sendFrom: 'The CoderDojo Team <[email protected]>'
3233
},
3334
mailtrap: {
34-
folder: path.resolve(__dirname + '/../email-templates'),
35+
folder: path.resolve(CpTranslations.getEmailTemplatePath()),
3536
mail: {
3637
3738
},
@@ -45,7 +46,7 @@ module.exports = function (options) {
4546
}
4647
},
4748
gmail: {
48-
folder: path.resolve(__dirname + '/../email-templates'),
49+
folder: path.resolve(CpTranslations.getEmailTemplatePath()),
4950
config: {
5051
service: 'gmail',
5152
auth: {

email-notifications.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict';
22

33
var fs = require('fs');
4-
var path = require('path');
4+
var CpTranslations = require('cp-translations');
55
var I18NHelper = require('cp-i18n-lib');
66
var i18nHelper = new I18NHelper({
7-
poFilePath: path.resolve('web/locale/'),
7+
poFilePath: CpTranslations.getPoFilePath(),
88
poFileName: 'messages.po',
99
domain: 'coder-dojo-platform'
1010
});
@@ -25,7 +25,7 @@ module.exports = function (options) {
2525
var subjectTranslation;
2626
if (options.sendemail) {
2727
var emailCode = args.code + args.locality;
28-
if (!fs.existsSync(path.join(__dirname, '/email-templates/', emailCode))) emailCode = args.code + 'en_US';
28+
if (!fs.existsSync(CpTranslations.getEmailTemplatePath(emailCode))) emailCode = args.code + 'en_US';
2929
if (!args.to) return done(null, {ok: false, why: 'No recipient set.'});
3030

3131
subjectTranslation = i18nHelper.getClosestTranslation(args.locality, subject);

email-templates/auth-create-reset-en_US/users-auth-create-reset.html.ejs

Lines changed: 0 additions & 16 deletions
This file was deleted.

email-templates/auth-create-reset-en_US/users-auth-create-reset.text.ejs

Lines changed: 0 additions & 11 deletions
This file was deleted.

email-templates/auth-register-en_US/users-auth-register.html.ejs

Lines changed: 0 additions & 25 deletions
This file was deleted.

email-templates/auth-register-en_US/users-auth-register.text.ejs

Lines changed: 0 additions & 16 deletions
This file was deleted.

email-templates/common-en_US/footer.ejs

Lines changed: 0 additions & 133 deletions
This file was deleted.

0 commit comments

Comments
 (0)