diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionDataGetter.java index 627ad04ca..9bd5107f2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionDataGetter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionDataGetter.java @@ -60,11 +60,11 @@ public class LocaleSelectionDataGetter implements DataGetter { return Collections.emptyMap(); } - Map result = new HashMap(); + Map result = new HashMap<>(); result.put("selectLocaleUrl", UrlBuilder.getUrl("/selectLocale")); result.put("locales", buildLocalesList(selectables)); - Map bodyMap = new HashMap(); + Map bodyMap = new HashMap<>(); bodyMap.put("selectLocale", result); log.debug("Sending these values: " + bodyMap); return bodyMap; @@ -72,7 +72,7 @@ public class LocaleSelectionDataGetter implements DataGetter { private List> buildLocalesList(List selectables) { Locale currentLocale = SelectedLocale.getCurrentLocale(vreq); - List> list = new ArrayList>(); + List> list = new ArrayList<>(); for (Locale locale : selectables) { try { list.add(buildLocaleMap(locale, currentLocale)); @@ -86,10 +86,12 @@ public class LocaleSelectionDataGetter implements DataGetter { private Map buildLocaleMap(Locale locale, Locale currentLocale) throws FileNotFoundException { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("code", locale.toString()); map.put("label", locale.getDisplayName(currentLocale)); map.put("imageUrl", LocaleSelectorUtilities.getImageUrl(vreq, locale)); + map.put("selected", currentLocale.equals(locale)); return map; } + } diff --git a/webapp/web/templates/freemarker/page/partials/languageSelector.ftl b/webapp/web/templates/freemarker/page/partials/languageSelector.ftl index 71561b5e1..d3e178a0f 100644 --- a/webapp/web/templates/freemarker/page/partials/languageSelector.ftl +++ b/webapp/web/templates/freemarker/page/partials/languageSelector.ftl @@ -25,4 +25,5 @@ * -- code * -- label (tooltip relative to the current Locale) * -- imageUrl + * -- selected (boolean) --> \ No newline at end of file