SAK-32412 Hardcoded placeholder in messages (sakaiproject#4206)

axxter99 · Apr 10, 2017 · 52c7bf9 · 52c7bf9
1 parent fb30827
commit 52c7bf9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/...geforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties b/...geforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
@@ -868,3 +868,4 @@ cdfm_not_selected_topic=You have to select forum and topic where moving thread
 loading_direct_access=Loading message...
 error_direct_access=Error loading message
 
+recipient_placeholder=Click here to select recipients
diff --git a/msgcntr/messageforums-app/src/webapp/js/messages.js b/msgcntr/messageforums-app/src/webapp/js/messages.js
@@ -87,7 +87,7 @@ function changeSelect(obj) {
 
 function addTagSelector(obj) {
   	if (obj) {
-	  	$(obj).select2({formatNoMatches:function(){return'';},placeholder: "Click here to select recipients"});
+	  	$(obj).select2({formatNoMatches:function(){return'';},placeholder: obj.getAttribute('title')});
 	  	$(obj).on('change',function(){resize();});
   	}
 }

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/compose.jsp b/msgcntr/messageforums-app/src/webapp/jsp/compose.jsp
@@ -97,7 +97,7 @@
 					 <h:outputLabel for="list1"><h:outputText value="#{msgs.pvt_star}" styleClass="reqStar"/><h:outputText value="#{msgs.pvt_to}"/></h:outputLabel>
 			  </h:panelGroup>
 			  <h:panelGroup styleClass="shorttext">
-					<h:selectManyListbox id="list1" value="#{PrivateMessagesTool.selectedComposeToList}" size="5" style="width: 100%;">
+					<h:selectManyListbox id="list1" value="#{PrivateMessagesTool.selectedComposeToList}" size="5" style="width: 100%;" title="#{msgs.recipient_placeholder}">
 		         <f:selectItems value="#{PrivateMessagesTool.totalComposeToList}"/>
 		      </h:selectManyListbox>
 		      <f:verbatim>
@@ -153,7 +153,7 @@
 	       		</h:outputLabel>
 		  	</h:panelGroup>
 		  	<h:panelGroup styleClass="shorttext bcc" style="display:none">
-				<h:selectManyListbox id="list2" value="#{PrivateMessagesTool.selectedComposeBccList}" size="5" style="width: 100%;">
+				<h:selectManyListbox id="list2" value="#{PrivateMessagesTool.selectedComposeBccList}" size="5" style="width: 100%;" title="#{msgs.recipient_placeholder}">
 	         		<f:selectItems value="#{PrivateMessagesTool.totalComposeToBccList}"/>
 	       		</h:selectManyListbox>
 	       		<f:verbatim>

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/pvtMsgForward.jsp b/msgcntr/messageforums-app/src/webapp/jsp/pvtMsgForward.jsp
@@ -102,7 +102,7 @@
 					</h:outputLabel>
 			  </h:panelGroup>
 			  <h:panelGroup styleClass="shorttext">
-				   <h:selectManyListbox id="list1" value="#{PrivateMessagesTool.selectedComposeToList}" size="5" style="width: 100%;">
+				   <h:selectManyListbox id="list1" value="#{PrivateMessagesTool.selectedComposeToList}" size="5" style="width: 100%;" title="#{msgs.recipient_placeholder}">
 			         <f:selectItems value="#{PrivateMessagesTool.totalComposeToList}"/>
 			       </h:selectManyListbox>
 			       <f:verbatim>
@@ -159,7 +159,7 @@
 	       		</h:outputLabel>
 		  	</h:panelGroup>
 		  	<h:panelGroup styleClass="shorttext bcc" style="display:none">
-				<h:selectManyListbox id="list2" value="#{PrivateMessagesTool.selectedComposeBccList}" size="5" style="width: 100%;">
+				<h:selectManyListbox id="list2" value="#{PrivateMessagesTool.selectedComposeBccList}" size="5" style="width: 100%;" title="#{msgs.recipient_placeholder}">
 	         		<f:selectItems value="#{PrivateMessagesTool.totalComposeToBccList}"/>
 	       		</h:selectManyListbox>
 	       		<f:verbatim>

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/pvtMsgReply.jsp b/msgcntr/messageforums-app/src/webapp/jsp/pvtMsgReply.jsp
@@ -107,7 +107,7 @@
 					<h:outputLabel for="list1" ><h:outputText value="#{msgs.pvt_select_addtl_recipients}"/></h:outputLabel>
 				</h:panelGroup>
 				<h:panelGroup styleClass="shorttext">
-					<h:selectManyListbox id="list1" value="#{PrivateMessagesTool.selectedComposeToList}" size="5" style="width: 100%;">
+					<h:selectManyListbox id="list1" value="#{PrivateMessagesTool.selectedComposeToList}" size="5" style="width: 100%;" title="#{msgs.recipient_placeholder}">
           				<f:selectItems value="#{PrivateMessagesTool.totalComposeToList}"/>
          			</h:selectManyListbox>
          			<f:verbatim>
@@ -164,7 +164,7 @@
 		       		</h:outputLabel>
 			  	</h:panelGroup>
 			  	<h:panelGroup styleClass="shorttext bcc" style="display:none">
-					<h:selectManyListbox id="list2" value="#{PrivateMessagesTool.selectedComposeBccList}" size="5" style="width: 100%;">
+					<h:selectManyListbox id="list2" value="#{PrivateMessagesTool.selectedComposeBccList}" size="5" style="width: 100%;" title="#{msgs.recipient_placeholder}">
 		         		<f:selectItems value="#{PrivateMessagesTool.totalComposeToBccList}"/>
 		       		</h:selectManyListbox>
 		       		<f:verbatim>

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/pvtMsgReplyAll.jsp b/msgcntr/messageforums-app/src/webapp/jsp/pvtMsgReplyAll.jsp
@@ -120,7 +120,7 @@
 					<h:outputLabel for="list1"><h:outputText value="#{msgs.pvt_select_forward_recipients}"/></h:outputLabel>
 			  </h:panelGroup>
 		<h:panelGroup styleClass="shorttext">
-			<h:selectManyListbox id="list1" value="#{PrivateMessagesTool.selectedComposeToList}" size="5" style="width: 100%;">
+			<h:selectManyListbox id="list1" value="#{PrivateMessagesTool.selectedComposeToList}" size="5" style="width: 100%;" title="#{msgs.recipient_placeholder}">
 		    	<f:selectItems value="#{PrivateMessagesTool.totalComposeToList}"/>
 		    </h:selectManyListbox>
 		    <f:verbatim>
@@ -174,7 +174,7 @@
 	       		</h:outputLabel>
 		  	</h:panelGroup>
 		  	<h:panelGroup styleClass="shorttext bcc" style="display:none">
-				<h:selectManyListbox id="list2" value="#{PrivateMessagesTool.selectedComposeBccList}" size="5" style="width: 100%;">
+				<h:selectManyListbox id="list2" value="#{PrivateMessagesTool.selectedComposeBccList}" size="5" style="width: 100%;" title="#{msgs.recipient_placeholder}">
 	         		<f:selectItems value="#{PrivateMessagesTool.totalComposeToBccList}"/>
 	       		</h:selectManyListbox>
 	       		<f:verbatim>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -868,3 +868,4 @@ cdfm_not_selected_topic=You have to select forum and topic where moving thread
		loading_direct_access=Loading message...
		error_direct_access=Error loading message

		recipient_placeholder=Click here to select recipients