From fafac3b4128a0993b0de1c6e8ca3062bf1ccc14e Mon Sep 17 00:00:00 2001 From: Roald de Vries Date: Thu, 8 Dec 2016 16:59:09 +0100 Subject: Revert "[#801] Merge branch 'signup'" This reverts commit d10f607a4d40587510b0dc31b31fe4750bf4a3a3, reversing changes made to c28abba2f5b1186c671ebef508d40ffaae6d5bc5. --- web-ui/app/js/views/i18n.js | 62 +++++++++++++++++++ web-ui/app/js/views/recipientListFormatter.js | 33 +++++++++++ web-ui/app/js/views/templates.js | 85 +++++++++++++++++++++++++++ 3 files changed, 180 insertions(+) create mode 100644 web-ui/app/js/views/i18n.js create mode 100644 web-ui/app/js/views/recipientListFormatter.js create mode 100644 web-ui/app/js/views/templates.js (limited to 'web-ui/app/js/views') diff --git a/web-ui/app/js/views/i18n.js b/web-ui/app/js/views/i18n.js new file mode 100644 index 00000000..29a1beca --- /dev/null +++ b/web-ui/app/js/views/i18n.js @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2014 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see . + */ +define(['i18next', + 'i18nextXHRBackend', + 'i18nextBrowserLanguageDetector'], +function(i18n, i18n_backend, I18n_detector) { + 'use strict'; + + var detector = new I18n_detector(); + var detect = detector.detect.bind(detector); + + detector.detect = function(detectionOrder) { + var result = detect(detectionOrder); + return result.replace('-', '_'); + }; + + function t(i18n_key, options) { + var result = i18n.t(i18n_key, options); + var safe_string = new Handlebars.SafeString(result); + return safe_string.string; + } + + function loaded(callback) { + i18n.on('loaded', function(loaded) { + callback(); + }); + } + + function init(path) { + i18n + .use(i18n_backend) + .use(detector) + .init({ + fallbackLng: 'en_US', + backend: { + loadPath: path + 'locales/{{lng}}/{{ns}}.json' + } + }); + // Handlebars.registerHelper('t', self.bind(self)); + Handlebars.registerHelper('t', t); + } + + return { + t: t, + init: init, + loaded: loaded + }; +}); diff --git a/web-ui/app/js/views/recipientListFormatter.js b/web-ui/app/js/views/recipientListFormatter.js new file mode 100644 index 00000000..0b887142 --- /dev/null +++ b/web-ui/app/js/views/recipientListFormatter.js @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2014 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see . + */ + +define(function() { + 'use strict'; + Handlebars.registerHelper('formatRecipients', function (header) { + function wrapWith(begin, end) { + return function (x) { + return begin + Handlebars.Utils.escapeExpression(x) + end; + }; + } + + var to = _.map(header.to, wrapWith('', '')); + var cc = _.map(header.cc, wrapWith('cc: ', '')); + var bcc = _.map(header.bcc, wrapWith('bcc: ', '')); + + return new Handlebars.SafeString(to.concat(cc, bcc).join(', ')); + }); +}); diff --git a/web-ui/app/js/views/templates.js b/web-ui/app/js/views/templates.js new file mode 100644 index 00000000..d4185471 --- /dev/null +++ b/web-ui/app/js/views/templates.js @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2014 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see . + */ + +define(['hbs/templates'], function (templates) { + 'use strict'; + + var Templates = { + compose: { + box: window.Pixelated['app/templates/compose/compose_box.hbs'], + inlineBox: window.Pixelated['app/templates/compose/inline_box.hbs'], + replySection: window.Pixelated['app/templates/compose/reply_section.hbs'], + recipientInput: window.Pixelated['app/templates/compose/recipient_input.hbs'], + fixedRecipient: window.Pixelated['app/templates/compose/fixed_recipient.hbs'], + recipients: window.Pixelated['app/templates/compose/recipients.hbs'], + feedback: window.Pixelated['app/templates/compose/feedback_box.hbs'], + attachmentsList: window.Pixelated['app/templates/compose/attachments_list.hbs'], + attachmentItem: window.Pixelated['app/templates/compose/attachment_item.hbs'], + attachmentUploadItem: window.Pixelated['app/templates/compose/attachment_upload_item.hbs'], + uploadAttachmentFailed: window.Pixelated['app/templates/compose/upload_attachment_failed.hbs'] + }, + tags: { + tagList: window.Pixelated['app/templates/tags/tag_list.hbs'], + tag: window.Pixelated['app/templates/tags/tag.hbs'], + tagInner: window.Pixelated['app/templates/tags/tag_inner.hbs'], + shortcut: window.Pixelated['app/templates/tags/shortcut.hbs'] + }, + userAlerts: { + message: window.Pixelated['app/templates/user_alerts/message.hbs'] + }, + mails: { + single: window.Pixelated['app/templates/mails/single.hbs'], + fullView: window.Pixelated['app/templates/mails/full_view.hbs'], + mailActions: window.Pixelated['app/templates/mails/mail_actions.hbs'], + draft: window.Pixelated['app/templates/mails/draft.hbs'], + sent: window.Pixelated['app/templates/mails/sent.hbs'], + trash: window.Pixelated['app/templates/mails/trash.hbs'] + }, + mailActions: { + actionsBox: window.Pixelated['app/templates/mail_actions/actions_box.hbs'], + trashActionsBox: window.Pixelated['app/templates/mail_actions/trash_actions_box.hbs'], + composeTrigger: window.Pixelated['app/templates/mail_actions/compose_trigger.hbs'], + refreshTrigger: window.Pixelated['app/templates/mail_actions/refresh_trigger.hbs'], + paginationTrigger: window.Pixelated['app/templates/mail_actions/pagination_trigger.hbs'] + }, + noMessageSelected: window.Pixelated['app/templates/compose/no_message_selected.hbs'], + noMailsAvailable: window.Pixelated['app/templates/compose/no_mails_available.hbs'], + search: { + trigger: window.Pixelated['app/templates/search/search_trigger.hbs'] + }, + page: { + userSettingsIcon: window.Pixelated['app/templates/page/user_settings_icon.hbs'], + userSettingsBox: window.Pixelated['app/templates/page/user_settings_box.hbs'], + logout: window.Pixelated['app/templates/page/logout.hbs'], + logoutShortcut: window.Pixelated['app/templates/page/logout_shortcut.hbs'], + version: window.Pixelated['app/templates/page/version.hbs'] + }, + feedback: { + feedback: window.Pixelated['app/templates/feedback/feedback_trigger.hbs'] + } + }; + + Handlebars.registerPartial('tag_inner', Templates.tags.tagInner); + Handlebars.registerPartial('recipients', Templates.compose.recipients); + Handlebars.registerPartial('attachments_list', Templates.compose.attachmentsList); + Handlebars.registerPartial('attachments_upload', Templates.compose.attachmentsList); + Handlebars.registerPartial('attachment_item', Templates.compose.attachmentItem); + Handlebars.registerPartial('attachment_upload_item', Templates.compose.attachmentUploadItem); + Handlebars.registerPartial('uploadAttachmentFailed', Templates.compose.uploadAttachmentFailed); + + return Templates; +}); -- cgit v1.2.3