Skip to content

Commit

Permalink
Mailsender: SAK-49192 - Use the correct message keys for the section …
Browse files Browse the repository at this point in the history
…and group er… (sakaiproject#11839)
  • Loading branch information
maurercw authored Sep 7, 2023
1 parent 3abca0d commit 968d001
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mailsender/tool/src/webapp/content/templates/compose.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ <h1 th:text="#{compose_toolbar}">Compose</h1>
</ul>
<ul id="mailsender-sections" class="rolesArea d-none" role="tabpanel" aria-labelledBy="mailsender-tab-sections">
<li th:if="${comp.getEmailSections().size() == 0}" class="not-found">
<span th:text="#{no.role.found}" aria-live="polite"/>
<span th:text="#{no.section.found}" aria-live="polite"/>
</li>
<li th:unless="${comp.getEmailSections().size() == 0}" th:each="rolsec:${comp.getEmailSections()}" class="userGroupsList">
<input th:id="${rolsec.getRoleSingular()}" type="checkbox" name="rolesecname" th:value="${rolsec.getRoleId()}" onclick="RcptSelect.toggleSelectAll(this.id)" th:aria-label="#{a11y_rcpts_by_section(${rolsec.getRoleSingular()})}" th:title="#{a11y_rcpts_by_section(${rolsec.getRoleSingular()})}"></input>
Expand All @@ -80,7 +80,7 @@ <h1 th:text="#{compose_toolbar}">Compose</h1>
</button>
<ul class="d-none scrollable-list" th:aria-label="${rolsec.getRoleSingular()}" tabindex="-1">
<li th:if="${comp.countUsersByGroup(rolsec.getRoleId()) == 0}" aria-live="polite">
<span th:text="#{no.role.members.found}"/>
<span th:text="#{no.section.members.found}"/>
</li>
<li th:unless="${comp.countUsersByGroup(rolsec.getRoleId()) == 0}" th:each="usersec:${comp.getUsersByGroup(rolsec.getRoleId())}">
<input th:id="'sec-'+${usersec.getId()}" type="checkbox" name="user" th:value="${usersec.getId()}" onclick="RcptSelect.toggleIndividual(this.id)" th:attrappend="disabled=${usersec.getEmail().isEmpty()}?@{disabled}" />
Expand All @@ -91,7 +91,7 @@ <h1 th:text="#{compose_toolbar}">Compose</h1>
</ul>
<ul id="mailsender-groups" class="rolesArea d-none" role="tabpanel" aria-labelledBy="mailsender-tab-groups">
<li th:if="${comp.getEmailGroups().size() == 0}" class="not-found">
<span th:text="#{no.role.found}" aria-live="polite"/>
<span th:text="#{no.group.found}" aria-live="polite"/>
</li>
<li th:unless="${comp.getEmailGroups().size() == 0}" th:each="rolg:${comp.getEmailGroups()}" class="userGroupsList">
<input th:id="${rolg.getRoleSingular()}" type="checkbox" name="rolegname" th:value="${rolg.getRoleId()}" onclick="RcptSelect.toggleSelectAll(this.id)" th:aria-label="#{a11y_rcpts_by_group(${rolg.getRoleSingular()})}" th:title="#{a11y_rcpts_by_group(${rolg.getRoleSingular()})}"></input>
Expand All @@ -101,7 +101,7 @@ <h1 th:text="#{compose_toolbar}">Compose</h1>
</button>
<ul class="d-none scrollable-list" th:aria-label="${rolg.getRoleSingular()}" tabindex="-1">
<li th:if="${comp.countUsersByGroup(rolg.getRoleId()) == 0}" aria-live="polite">
<span th:text="#{no.role.members.found}"/>
<span th:text="#{no.group.members.found}"/>
</li>
<li th:unless="${comp.countUsersByGroup(rolg.getRoleId()) == 0}" th:each="userg:${comp.getUsersByGroup(rolg.getRoleId())}">
<input th:id="'gro-'+${userg.getId()}" type="checkbox" name="user" th:value="${userg.getId()}" onclick="RcptSelect.toggleIndividual(this.id)" th:attrappend="disabled=${userg.getEmail().isEmpty()}?@{disabled}" />
Expand Down

0 comments on commit 968d001

Please sign in to comment.