settings to change placeholders in login form - closes #2204

i18n/en.i18n.json

@@ -426,6 +426,8 @@
   "Password_Change_Disabled" : "Your Rocket.Chat administrator has disabled the changing of passwords",
   "Password_changed_successfully" : "Password changed successfully",
   "People" : "People",
+  "Placeholder_for_email_or_username_login_field" : "Placeholder for email or username login field",
+  "Placeholder_for_password_login_field" : "Placeholder for password login field",
   "Please_enter_value_for_url" : "Please enter a value for the url of your avatar.",
   "Please_enter_your_new_password_below" : "Please enter your new password below:",
   "Please_wait" : "Please wait",

packages/rocketchat-lib/server/startup/settings.coffee

@@ -11,6 +11,8 @@ RocketChat.settings.addGroup 'Accounts', ->
 	@add 'Accounts_RequireNameForSignUp', true, { type: 'boolean', public: true }
 	@add 'Accounts_LoginExpiration', 90, { type: 'int', public: true }
 	@add 'Accounts_ShowFormLogin', true, { type: 'boolean', public: true }
+	@add 'Accounts_EmailOrUsernamePlaceholder', '', { type: 'string', public: true, i18nLabel: 'Placeholder_for_email_or_username_login_field' }
+	@add 'Accounts_PasswordPlaceholder', '', { type: 'string', public: true, i18nLabel: 'Placeholder_for_password_login_field' }
 
 	@section 'Registration', ->
 		@add 'Accounts_EmailVerification', false, { type: 'boolean', public: true }

packages/rocketchat-ui-login/login/form.coffee

@@ -61,6 +61,12 @@ Template.loginForm.helpers
 	passwordresetAllowed: ->
 		return RocketChat.settings.get 'Accounts_PasswordReset'
 
+	emailOrUsernamePlaceholder: ->
+		return RocketChat.settings.get('Accounts_EmailOrUsernamePlaceholder') or t("Email_or_username")
+
+	passwordPlaceholder: ->
+		return RocketChat.settings.get('Accounts_PasswordPlaceholder') or t("Password")
+
 Template.loginForm.events
 	'submit #login-card': (event, instance) ->
 		event.preventDefault()

packages/rocketchat-ui-login/login/form.html

@@ -24,13 +24,13 @@ <h2>{{{_ "Registration_Succeeded"}}}</h2>
 						<input type="text" name='name' placeholder='{{namePlaceholder}}' dir="auto" />
 					</div>
 					<div class='input-text active {{showEmailOrUsername}}'>
-						<input type="text" name='emailOrUsername' placeholder='{{_ "Email_or_username"}}' autocapitalize="off" autocorrect="off" />
+						<input type="text" name='emailOrUsername' placeholder='{{emailOrUsernamePlaceholder}}' autocapitalize="off" autocorrect="off" />
 					</div>
 					<div class='input-text active {{showEmail}}'>
 						<input type="email" name='email' placeholder='{{_ "Email"}}' />
 					</div>
 					<div class='input-text active {{showPassword}}'>
-						<input type="password" name='pass' placeholder='{{_ "Password"}}' />
+						<input type="password" name='pass' placeholder='{{passwordPlaceholder}}' />
 					</div>
 					<div class='input-text active {{showConfirmPassword}}'>
 						<input type="password" name='confirm-pass' placeholder='{{_ "Confirm_password"}}' />