Remove i18n in application and use custom oauth text

pull/5984/head
Aaron Ogle 8 years ago
parent 4ecbba7d30
commit 426ab280e0
  1. 6
      packages/rocketchat-dolphin/i18n/en.i18n.json
  2. 11
      packages/rocketchat-dolphin/package.js
  3. 8
      packages/rocketchat-dolphin/startup.coffee
  4. 3
      packages/rocketchat-i18n/i18n/en.i18n.json

@ -1,6 +0,0 @@
{
"API_Dolphin_URL" : "Dolphin URL",
"Accounts_OAuth_Dolphin" : "Dolphin Login",
"Accounts_OAuth_Dolphin_id" : "Dolphin Key",
"Accounts_OAuth_Dolphin_secret" : "Dolphin Secret"
}

@ -15,16 +15,5 @@ Package.onUse(function(api) {
api.addFiles('login-button.css', 'client');
api.addFiles('startup.coffee', 'server');
// TAPi18n
api.use('templating', 'client');
var _ = Npm.require('underscore');
var fs = Npm.require('fs');
var tapi18nFiles = _.compact(_.map(fs.readdirSync('packages/rocketchat-dolphin/i18n'), function(filename) {
if (fs.statSync('packages/rocketchat-dolphin/i18n/' + filename).size > 16) {
return 'i18n/' + filename;
}
}));
api.use('tap:i18n@1.6.1', ['client', 'server']);
api.imply('tap:i18n');
api.addFiles(tapi18nFiles, ['client', 'server']);
});

@ -1,7 +1,7 @@
RocketChat.settings.add 'API_Dolphin_URL', '', { type: 'string', group: 'OAuth', public: true, section: 'Dolphin' }
RocketChat.settings.add 'Accounts_OAuth_Dolphin', false, { type: 'boolean', group: 'OAuth', section: 'Dolphin' }
RocketChat.settings.add 'Accounts_OAuth_Dolphin_id', '', { type: 'string', group: 'OAuth', section: 'Dolphin' }
RocketChat.settings.add 'Accounts_OAuth_Dolphin_secret', '', { type: 'string', group: 'OAuth', section: 'Dolphin' }
RocketChat.settings.add 'API_Dolphin_URL', '', { type: 'string', group: 'OAuth', public: true, section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Dolphin_Url' }
RocketChat.settings.add 'Accounts_OAuth_Dolphin', false, { type: 'boolean', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Enable' }
RocketChat.settings.add 'Accounts_OAuth_Dolphin_id', '', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_id' }
RocketChat.settings.add 'Accounts_OAuth_Dolphin_secret', '', { type: 'string', group: 'OAuth', section: 'Dolphin', i18nLabel: 'Accounts_OAuth_Custom_Secret' }
RocketChat.settings.add 'Accounts_OAuth_Dolphin_login_style', 'redirect', { type: 'select' , group: 'OAuth', section: "Dolphin", i18nLabel: 'Accounts_OAuth_Custom_Login_Style', persistent: true, values: [ { key: 'redirect', i18nLabel: 'Redirect' }, { key: 'popup', i18nLabel: 'Popup' }, { key: '', i18nLabel: 'Default' } ] }
RocketChat.settings.add 'Accounts_OAuth_Dolphin_button_label_text', '', { type: 'string' , group: 'OAuth', section: "Dolphin", i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Text', persistent: true }
RocketChat.settings.add 'Accounts_OAuth_Dolphin_button_label_color', '#FFFFFF', { type: 'string' , group: 'OAuth', section: "Dolphin", i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true }

@ -62,6 +62,7 @@
"Accounts_OAuth_Custom_Token_Path": "Token Path",
"Accounts_OAuth_Custom_Token_Sent_Via": "Token Sent Via",
"Accounts_OAuth_Custom_Username_Field": "Username field",
"Accounts_OAuth_Dolphin_Url": "Dolphin URL",
"Accounts_OAuth_Facebook": "Facebook Login",
"Accounts_OAuth_Facebook_callback_url": "Facebook Callback URL",
"Accounts_OAuth_Facebook_id": "Facebook App Id",
@ -1576,4 +1577,4 @@
"your_message_optional": "your message (optional)",
"Your_password_is_wrong": "Your password is wrong!",
"Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
}
}

Loading…
Cancel
Save