From 5e99ae422a936e85b354818ae9130a605bdb84f8 Mon Sep 17 00:00:00 2001
From: Miriam Landa <miriam.landa@nibio.no>
Date: Tue, 28 Jun 2022 09:51:59 +0200
Subject: [PATCH] 'changed_to_i18nBundle_names'
---
.../no/nibio/vips/logic/i18n/vipslogictexts.properties | 1 +
.../nibio/vips/logic/i18n/vipslogictexts_bs.properties | 1 +
.../nibio/vips/logic/i18n/vipslogictexts_hr.properties | 1 +
.../nibio/vips/logic/i18n/vipslogictexts_nb.properties | 1 +
.../nibio/vips/logic/i18n/vipslogictexts_sr.properties | 1 +
.../vips/logic/i18n/vipslogictexts_zh_CN.properties | 1 +
src/main/webapp/templates/userList.ftl | 10 +++++-----
7 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
index cfff6647..7e203f65 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
@@ -1038,3 +1038,4 @@ dd_upper=Day degree upper cutoffs
observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
index 1afc139b..bdcacc07 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
@@ -1031,3 +1031,4 @@ dd_upper=Day degree upper cutoffs
observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
index 44987729..9e7aff9d 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
@@ -1030,3 +1030,4 @@ dd_upper=Day degree upper cutoffs
observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
index 9066a82e..ff13d594 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
@@ -1039,3 +1039,4 @@ dd_upper=Maksimumstemperaturer d\u00f8gngradberegning
observedPhase=Observert utviklingsstadium ved biofix-dato
YSTEMBTEMP=Yellow Stemborer temperaturmodell
addIllustration=Legg til illustrasjon
+allRoles=Alle roller
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
index fee3ba47..1281432b 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
@@ -1032,3 +1032,4 @@ dd_upper=Day degree upper cutoffs
observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
index 778dbb65..fb0fbad2 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
@@ -1025,3 +1025,4 @@ dd_upper=Day degree upper cutoffs
observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/webapp/templates/userList.ftl b/src/main/webapp/templates/userList.ftl
index 10a803d0..548e9455 100755
--- a/src/main/webapp/templates/userList.ftl
+++ b/src/main/webapp/templates/userList.ftl
@@ -113,12 +113,12 @@
</p>
<#if messageKey?has_content>
<div class="alert alert-success">${i18nBundle(messageKey)}</div>
- </#if>
+ </#if>
<tr>
<td>
<#if user.isSuperUser() || user.isOrganizationAdmin() >
<select onchange="<#if user.isSuperUser()>sortByOrgAndUserRole();<#else>sortByUserRole();</#if>" id="selectUserRole" class="form-control">
- <option value="-1">*Alle typer brukere</option>
+ <option value="-1">${i18nBundle.allRoles}</option>
<#list vipsLogicRoles as role>
<option value="${role.vipsLogicRoleId}">${i18nBundle["vipsLogicRole_" + role.vipsLogicRoleId]}</option>
</#list>
@@ -127,7 +127,7 @@
<br>
<#if user.isSuperUser() >
<select onclick="sortByOrgAndUserRole();" id="selectOrg" class="form-control">
- <option value="-1">*Alle organisasjoner</option>
+ <option value="-1">${i18nBundle.allOrganizations}</option>
<#list organizations as org>
<option value=${org.organizationId}>${org.organizationName}</option>
</#list>
@@ -141,8 +141,8 @@
<th>${i18nBundle.lastName}</th>
<th>${i18nBundle.firstName}</th>
<th>${i18nBundle.status}</th>
- <th>*Organisasjon</th>
- <th>*Roller</th>
+ <th>${i18nBundle.organizationId}</th>
+ <th>${i18nBundle.vipsLogicRoles}</th>
</thead>
<tbody>
<!-- The ones that need treatment first -->
--
GitLab