Fixed bug with property loading. Improved localization.

vivo-project · Nov 14, 2023 · 6bd8fcb · 6bd8fcb
1 parent d797bfe
commit 6bd8fcb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java
@@ -94,7 +94,8 @@ private WidgetTemplateValues showLoginScreen(HttpServletRequest request, String
         values.put(TemplateVariable.LOGIN_NAME.toString(), bean.getUsername());
         values.put(TemplateVariable.FORGOT_PASSWORD.toString(), getForgotPasswordUrl(request));
         values.put(TemplateVariable.FORGOT_PASSWORD_ENABLED.toString(),
-            Boolean.parseBoolean(ConfigurationProperties.getBean(request).getProperty("forgotPassword.isEnabled")));
+            ConfigurationProperties.getBean(request).getProperty("authentication.forgotPassword")
+                .equalsIgnoreCase("enabled"));
 
         boolean showExternalAuth = StringUtils.isNotBlank(
             ConfigurationProperties.getBean(request).getProperty(

diff --git a/home/src/main/resources/rdf/i18n/en_CA/interface-i18n/firsttime/vitro_UiLabel.ttl b/home/src/main/resources/rdf/i18n/en_CA/interface-i18n/firsttime/vitro_UiLabel.ttl
@@ -257,15 +257,15 @@ uil-data:reset_password_note.Vitro
 uil-data:password_reset_email_sent.Vitro
         rdf:type         owl:NamedIndividual ;
         rdf:type         uil:UILabel ;
-        rdfs:label       "Password recovery email is sent to "@en-CA ;
+        rdfs:label       "Password recovery email has been sent to "@en-CA ;
         uil:hasApp      "Vitro" ;
         uil:hasKey      "password_reset_email_sent" ;
         uil:hasPackage  "Vitro-languages" .
 
 uil-data:password_reset_email_sent_if_exists.Vitro
         rdf:type         owl:NamedIndividual ;
         rdf:type         uil:UILabel ;
-        rdfs:label       ", if it is bound with an existing account."@en-CA ;
+        rdfs:label       ", if it is associated with an existing account."@en-CA ;
         uil:hasApp      "Vitro" ;
         uil:hasKey      "password_reset_email_sent_if_exists" ;
         uil:hasPackage  "Vitro-languages" .
@@ -337,7 +337,7 @@ uil-data:password_reset_forgot_email_contact_us.Vitro
 uil-data:wrong_captcha.Vitro
         rdf:type         owl:NamedIndividual ;
         rdf:type         uil:UILabel ;
-        rdfs:label       "Wrong captcha, try again."@en-CA ;
+        rdfs:label       "The letters you have entered do not match what is shown in the security field. Please try again."@en-CA ;
         uil:hasApp      "Vitro" ;
         uil:hasKey      "wrong_captcha" ;
         uil:hasPackage  "Vitro-languages" .

diff --git a/home/src/main/resources/rdf/i18n/en_US/interface-i18n/firsttime/vitro_UiLabel.ttl b/home/src/main/resources/rdf/i18n/en_US/interface-i18n/firsttime/vitro_UiLabel.ttl
@@ -257,23 +257,23 @@ uil-data:reset_password_note.Vitro
 uil-data:password_reset_email_sent.Vitro
         rdf:type         owl:NamedIndividual ;
         rdf:type         uil:UILabel ;
-        rdfs:label       "Password recovery email is sent to "@en-US ;
+        rdfs:label       "Password recovery email has been sent to "@en-US ;
         uil:hasApp      "Vitro" ;
         uil:hasKey      "password_reset_email_sent" ;
         uil:hasPackage  "Vitro-languages" .
 
 uil-data:password_reset_email_sent_if_exists.Vitro
         rdf:type         owl:NamedIndividual ;
         rdf:type         uil:UILabel ;
-        rdfs:label       ", if it is bound with an existing account."@en-US ;
+        rdfs:label       ", if it is associated with an existing account."@en-US ;
         uil:hasApp      "Vitro" ;
         uil:hasKey      "password_reset_email_sent_if_exists" ;
         uil:hasPackage  "Vitro-languages" .
 
 uil-data:wrong_captcha.Vitro
         rdf:type         owl:NamedIndividual ;
         rdf:type         uil:UILabel ;
-        rdfs:label       "Wrong captcha, try again."@en-US ;
+        rdfs:label       "The letters you have entered do not match what is shown in the security field. Please try again."@en-US ;
         uil:hasApp      "Vitro" ;
         uil:hasKey      "wrong_captcha" ;
         uil:hasPackage  "Vitro-languages" .