Removing code of #2995 mistakenly included in #6087.

pull/7517/head
Lindoélio Lázaro 9 years ago
parent e309670706
commit 9635a06084
  1. 5
      packages/rocketchat-i18n/i18n/en.i18n.json
  2. 5
      packages/rocketchat-i18n/i18n/pt-BR.i18n.json
  3. 5
      packages/rocketchat-i18n/i18n/pt.i18n.json
  4. 22
      packages/rocketchat-lib/server/startup/settings.js

@ -106,11 +106,6 @@
"Accounts_PasswordReset": "Password Reset",
"Accounts_OAuth_Proxy_host": "Proxy Host",
"Accounts_OAuth_Proxy_services": "Proxy Services",
"Accounts_ReceivePasswordChangeLog": "Receive password change log by email",
"Accounts_ReceivePasswordChangeLog_Dismiss": "Disabled",
"Accounts_ReceivePasswordChangeLog_Immediately": "Immediately with each change",
"Accounts_ReceivePasswordChangeLog_Daily": "Daily summary",
"Accounts_ReceivePasswordChangeLog_Weekly": "Weekly summary",
"Accounts_Registration_AuthenticationServices_Default_Roles": "Default Roles for Authentication Services",
"Accounts_Registration_AuthenticationServices_Default_Roles_Description": "Default roles (comma-separated) users will be given when registering through authentication services",
"Accounts_Registration_AuthenticationServices_Enabled": "Registration with Authentication Services",

@ -94,11 +94,6 @@
"Accounts_OAuth_Wordpress_id": "WordPress ID",
"Accounts_OAuth_Wordpress_secret": "WordPress Secret",
"Accounts_PasswordReset": "Resetar senha",
"Accounts_ReceivePasswordChangeLog": "Receber log das alterações de senha por e-mail",
"Accounts_ReceivePasswordChangeLog_Dismiss": "Desativado",
"Accounts_ReceivePasswordChangeLog_Immediately": "Imediatamente a cada alteração",
"Accounts_ReceivePasswordChangeLog_Daily": "Resumo diário",
"Accounts_ReceivePasswordChangeLog_Weekly": "Resumo semanal",
"Accounts_Registration_AuthenticationServices_Enabled": "Registro com os Serviços de Autenticação",
"Accounts_RegistrationForm": "Formulário de Registro",
"Accounts_RegistrationForm_Disabled": "Desativado",

@ -102,11 +102,6 @@
"Accounts_PasswordReset": "Resetar senha",
"Accounts_OAuth_Proxy_host": "Host de Proxy",
"Accounts_OAuth_Proxy_services": "Serviços de Proxy",
"Accounts_ReceivePasswordChangeLog": "Receber log das alterações de senha por e-mail",
"Accounts_ReceivePasswordChangeLog_Dismiss": "Desativado",
"Accounts_ReceivePasswordChangeLog_Immediately": "Imediatamente a cada alteração",
"Accounts_ReceivePasswordChangeLog_Daily": "Resumo diário",
"Accounts_ReceivePasswordChangeLog_Weekly": "Resumo semanal",
"Accounts_Registration_AuthenticationServices_Enabled": "Registro com os Serviços de Autenticação",
"Accounts_RegistrationForm": "Formulário de Registro",
"Accounts_RegistrationForm_Disabled": "Desativado",

@ -70,27 +70,7 @@ RocketChat.settings.addGroup('Accounts', function() {
type: 'boolean',
'public': true
});
// TODO: Implementing #2995
this.add('Accounts_ReceivePasswordChangeLog', '', {
type: 'select',
'public': true,
values: [
{
key: '',
i18nLabel: 'Accounts_ReceivePasswordChangeLog_Dismiss'
}, {
key: 'immediately',
i18nLabel: 'Accounts_ReceivePasswordChangeLog_Immediately'
}, {
key: 'daily',
i18nLabel: 'Accounts_ReceivePasswordChangeLog_Daily'
}, {
key: 'weekly',
i18nLabel: 'Accounts_ReceivePasswordChangeLog_Weekly'
}
]
});
// TODO: #2995
this.section('Registration', function() {
this.add('Accounts_DefaultUsernamePrefixSuggestion', 'user', {
type: 'string'

Loading…
Cancel
Save