common text for chatops and github

pull/1005/head
Lee Faus 10 years ago
parent ef13e7e00f
commit d716021dcc
  1. 8
      i18n/de.i18n.json
  2. 8
      i18n/en.i18n.json
  3. 2
      packages/rocketchat-chatops/server/settings.coffee
  4. 1
      packages/rocketchat-github-enterprise/i18n/en.i18n.json
  5. 9
      packages/rocketchat-github-enterprise/startup.coffee

@ -7,9 +7,9 @@
"Accounts_OAuth_Facebook" : "Facebook Login",
"Accounts_OAuth_Facebook_id" : "Facebook-App-ID",
"Accounts_OAuth_Facebook_secret" : "Facebook Secret",
"Accounts_OAuth_Github" : "GitHub Login",
"Accounts_OAuth_Github_id" : "GitHub Id",
"Accounts_OAuth_Github_secret" : "GitHub Secret",
"Accounts_OAuth_Github" : "OAuth Enabled",
"Accounts_OAuth_Github_id" : "Client ID",
"Accounts_OAuth_Github_secret" : "Client Secret",
"Accounts_OAuth_Google" : "Google Login",
"Accounts_OAuth_Google_id" : "Google Id",
"Accounts_OAuth_Google_secret" : "Google Secret",
@ -363,4 +363,4 @@
"You_will_not_be_able_to_recover" : "Sie können es nicht wieder rückgängig machen!",
"Your_entry_has_been_deleted" : "Ihr Eintrag wurde gelöscht.",
"Your_Open_Source_solution" : "Deine eigene Open Source Chat Lösung"
}
}

@ -7,9 +7,9 @@
"Accounts_OAuth_Facebook" : "Facebook Login",
"Accounts_OAuth_Facebook_id" : "Facebook App Id",
"Accounts_OAuth_Facebook_secret" : "Facebook Secret",
"Accounts_OAuth_Github" : "GitHub Login",
"Accounts_OAuth_Github_id" : "GitHub Id",
"Accounts_OAuth_Github_secret" : "GitHub Secret",
"Accounts_OAuth_Github" : "OAuth Enabled",
"Accounts_OAuth_Github_id" : "Client ID",
"Accounts_OAuth_Github_secret" : "Client Secret",
"Accounts_OAuth_Google" : "Google Login",
"Accounts_OAuth_Google_id" : "Google Id",
"Accounts_OAuth_Google_secret" : "Google Secret",
@ -382,4 +382,4 @@
"You_will_not_be_able_to_recover" : "You will not be able to recover!",
"Your_entry_has_been_deleted" : "Your entry has been deleted.",
"Your_Open_Source_solution" : "Your own Open Source chat solution"
}
}

@ -1,2 +1,2 @@
Meteor.startup ->
RocketChat.settings.add 'Chatops_Enabled', false, { type: 'boolean', group: 'General', public: true, i18nLabel: "rocketchat-chatops:Chatops_Enabled" }
RocketChat.settings.add 'Chatops_Enabled', false, { type: 'boolean', group: 'General', public: true, i18nLabel: "ChatOps Enabled" }

@ -1,4 +1,5 @@
{
"Accounts_OAuth_GitHub_Enterprise" : "GitHub Enterprise OAuth",
"API_GitHub_Enterprise_URL" : "GitHub Enterprise Server URL",
"Accounts_OAuth_GitHub_Enterprise_id" : "GitHub OAuth Client Id",
"Accounts_OAuth_GitHub_Enterprise_secret" : "GitHub OAuth Client Secret"

@ -1,5 +1,6 @@
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise', false, {type: 'boolean', group: 'Accounts', section: 'GitHub Enterprise'}
RocketChat.settings.add 'API_GitHub_Enterprise_URL', '', { type: 'string', group: 'Accounts', public: true, section: 'GitHub Enterprise', i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_URL' }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_id' }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'rocketchat-github-enterprise:API_GitHub_Enterprise_secret' }
Meteor.startup ->
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise', false, {type: 'boolean', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'OAuth Enabled'}
RocketChat.settings.add 'API_GitHub_Enterprise_URL', '', { type: 'string', group: 'Accounts', public: true, section: 'GitHub Enterprise', i18nLabel: 'Server URL' }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'Client ID' }
RocketChat.settings.add 'Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', group: 'Accounts', section: 'GitHub Enterprise', i18nLabel: 'Client Secret' }

Loading…
Cancel
Save