From a4cb46e92ea45d1fdefb72e3e74ac2f3a10fcecd Mon Sep 17 00:00:00 2001 From: abhima9yu Date: Wed, 7 Mar 2018 10:28:26 +0530 Subject: [PATCH 1/2] package now depends on T9n npm module --- lib/templates_helpers/at_error.js | 2 ++ lib/templates_helpers/at_input.js | 2 ++ lib/templates_helpers/at_message.js | 4 +++- lib/templates_helpers/at_nav_button.js | 2 ++ lib/templates_helpers/at_pwd_form.js | 2 ++ lib/templates_helpers/at_pwd_form_btn.js | 2 ++ lib/templates_helpers/at_pwd_link.js | 4 +++- lib/templates_helpers/at_reCaptcha.js | 2 ++ lib/templates_helpers/at_resend_verification_email_link.js | 4 +++- lib/templates_helpers/at_result.js | 4 +++- lib/templates_helpers/at_sep.js | 4 +++- lib/templates_helpers/at_signin_link.js | 2 ++ lib/templates_helpers/at_signup_link.js | 2 ++ lib/templates_helpers/at_social.js | 2 ++ lib/templates_helpers/at_terms_link.js | 4 +++- lib/templates_helpers/at_title.js | 2 ++ package.js | 2 +- 17 files changed, 39 insertions(+), 7 deletions(-) diff --git a/lib/templates_helpers/at_error.js b/lib/templates_helpers/at_error.js index 5673dfe..66f6c67 100644 --- a/lib/templates_helpers/at_error.js +++ b/lib/templates_helpers/at_error.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atErrorHelpers = { singleError: function() { var errors = AccountsTemplates.state.form.get("error"); diff --git a/lib/templates_helpers/at_input.js b/lib/templates_helpers/at_input.js index fe74eeb..5cb5587 100644 --- a/lib/templates_helpers/at_input.js +++ b/lib/templates_helpers/at_input.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atInputRendered = [function(){ var fieldId = this.data._id; diff --git a/lib/templates_helpers/at_message.js b/lib/templates_helpers/at_message.js index baa9ca0..6921b25 100644 --- a/lib/templates_helpers/at_message.js +++ b/lib/templates_helpers/at_message.js @@ -1,7 +1,9 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atMessageHelpers = { message: function() { var messageText = AccountsTemplates.state.form.get("message"); if (messageText) return T9n.get(messageText, markIfMissing=false); }, -}; \ No newline at end of file +}; diff --git a/lib/templates_helpers/at_nav_button.js b/lib/templates_helpers/at_nav_button.js index c434060..11ec42c 100644 --- a/lib/templates_helpers/at_nav_button.js +++ b/lib/templates_helpers/at_nav_button.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atNavButtonHelpers = { text: function(){ var key = Meteor.userId() ? AccountsTemplates.texts.navSignOut : AccountsTemplates.texts.navSignIn; diff --git a/lib/templates_helpers/at_pwd_form.js b/lib/templates_helpers/at_pwd_form.js index 2f8d53c..a24d6b2 100644 --- a/lib/templates_helpers/at_pwd_form.js +++ b/lib/templates_helpers/at_pwd_form.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atPwdFormHelpers = { disabled: function() { return AccountsTemplates.disabled(); diff --git a/lib/templates_helpers/at_pwd_form_btn.js b/lib/templates_helpers/at_pwd_form_btn.js index fc26362..04b1c08 100644 --- a/lib/templates_helpers/at_pwd_form_btn.js +++ b/lib/templates_helpers/at_pwd_form_btn.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atPwdFormBtnHelpers = { submitDisabled: function(){ var disable = _.chain(AccountsTemplates.getFields()) diff --git a/lib/templates_helpers/at_pwd_link.js b/lib/templates_helpers/at_pwd_link.js index dd93a39..a65f439 100644 --- a/lib/templates_helpers/at_pwd_link.js +++ b/lib/templates_helpers/at_pwd_link.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atPwdLinkHelpers = { disabled: function() { return AccountsTemplates.disabled(); @@ -21,4 +23,4 @@ AT.prototype.atPwdLinkEvents = { event.preventDefault(); AccountsTemplates.linkClick("forgotPwd"); }, -}; \ No newline at end of file +}; diff --git a/lib/templates_helpers/at_reCaptcha.js b/lib/templates_helpers/at_reCaptcha.js index ea0c0c6..99b1a4c 100644 --- a/lib/templates_helpers/at_reCaptcha.js +++ b/lib/templates_helpers/at_reCaptcha.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atReCaptchaRendered = function() { $.getScript('//www.google.com/recaptcha/api.js?hl=' + T9n.getLanguage()); }; diff --git a/lib/templates_helpers/at_resend_verification_email_link.js b/lib/templates_helpers/at_resend_verification_email_link.js index 5587900..5a63076 100644 --- a/lib/templates_helpers/at_resend_verification_email_link.js +++ b/lib/templates_helpers/at_resend_verification_email_link.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atResendVerificationEmailLinkHelpers = { disabled: function () { return AccountsTemplates.disabled(); @@ -21,4 +23,4 @@ AT.prototype.atResendVerificationEmailLinkEvents = { event.preventDefault(); AccountsTemplates.linkClick('resendVerificationEmail'); }, -}; \ No newline at end of file +}; diff --git a/lib/templates_helpers/at_result.js b/lib/templates_helpers/at_result.js index d4b287d..7e97c39 100644 --- a/lib/templates_helpers/at_result.js +++ b/lib/templates_helpers/at_result.js @@ -1,7 +1,9 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atResultHelpers = { result: function() { var resultText = AccountsTemplates.state.form.get("result"); if (resultText) return T9n.get(resultText, markIfMissing=false); }, -}; \ No newline at end of file +}; diff --git a/lib/templates_helpers/at_sep.js b/lib/templates_helpers/at_sep.js index 7c27557..dde925d 100644 --- a/lib/templates_helpers/at_sep.js +++ b/lib/templates_helpers/at_sep.js @@ -1,5 +1,7 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atSepHelpers = { sepText: function(){ return T9n.get(AccountsTemplates.texts.sep, markIfMissing=false); }, -}; \ No newline at end of file +}; diff --git a/lib/templates_helpers/at_signin_link.js b/lib/templates_helpers/at_signin_link.js index 14f6e88..3655cd5 100644 --- a/lib/templates_helpers/at_signin_link.js +++ b/lib/templates_helpers/at_signin_link.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atSigninLinkHelpers = { disabled: function() { return AccountsTemplates.disabled(); diff --git a/lib/templates_helpers/at_signup_link.js b/lib/templates_helpers/at_signup_link.js index 29c809a..cde407f 100644 --- a/lib/templates_helpers/at_signup_link.js +++ b/lib/templates_helpers/at_signup_link.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atSignupLinkHelpers = { disabled: function() { return AccountsTemplates.disabled(); diff --git a/lib/templates_helpers/at_social.js b/lib/templates_helpers/at_social.js index 912fd6e..c07c6a7 100644 --- a/lib/templates_helpers/at_social.js +++ b/lib/templates_helpers/at_social.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atSocialHelpers = { disabled: function() { if (AccountsTemplates.disabled()) diff --git a/lib/templates_helpers/at_terms_link.js b/lib/templates_helpers/at_terms_link.js index 0ada35c..71c7666 100644 --- a/lib/templates_helpers/at_terms_link.js +++ b/lib/templates_helpers/at_terms_link.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atTermsLinkHelpers = { disabled: function() { return AccountsTemplates.disabled(); @@ -30,4 +32,4 @@ AT.prototype.atTermsLinkEvents = { if (AccountsTemplates.disabled()) event.preventDefault(); }, -}; \ No newline at end of file +}; diff --git a/lib/templates_helpers/at_title.js b/lib/templates_helpers/at_title.js index 74f711b..eb68a02 100644 --- a/lib/templates_helpers/at_title.js +++ b/lib/templates_helpers/at_title.js @@ -1,3 +1,5 @@ +T9n = (require('meteor-accounts-t9n')).T9n; + AT.prototype.atTitleHelpers = { title: function() { var parentData = Template.currentData(); diff --git a/package.js b/package.js index 079ab6e..1247400 100644 --- a/package.js +++ b/package.js @@ -15,6 +15,7 @@ Package.onUse(function(api) { 'check', 'underscore', 'reactive-var', + 'ecmascript@0.10.0' ], ['client', 'server']); api.use([ @@ -30,7 +31,6 @@ Package.onUse(function(api) { api.imply([ 'accounts-base', - 'softwarerero:accounts-t9n@1.3.3', ], ['client', 'server']); api.imply([ From 74a4e48ef11d8b78bffa4d8e6f8a669a39d465a1 Mon Sep 17 00:00:00 2001 From: Ashish Agrawal Date: Tue, 12 Jun 2018 16:08:43 +0530 Subject: [PATCH 2/2] Fix for t9n not working --- lib/templates_helpers/at_error.js | 5 ++++- lib/templates_helpers/at_input.js | 5 ++++- lib/templates_helpers/at_message.js | 5 ++++- lib/templates_helpers/at_nav_button.js | 5 ++++- lib/templates_helpers/at_pwd_form.js | 5 ++++- lib/templates_helpers/at_pwd_form_btn.js | 5 ++++- lib/templates_helpers/at_pwd_link.js | 5 ++++- lib/templates_helpers/at_reCaptcha.js | 5 ++++- lib/templates_helpers/at_resend_verification_email_link.js | 5 ++++- lib/templates_helpers/at_result.js | 5 ++++- lib/templates_helpers/at_sep.js | 5 ++++- lib/templates_helpers/at_signin_link.js | 5 ++++- lib/templates_helpers/at_signup_link.js | 5 ++++- lib/templates_helpers/at_social.js | 5 ++++- lib/templates_helpers/at_terms_link.js | 5 ++++- lib/templates_helpers/at_title.js | 5 ++++- 16 files changed, 64 insertions(+), 16 deletions(-) diff --git a/lib/templates_helpers/at_error.js b/lib/templates_helpers/at_error.js index 66f6c67..9aeb045 100644 --- a/lib/templates_helpers/at_error.js +++ b/lib/templates_helpers/at_error.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atErrorHelpers = { singleError: function() { diff --git a/lib/templates_helpers/at_input.js b/lib/templates_helpers/at_input.js index 5cb5587..8b407e2 100644 --- a/lib/templates_helpers/at_input.js +++ b/lib/templates_helpers/at_input.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atInputRendered = [function(){ var fieldId = this.data._id; diff --git a/lib/templates_helpers/at_message.js b/lib/templates_helpers/at_message.js index 6921b25..e4192fb 100644 --- a/lib/templates_helpers/at_message.js +++ b/lib/templates_helpers/at_message.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atMessageHelpers = { message: function() { diff --git a/lib/templates_helpers/at_nav_button.js b/lib/templates_helpers/at_nav_button.js index 11ec42c..e5d142c 100644 --- a/lib/templates_helpers/at_nav_button.js +++ b/lib/templates_helpers/at_nav_button.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atNavButtonHelpers = { text: function(){ diff --git a/lib/templates_helpers/at_pwd_form.js b/lib/templates_helpers/at_pwd_form.js index a24d6b2..0e57f5c 100644 --- a/lib/templates_helpers/at_pwd_form.js +++ b/lib/templates_helpers/at_pwd_form.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atPwdFormHelpers = { disabled: function() { diff --git a/lib/templates_helpers/at_pwd_form_btn.js b/lib/templates_helpers/at_pwd_form_btn.js index 04b1c08..f4fd8ea 100644 --- a/lib/templates_helpers/at_pwd_form_btn.js +++ b/lib/templates_helpers/at_pwd_form_btn.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atPwdFormBtnHelpers = { submitDisabled: function(){ diff --git a/lib/templates_helpers/at_pwd_link.js b/lib/templates_helpers/at_pwd_link.js index a65f439..f3fc2fa 100644 --- a/lib/templates_helpers/at_pwd_link.js +++ b/lib/templates_helpers/at_pwd_link.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atPwdLinkHelpers = { disabled: function() { diff --git a/lib/templates_helpers/at_reCaptcha.js b/lib/templates_helpers/at_reCaptcha.js index 99b1a4c..0e9c880 100644 --- a/lib/templates_helpers/at_reCaptcha.js +++ b/lib/templates_helpers/at_reCaptcha.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atReCaptchaRendered = function() { $.getScript('//www.google.com/recaptcha/api.js?hl=' + T9n.getLanguage()); diff --git a/lib/templates_helpers/at_resend_verification_email_link.js b/lib/templates_helpers/at_resend_verification_email_link.js index 5a63076..161416e 100644 --- a/lib/templates_helpers/at_resend_verification_email_link.js +++ b/lib/templates_helpers/at_resend_verification_email_link.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atResendVerificationEmailLinkHelpers = { disabled: function () { diff --git a/lib/templates_helpers/at_result.js b/lib/templates_helpers/at_result.js index 7e97c39..6322dde 100644 --- a/lib/templates_helpers/at_result.js +++ b/lib/templates_helpers/at_result.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atResultHelpers = { result: function() { diff --git a/lib/templates_helpers/at_sep.js b/lib/templates_helpers/at_sep.js index dde925d..05dffac 100644 --- a/lib/templates_helpers/at_sep.js +++ b/lib/templates_helpers/at_sep.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atSepHelpers = { sepText: function(){ diff --git a/lib/templates_helpers/at_signin_link.js b/lib/templates_helpers/at_signin_link.js index 3655cd5..c24f79f 100644 --- a/lib/templates_helpers/at_signin_link.js +++ b/lib/templates_helpers/at_signin_link.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atSigninLinkHelpers = { disabled: function() { diff --git a/lib/templates_helpers/at_signup_link.js b/lib/templates_helpers/at_signup_link.js index cde407f..243e210 100644 --- a/lib/templates_helpers/at_signup_link.js +++ b/lib/templates_helpers/at_signup_link.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atSignupLinkHelpers = { disabled: function() { diff --git a/lib/templates_helpers/at_social.js b/lib/templates_helpers/at_social.js index c07c6a7..e7b7978 100644 --- a/lib/templates_helpers/at_social.js +++ b/lib/templates_helpers/at_social.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atSocialHelpers = { disabled: function() { diff --git a/lib/templates_helpers/at_terms_link.js b/lib/templates_helpers/at_terms_link.js index 71c7666..fdcc1c1 100644 --- a/lib/templates_helpers/at_terms_link.js +++ b/lib/templates_helpers/at_terms_link.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atTermsLinkHelpers = { disabled: function() { diff --git a/lib/templates_helpers/at_title.js b/lib/templates_helpers/at_title.js index eb68a02..54b9dfb 100644 --- a/lib/templates_helpers/at_title.js +++ b/lib/templates_helpers/at_title.js @@ -1,4 +1,7 @@ -T9n = (require('meteor-accounts-t9n')).T9n; +import { T9n } from 'meteor-accounts-t9n'; +T9n.setLanguage('en'); +import { en } from 'meteor-accounts-t9n/build/en'; +T9n.map("en", en); AT.prototype.atTitleHelpers = { title: function() {