From fb48bca8dd82eb3a94a2e11e7986e7cfb75c0a13 Mon Sep 17 00:00:00 2001
From: shridhar <shridhar.p@zerodha.com>
Date: Thu, 14 Sep 2017 12:15:58 +0530
Subject: [PATCH] Change place holder based on system settings

add place holder in login.py and then use in template
---
 frappe/www/login.html | 12 +-----------
 frappe/www/login.py   | 10 ++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frappe/www/login.html b/frappe/www/login.html
index 88650dfa99..8cfbfea25b 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -16,17 +16,7 @@
 			</div>
 
 			<input type="text" id="login_email"
-				class="form-control" placeholder="{{
-					_('Email address or Mobile number or Username')
-					if frappe.utils.cint(frappe.db.get_value('System Settings', 'System Settings', 'allow_login_using_mobile_number')) and frappe.utils.cint(frappe.db.get_value('System Settings', 'System Settings', 'allow_login_using_user_name'))
-					else (
-							_('Email address or Username')
-							if frappe.utils.cint(frappe.db.get_value('System Settings', 'System Settings', 'allow_login_using_user_name'))
-							else (
-								_('Email address or Mobile number')
-								if frappe.utils.cint(frappe.db.get_value('System Settings', 'System Settings', 'allow_login_using_mobile_number'))
-								else _('Email address'))
-						) }}"
+				class="form-control" placeholder="{{ login_name_placeholder  }}"
 				required autofocus>
 
 
diff --git a/frappe/www/login.py b/frappe/www/login.py
index 5002a44b35..99c80b92a5 100644
--- a/frappe/www/login.py
+++ b/frappe/www/login.py
@@ -31,6 +31,16 @@ def get_context(context):
 	ldap_settings = get_ldap_settings()
 	context["ldap_settings"] = ldap_settings
 
+	login_name_placeholder = "Email address"
+
+	if frappe.utils.cint(frappe.db.get_value("System Settings", "System Settings", "allow_login_using_mobile_number")):
+			login_name_placeholder += " or Mobile number"
+
+	if frappe.utils.cint(frappe.db.get_value("System Settings", "System Settings", "allow_login_using_user_name")):
+			login_name_placeholder += " or Username"
+
+	context['login_name_placeholder'] = login_name_placeholder
+
 	return context
 
 @frappe.whitelist(allow_guest=True)