From f73728f3a9eaaa30bd2a133b221b5186bccd5a2d Mon Sep 17 00:00:00 2001 From: chenganj Date: Fri, 9 Nov 2018 12:39:59 -0500 Subject: [PATCH 1/9] to toggle breadcrumbs and info/alert messages corresponding to language selection --- src/main/webapp/ThemeAndWidgets.xhtml | 3 ++- src/main/webapp/dashboard-users.xhtml | 3 ++- src/main/webapp/dashboard.xhtml | 3 ++- src/main/webapp/dataset.xhtml | 2 ++ src/main/webapp/dataverseuser.xhtml | 3 ++- src/main/webapp/editdatafiles.xhtml | 3 ++- src/main/webapp/guestbook-responses.xhtml | 3 ++- src/main/webapp/guestbook.xhtml | 3 ++- src/main/webapp/harvestclients.xhtml | 3 ++- src/main/webapp/harvestsets.xhtml | 3 ++- src/main/webapp/manage-groups.xhtml | 2 ++ src/main/webapp/manage-guestbooks.xhtml | 2 ++ src/main/webapp/manage-templates.xhtml | 2 ++ src/main/webapp/permissions-manage.xhtml | 3 ++- src/main/webapp/role_permission_helper.xhtml | 3 ++- src/main/webapp/search/advanced.xhtml | 3 ++- src/main/webapp/template.xhtml | 3 ++- 17 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/main/webapp/ThemeAndWidgets.xhtml b/src/main/webapp/ThemeAndWidgets.xhtml index ead5ff31ca3..3e3aac82809 100644 --- a/src/main/webapp/ThemeAndWidgets.xhtml +++ b/src/main/webapp/ThemeAndWidgets.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -28,4 +28,5 @@ + \ No newline at end of file diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml index 98e2b6abddf..3cbd36fb75c 100644 --- a/src/main/webapp/dashboard-users.xhtml +++ b/src/main/webapp/dashboard-users.xhtml @@ -6,7 +6,7 @@ xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:p="http://primefaces.org/ui" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> - + @@ -115,4 +115,5 @@ + diff --git a/src/main/webapp/dashboard.xhtml b/src/main/webapp/dashboard.xhtml index e6144dc2f22..930bffa8527 100644 --- a/src/main/webapp/dashboard.xhtml +++ b/src/main/webapp/dashboard.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:p="http://primefaces.org/ui"> - + @@ -136,4 +136,5 @@ + \ No newline at end of file diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml index 8b2c0878dd0..f307a077165 100755 --- a/src/main/webapp/dataset.xhtml +++ b/src/main/webapp/dataset.xhtml @@ -10,6 +10,7 @@ xmlns:cc="http://java.sun.com/jsf/composite" xmlns:o="http://omnifaces.org/ui" xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> + @@ -1600,4 +1601,5 @@ + diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml index ef33828fc20..3b4f1ef300f 100644 --- a/src/main/webapp/dataverseuser.xhtml +++ b/src/main/webapp/dataverseuser.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:o="http://omnifaces.org/ui"> - + @@ -652,4 +652,5 @@ + diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml index aab4541229e..7e28d00b578 100755 --- a/src/main/webapp/editdatafiles.xhtml +++ b/src/main/webapp/editdatafiles.xhtml @@ -10,7 +10,7 @@ xmlns:cc="http://java.sun.com/jsf/composite" xmlns:o="http://omnifaces.org/ui" xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> - + @@ -137,4 +137,5 @@ + diff --git a/src/main/webapp/guestbook-responses.xhtml b/src/main/webapp/guestbook-responses.xhtml index 29dfbc8a950..be9131d6929 100644 --- a/src/main/webapp/guestbook-responses.xhtml +++ b/src/main/webapp/guestbook-responses.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -92,5 +92,6 @@ + diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml index 214d324444b..aeb4bb1cc31 100644 --- a/src/main/webapp/guestbook.xhtml +++ b/src/main/webapp/guestbook.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -199,5 +199,6 @@ + diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml index c87c7388d43..8e5149175d8 100644 --- a/src/main/webapp/harvestclients.xhtml +++ b/src/main/webapp/harvestclients.xhtml @@ -6,7 +6,7 @@ xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:p="http://primefaces.org/ui" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> - + @@ -563,4 +563,5 @@ + diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml index a7a0270d3ae..88a9cbcabb0 100644 --- a/src/main/webapp/harvestsets.xhtml +++ b/src/main/webapp/harvestsets.xhtml @@ -6,7 +6,7 @@ xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:p="http://primefaces.org/ui" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> - + @@ -334,4 +334,5 @@ + diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml index 47bf47974b9..3fd5b5a656c 100644 --- a/src/main/webapp/manage-groups.xhtml +++ b/src/main/webapp/manage-groups.xhtml @@ -5,6 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> + @@ -182,4 +183,5 @@ + diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml index 3311bddb115..0b44424b804 100644 --- a/src/main/webapp/manage-guestbooks.xhtml +++ b/src/main/webapp/manage-guestbooks.xhtml @@ -6,6 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:o="http://omnifaces.org/ui"> + @@ -226,4 +227,5 @@ + diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml index 6c050e63b1c..00572109d20 100644 --- a/src/main/webapp/manage-templates.xhtml +++ b/src/main/webapp/manage-templates.xhtml @@ -5,6 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> + @@ -192,4 +193,5 @@ + diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml index a4baa44ed36..1e22f59fb20 100644 --- a/src/main/webapp/permissions-manage.xhtml +++ b/src/main/webapp/permissions-manage.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> - + @@ -229,4 +229,5 @@ + diff --git a/src/main/webapp/role_permission_helper.xhtml b/src/main/webapp/role_permission_helper.xhtml index 8f6ba24894d..736c5c52803 100644 --- a/src/main/webapp/role_permission_helper.xhtml +++ b/src/main/webapp/role_permission_helper.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:p="http://primefaces.org/ui"> - + @@ -87,4 +87,5 @@ + diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml index 7ba83dea1d4..6a5ad29cdfa 100644 --- a/src/main/webapp/search/advanced.xhtml +++ b/src/main/webapp/search/advanced.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -217,4 +217,5 @@ + diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml index 25a8668935f..b65bb89c5e7 100644 --- a/src/main/webapp/template.xhtml +++ b/src/main/webapp/template.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -137,5 +137,6 @@ + From 87cefa5db54b283c5319bb4dee1e70c1e488e677 Mon Sep 17 00:00:00 2001 From: chenganj Date: Mon, 19 Nov 2018 08:27:16 -0500 Subject: [PATCH 2/9] added - + @@ -34,4 +34,5 @@ + diff --git a/src/main/webapp/404.xhtml b/src/main/webapp/404.xhtml index 488eb5cd322..9ffbeecff64 100644 --- a/src/main/webapp/404.xhtml +++ b/src/main/webapp/404.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -44,4 +44,5 @@ + diff --git a/src/main/webapp/500.xhtml b/src/main/webapp/500.xhtml index f617691d65e..657a6319047 100644 --- a/src/main/webapp/500.xhtml +++ b/src/main/webapp/500.xhtml @@ -4,7 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui"> - + @@ -21,4 +21,5 @@ + diff --git a/src/main/webapp/confirmemail.xhtml b/src/main/webapp/confirmemail.xhtml index 06f23ed7c1f..2d52aaaa74e 100644 --- a/src/main/webapp/confirmemail.xhtml +++ b/src/main/webapp/confirmemail.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -29,4 +29,5 @@ + \ No newline at end of file diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml index d8bef05ce71..e65038d2300 100644 --- a/src/main/webapp/dataset-widgets.xhtml +++ b/src/main/webapp/dataset-widgets.xhtml @@ -6,6 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" xmlns:jsf="http://xmlns.jcp.org/jsf"> + @@ -182,4 +183,5 @@ + \ No newline at end of file diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml index c8de4c40716..16ea6597153 100644 --- a/src/main/webapp/dataverse_template.xhtml +++ b/src/main/webapp/dataverse_template.xhtml @@ -8,8 +8,7 @@ xmlns:o="http://omnifaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:c="http://java.sun.com/jsp/jstl/core" - lang="en"> - + xml:lang="#{dataverseLocaleBean.localeCode}"> @@ -18,7 +17,6 @@ - @@ -116,5 +114,4 @@ - diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml index fbfbe4adb96..61590a693b4 100644 --- a/src/main/webapp/file.xhtml +++ b/src/main/webapp/file.xhtml @@ -10,6 +10,7 @@ xmlns:cc="http://java.sun.com/jsf/composite" xmlns:o="http://omnifaces.org/ui" xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> + @@ -646,4 +647,5 @@ + diff --git a/src/main/webapp/iframe.xhtml b/src/main/webapp/iframe.xhtml index 5effa8e4af4..183c9db66c9 100644 --- a/src/main/webapp/iframe.xhtml +++ b/src/main/webapp/iframe.xhtml @@ -7,6 +7,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf" lang="en"> + <h:outputText value="#{pageTitle}"/> @@ -82,4 +83,5 @@ + diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml index 7bc5fb1a1f4..ba44fea18db 100644 --- a/src/main/webapp/loginpage.xhtml +++ b/src/main/webapp/loginpage.xhtml @@ -7,7 +7,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -228,4 +228,5 @@ + diff --git a/src/main/webapp/oauth2/callback.xhtml b/src/main/webapp/oauth2/callback.xhtml index 6ae50318e6c..8d80b9e4afe 100644 --- a/src/main/webapp/oauth2/callback.xhtml +++ b/src/main/webapp/oauth2/callback.xhtml @@ -6,7 +6,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -54,4 +54,5 @@ + diff --git a/src/main/webapp/oauth2/convert.xhtml b/src/main/webapp/oauth2/convert.xhtml index 9b6a2add03d..eb260c613fb 100644 --- a/src/main/webapp/oauth2/convert.xhtml +++ b/src/main/webapp/oauth2/convert.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -85,4 +85,5 @@ + \ No newline at end of file diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml index b7a549dd273..6445f327c04 100644 --- a/src/main/webapp/oauth2/firstLogin.xhtml +++ b/src/main/webapp/oauth2/firstLogin.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -145,4 +145,5 @@ + \ No newline at end of file diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml index 97ce2c8854f..84d1b2a8bdc 100644 --- a/src/main/webapp/passwordreset.xhtml +++ b/src/main/webapp/passwordreset.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -149,4 +149,5 @@ + diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml index a8f9e5818e8..e08842f3541 100644 --- a/src/main/webapp/permissions-manage-files.xhtml +++ b/src/main/webapp/permissions-manage-files.xhtml @@ -8,6 +8,7 @@ xmlns:o="http://omnifaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> + @@ -352,4 +353,5 @@ + diff --git a/src/main/webapp/privateurl.xhtml b/src/main/webapp/privateurl.xhtml index e2319053f99..03c63861125 100644 --- a/src/main/webapp/privateurl.xhtml +++ b/src/main/webapp/privateurl.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:p="http://primefaces.org/ui"> - + @@ -21,4 +21,5 @@ + diff --git a/src/main/webapp/shib.xhtml b/src/main/webapp/shib.xhtml index a9c8ba64937..1fd51818c1c 100644 --- a/src/main/webapp/shib.xhtml +++ b/src/main/webapp/shib.xhtml @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -139,4 +139,5 @@ + \ No newline at end of file From 49f492e8923f934658451d4e6aeebff963c27dae Mon Sep 17 00:00:00 2001 From: chenganj Date: Tue, 20 Nov 2018 10:53:08 -0500 Subject: [PATCH 3/9] added English private Map dataverseLocales; diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml index 315474259e8..4ac4fbc1451 100644 --- a/src/main/webapp/dataverse.xhtml +++ b/src/main/webapp/dataverse.xhtml @@ -7,7 +7,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf"> - + @@ -823,4 +823,5 @@ + From d3b783a418ef17e35adff830dd21e4f319689fd0 Mon Sep 17 00:00:00 2001 From: chenganj Date: Tue, 20 Nov 2018 12:10:51 -0500 Subject: [PATCH 4/9] added @lang to html tag --- src/main/webapp/dataverse_template.xhtml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml index 16ea6597153..e03e9ddca83 100644 --- a/src/main/webapp/dataverse_template.xhtml +++ b/src/main/webapp/dataverse_template.xhtml @@ -7,7 +7,8 @@ xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf" - xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:c="http://java.sun.com/jsp/jstl/core" + lang="#{dataverseLocaleBean.localeCode}" xml:lang="#{dataverseLocaleBean.localeCode}"> From 288a4867434e050a8db1b0b02849f54aaa0c4486 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Wed, 28 Nov 2018 10:57:01 -0500 Subject: [PATCH 5/9] Changed display of edit dataverse pg info msg to be delivered via the bundle from DataversePage.java [ref #5202] --- src/main/java/Bundle.properties | 2 +- .../harvard/iq/dataverse/DataversePage.java | 2 +- src/main/webapp/dataverse.xhtml | 14 +++--- .../resources/js/dv_rebind_bootstrap_ui.js | 43 ++++++++++--------- 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties index 8f94e25199c..ce01be0c556 100755 --- a/src/main/java/Bundle.properties +++ b/src/main/java/Bundle.properties @@ -1926,7 +1926,7 @@ dataverse.item.required=Required dataverse.item.optional=Optional dataverse.item.hidden=Hidden dataverse.edit.msg=Edit Dataverse -dataverse.edit.detailmsg= - Edit your dataverse and click Save. Asterisks indicate required fields. +dataverse.edit.detailmsg=Edit your dataverse and click Save Changes. Asterisks indicate required fields. dataverse.feature.update=The featured dataverses for this dataverse have been updated. dataverse.link.select=You must select a linking dataverse. dataset.noSelectedDataverse.header=Select Dataverse(s) diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java index 3f8a7347cd4..39c9cddea32 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java @@ -408,7 +408,7 @@ public void edit(EditMode editMode) { this.editMode = editMode; if (editMode == EditMode.INFO) { setupForGeneralInfoEdit(); - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataverse.edit.msg") , BundleUtil.getStringFromBundle("dataverse.edit.detailmsg"))); + JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataverse.edit.msg"), BundleUtil.getStringFromBundle("dataverse.edit.detailmsg")); } else if (editMode == EditMode.FEATURED) { initFeaturedDataverses(); } diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml index 4ac4fbc1451..adb0c39eb22 100644 --- a/src/main/webapp/dataverse.xhtml +++ b/src/main/webapp/dataverse.xhtml @@ -405,12 +405,12 @@
  • - +
  • - + @@ -568,7 +568,7 @@ - + @@ -630,9 +630,11 @@ - - - + + + + + diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js index 8d1c4ab584a..fba070e9cf3 100644 --- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js +++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js @@ -104,8 +104,8 @@ function show_info_msg(mtitle, mtext){ * Called after "Edit Dataverse" - "General Information" */ function post_edit_dv_general_info(){ - show_info_msg('Edit Dataverse', 'Edit your dataverse and click Save Changes. Asterisks indicate required fields.'); - hide_search_panels(); + // show_info_msg('Edit Dataverse', 'Edit your dataverse and click Save Changes. Asterisks indicate required fields.'); + // hide_search_panels(); bind_bsui_components(); } @@ -113,36 +113,37 @@ function post_edit_dv_general_info(){ * Used after cancelling "Edit Dataverse" */ function post_cancel_edit_dv(){ - show_search_panels() - hide_info_msg(); + // show_search_panels() + // hide_info_msg(); bind_bsui_components(); initCarousel(); } /* * Hide search panels when editing a dv + * NO LONGER IN USE, INSTEAD ADDED p:fragment TO DV PG */ -function hide_search_panels(){ - if($(".panelSearchForm").length>0){ - $(".panelSearchForm").hide(); - if($(".panelSearchForm").next().length>0){ - $(".panelSearchForm").next().hide(); - } - } -} +//function hide_search_panels(){ +// if($(".panelSearchForm").length>0){ +// $(".panelSearchForm").hide(); +// if($(".panelSearchForm").next().length>0){ +// $(".panelSearchForm").next().hide(); +// } +// } +//} /* * Show search panels when cancel a dv edit + * NO LONGER IN USE, INSTEAD ADDED p:fragment TO DV PG */ - -function show_search_panels(){ - if($(".panelSearchForm").length>0){ - if($(".panelSearchForm").next().length>0){ - $(".panelSearchForm").next().show(); - } - $(".panelSearchForm").show(); - } -} +//function show_search_panels(){ +// if($(".panelSearchForm").length>0){ +// if($(".panelSearchForm").next().length>0){ +// $(".panelSearchForm").next().show(); +// } +// $(".panelSearchForm").show(); +// } +//} /* From fb7ee64e69cddb55111e12c3f2e9f58ce8601052 Mon Sep 17 00:00:00 2001 From: chenganj Date: Wed, 28 Nov 2018 11:43:28 -0500 Subject: [PATCH 6/9] modified dataverse.edit.detailmsg --- src/main/java/Bundle_fr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/Bundle_fr.properties b/src/main/java/Bundle_fr.properties index e72b4c96131..7c809c66238 100644 --- a/src/main/java/Bundle_fr.properties +++ b/src/main/java/Bundle_fr.properties @@ -1923,7 +1923,7 @@ dataverse.item.required=Obligatoire dataverse.item.optional=Facultatif dataverse.item.hidden=Information cachée dataverse.edit.msg=Modifier le dataverse -dataverse.edit.detailmsg= \u2014 Modifier votre dataverse puis cliquer sur Enregistrer. Les astérisques indiquent les champs obligatoires +dataverse.edit.detailmsg=Modifier votre dataverse puis cliquer sur Enregistrer les modifications. Les astérisques indiquent les champs obligatoires dataverse.feature.update=Les dataverses en vedette pour ce dataverse ont été mis à jour. dataverse.link.select=Vous devez sélectionner un dataverse lié. dataset.noSelectedDataverse.header=Sélectionner le(s) dataverse(s) From fca3f2277f92c818d650eda5797821cb2acf0aff Mon Sep 17 00:00:00 2001 From: chenganj Date: Fri, 30 Nov 2018 14:48:47 -0500 Subject: [PATCH 7/9] commented JH.localize method --- .../harvard/iq/dataverse/DashboardPage.java | 8 ++- .../edu/harvard/iq/dataverse/DatasetPage.java | 64 +++++++++---------- .../iq/dataverse/DataverseHeaderFragment.java | 6 +- .../iq/dataverse/FileDownloadHelper.java | 2 +- .../edu/harvard/iq/dataverse/FilePage.java | 10 +-- .../iq/dataverse/GuestbookResponsesPage.java | 6 +- .../iq/dataverse/HarvestingClientsPage.java | 24 +++---- .../iq/dataverse/HarvestingSetsPage.java | 24 +++---- .../iq/dataverse/ManageGroupsPage.java | 4 +- .../iq/dataverse/ManageGuestbooksPage.java | 8 +-- .../iq/dataverse/ManageTemplatesPage.java | 2 +- .../iq/dataverse/ThemeWidgetFragment.java | 4 +- .../provenance/ProvPopupFragmentBean.java | 18 +++--- .../harvard/iq/dataverse/util/JsfHelper.java | 3 +- src/main/webapp/dataverse_template.xhtml | 5 +- src/main/webapp/dataverseuser.xhtml | 2 + src/main/webapp/manage-templates.xhtml | 6 +- src/main/webapp/template.xhtml | 7 +- 18 files changed, 110 insertions(+), 93 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java b/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java index e97f5a9ecda..5b6cdd23775 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DashboardPage.java @@ -11,6 +11,8 @@ import edu.harvard.iq.dataverse.harvest.server.OAISet; import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean; import static edu.harvard.iq.dataverse.util.JsfHelper.JH; + +import edu.harvard.iq.dataverse.util.BundleUtil; import edu.harvard.iq.dataverse.util.SystemConfig; import java.util.List; import java.util.logging.Logger; @@ -63,7 +65,7 @@ public String init() { /* use this to add some kind of a tooltip/info message to the top of the page: - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, JH.localize("dashboard.title"), JH.localize("dashboard.toptip"))); + FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dashboard.title"), BundleUtil.getStringFromBundle("dashboard.toptip"))); - the values for "dashboard.title" and "dashboard.toptip" would need to be added to the resource bundle. */ return null; @@ -129,7 +131,7 @@ public int getNumberOfOaiSets() { public String getHarvestClientsInfoLabel() { List configuredHarvestingClients = harvestingClientService.getAllHarvestingClients(); if (configuredHarvestingClients == null || configuredHarvestingClients.isEmpty()) { - return JH.localize("harvestclients.noClients.label"); + return BundleUtil.getStringFromBundle("harvestclients.noClients.label"); } String infoLabel; @@ -158,7 +160,7 @@ public String getHarvestServerInfoLabel() { List configuredHarvestingSets = oaiSetService.findAll(); if (configuredHarvestingSets == null || configuredHarvestingSets.isEmpty()) { - infoLabel = infoLabel.concat(JH.localize("harvestserver.service.empty")); + infoLabel = infoLabel.concat(BundleUtil.getStringFromBundle("harvestserver.service.empty")); return infoLabel; } diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java index 84462e3915e..50014af6c85 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java @@ -1433,7 +1433,7 @@ private String init(boolean initFull) { if (!retrieveDatasetVersionResponse.wasRequestedVersionRetrieved()) { //msg("checkit " + retrieveDatasetVersionResponse.getDifferentVersionMessage()); - JsfHelper.addWarningMessage(retrieveDatasetVersionResponse.getDifferentVersionMessage());//JH.localize("dataset.message.metadataSuccess")); + JsfHelper.addWarningMessage(retrieveDatasetVersionResponse.getDifferentVersionMessage());//BundleUtil.getStringFromBundle("dataset.message.metadataSuccess")); } // init the citation @@ -1754,15 +1754,15 @@ public void edit(EditMode editMode) { if (editMode == EditMode.INFO) { // ? } else if (editMode == EditMode.FILE) { - // JH.addMessage(FacesMessage.SEVERITY_INFO, JH.localize("dataset.message.editFiles")); + // JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editFiles")); // FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Upload + Edit Dataset Files", " - You can drag and drop your files from your desktop, directly into the upload widget.")); } else if (editMode.equals(EditMode.METADATA)) { datasetVersionUI = datasetVersionUI.initDatasetVersionUI(workingVersion, true); updateDatasetFieldInputLevels(); - JH.addMessage(FacesMessage.SEVERITY_INFO, JH.localize("dataset.message.editMetadata")); + JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editMetadata")); //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Edit Dataset Metadata", " - Add more metadata about your dataset to help others easily find it.")); } else if (editMode.equals(EditMode.LICENSE)){ - JH.addMessage(FacesMessage.SEVERITY_INFO, JH.localize("dataset.message.editTerms")); + JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.message.editTerms")); //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Edit Dataset License and Terms", " - Update your dataset's license and terms of use.")); } this.readOnly = false; @@ -1838,11 +1838,11 @@ private void releaseParentDV(){ PublishDataverseCommand cmd = new PublishDataverseCommand(dvRequestService.getDataverseRequest(), dataset.getOwner()); try { commandEngine.submit(cmd); - JsfHelper.addSuccessMessage(JH.localize("dataverse.publish.success")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataverse.publish.success")); } catch (CommandException ex) { logger.log(Level.SEVERE, "Unexpected Exception calling publish dataverse command", ex); - JsfHelper.addErrorMessage(JH.localize("dataverse.publish.failure")); + JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataverse.publish.failure")); } } else { @@ -1872,9 +1872,9 @@ public String deaccessionVersions() { } } catch (CommandException ex) { logger.severe(ex.getMessage()); - JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize("dataset.message.deaccessionFailure")); + JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.message.deaccessionFailure")); } - JsfHelper.addSuccessMessage(JH.localize("datasetVersion.message.deaccessionSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("datasetVersion.message.deaccessionSuccess")); return returnToDatasetOnly(); } @@ -2042,10 +2042,10 @@ public String deleteDataset() { userNotificationService.delete(und); } */ } catch (CommandException ex) { - JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize("dataset.message.deleteFailure")); + JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.message.deleteFailure")); logger.severe(ex.getMessage()); } - JsfHelper.addSuccessMessage(JH.localize("dataset.message.deleteSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.deleteSuccess")); return "/dataverse.xhtml?alias=" + dataset.getOwner().getAlias() + "&faces-redirect=true"; } @@ -2067,9 +2067,9 @@ public String deleteDatasetVersion() { try { cmd = new DeleteDatasetVersionCommand(dvRequestService.getDataverseRequest(), dataset); commandEngine.submit(cmd); - JsfHelper.addSuccessMessage(JH.localize("datasetVersion.message.deleteSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("datasetVersion.message.deleteSuccess")); } catch (CommandException ex) { - JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize("dataset.message.deleteFailure")); + JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.message.deleteFailure")); logger.severe(ex.getMessage()); } @@ -2565,8 +2565,8 @@ public String save() { // Validate Set constraintViolations = workingVersion.validate(); if (!constraintViolations.isEmpty()) { - //JsfHelper.addFlashMessage(JH.localize("dataset.message.validationError")); - JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("dataset.message.validationError")); + //JsfHelper.addFlashMessage(BundleUtil.getStringFromBundle("dataset.message.validationError")); + JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError")); //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Validation Error", "See below for details.")); return ""; } @@ -2579,7 +2579,7 @@ public String save() { if ( isSessionUserAuthenticated() ) { cmd = new CreateNewDatasetCommand(dataset, dvRequestService.getDataverseRequest(), false, selectedTemplate); } else { - JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize("dataset.create.authenticatedUsersOnly")); + JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataset.create.authenticatedUsersOnly")); return null; } } else { @@ -2648,36 +2648,36 @@ public String save() { } if (addFilesSuccess && dataset.getFiles().size() > 0) { if (nNewFiles == dataset.getFiles().size()) { - JsfHelper.addSuccessMessage(JH.localize("dataset.message.createSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess")); } else { - String partialSuccessMessage = JH.localize("dataset.message.createSuccess.partialSuccessSavingFiles"); + String partialSuccessMessage = BundleUtil.getStringFromBundle("dataset.message.createSuccess.partialSuccessSavingFiles"); partialSuccessMessage = partialSuccessMessage.replace("{0}", "" + dataset.getFiles().size() + ""); partialSuccessMessage = partialSuccessMessage.replace("{1}", "" + nNewFiles + ""); JsfHelper.addWarningMessage(partialSuccessMessage); } } else { - JsfHelper.addWarningMessage(JH.localize("dataset.message.createSuccess.failedToSaveFiles")); + JsfHelper.addWarningMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess.failedToSaveFiles")); } } else { - JsfHelper.addSuccessMessage(JH.localize("dataset.message.createSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess")); } } if (editMode.equals(EditMode.METADATA)) { - JsfHelper.addSuccessMessage(JH.localize("dataset.message.metadataSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.metadataSuccess")); } if (editMode.equals(EditMode.LICENSE)) { - JsfHelper.addSuccessMessage(JH.localize("dataset.message.termsSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.termsSuccess")); } if (editMode.equals(EditMode.FILE)) { - JsfHelper.addSuccessMessage(JH.localize("dataset.message.filesSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.filesSuccess")); } } else { // must have been a bulk file update or delete: if (bulkFileDeleteInProgress) { - JsfHelper.addSuccessMessage(JH.localize("dataset.message.bulkFileDeleteSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteSuccess")); } else { - JsfHelper.addSuccessMessage(JH.localize("dataset.message.bulkFileUpdateSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileUpdateSuccess")); } } @@ -2709,24 +2709,24 @@ private void populateDatasetUpdateFailureMessage(){ if (editMode == null) { // that must have been a bulk file update or delete: if (bulkFileDeleteInProgress) { - JsfHelper.addErrorMessage(JH.localize("dataset.message.bulkFileDeleteFailure")); + JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteFailure")); } else { - JsfHelper.addErrorMessage(JH.localize("dataset.message.filesFailure")); + JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.filesFailure")); } } else { if (editMode.equals(EditMode.CREATE)) { - JsfHelper.addErrorMessage(JH.localize("dataset.message.createFailure")); + JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.createFailure")); } if (editMode.equals(EditMode.METADATA)) { - JsfHelper.addErrorMessage(JH.localize("dataset.message.metadataFailure")); + JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.metadataFailure")); } if (editMode.equals(EditMode.LICENSE)) { - JsfHelper.addErrorMessage(JH.localize("dataset.message.termsFailure")); + JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.termsFailure")); } if (editMode.equals(EditMode.FILE)) { - JsfHelper.addErrorMessage(JH.localize("dataset.message.filesFailure")); + JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.filesFailure")); } } @@ -3386,7 +3386,7 @@ public void saveAsDesignatedThumbnail() { // However, once the "save" button is pressed, we want to show a success message, if this is // a new image has been designated as such: if (getUseAsDatasetThumbnail() && !alreadyDesignatedAsDatasetThumbnail) { - String successMessage = JH.localize("file.assignedDataverseImage.success"); + String successMessage = BundleUtil.getStringFromBundle("file.assignedDataverseImage.success"); logger.fine(successMessage); successMessage = successMessage.replace("{0}", fileMetadataSelectedForThumbnailPopup.getLabel()); JsfHelper.addFlashMessage(successMessage); @@ -3649,7 +3649,7 @@ public String saveFileTagsAndCategories() { } } // success message: - String successMessage = JH.localize("file.assignedTabFileTags.success"); + String successMessage = BundleUtil.getStringFromBundle("file.assignedTabFileTags.success"); logger.fine(successMessage); successMessage = successMessage.replace("{0}", "Selected Files"); JsfHelper.addFlashMessage(successMessage); diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java index 1fef66664f8..0085c395f1e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java @@ -8,6 +8,8 @@ import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean; import edu.harvard.iq.dataverse.settings.SettingsServiceBean; import static edu.harvard.iq.dataverse.util.JsfHelper.JH; + +import edu.harvard.iq.dataverse.util.BundleUtil; import edu.harvard.iq.dataverse.util.SystemConfig; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -83,8 +85,8 @@ public void initBreadcrumbs(DvObject dvObject) { if (dvObject.getId() != null) { initBreadcrumbs(dvObject, null); } else { - initBreadcrumbs(dvObject.getOwner(), dvObject instanceof Dataverse ? JH.localize("newDataverse") : - dvObject instanceof Dataset ? JH.localize("newDataset") : null ); + initBreadcrumbs(dvObject.getOwner(), dvObject instanceof Dataverse ? BundleUtil.getStringFromBundle("newDataverse") : + dvObject instanceof Dataset ? BundleUtil.getStringFromBundle("newDataset") : null ); } } diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java b/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java index d60a302279c..7ed75acf467 100644 --- a/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java @@ -228,7 +228,7 @@ public void writeGuestbookAndStartDownload(GuestbookResponse guestbookResponse) boolean valid = validateGuestbookResponse(guestbookResponse); if (!valid) { - JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("dataset.message.validationError")); + JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError")); } else { requestContext.execute("PF('downloadPopup').hide()"); guestbookResponse.setDownloadtype("Download"); diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java index f9de18e33fb..4a7b3ff68b5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/FilePage.java +++ b/src/main/java/edu/harvard/iq/dataverse/FilePage.java @@ -319,7 +319,7 @@ public String restrictFile(boolean restricted) throws CommandException{ editDataset.getEditVersion().getTermsOfUseAndAccess().setFileAccessRequest(allowRequest); if (fileNames != null) { - String successMessage = JH.localize("file.restricted.success"); + String successMessage = BundleUtil.getStringFromBundle("file.restricted.success"); successMessage = successMessage.replace("{0}", fileNames); JsfHelper.addFlashMessage(successMessage); } @@ -524,7 +524,7 @@ public String save() { if (!constraintViolations.isEmpty()) { //JsfHelper.addFlashMessage(JH.localize("dataset.message.validationError")); fileDeleteInProgress = false; - JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("dataset.message.validationError")); + JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("dataset.message.validationError")); //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Validation Error", "See below for details.")); return ""; } @@ -557,10 +557,10 @@ public String save() { if (fileDeleteInProgress) { - JsfHelper.addSuccessMessage(JH.localize("file.message.deleteSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("file.message.deleteSuccess")); fileDeleteInProgress = false; } else { - JsfHelper.addSuccessMessage(JH.localize("file.message.editSuccess")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("file.message.editSuccess")); } setVersion("DRAFT"); @@ -851,7 +851,7 @@ public List getExploreTools() { //Provenance fragment bean calls this to show error dialogs after popup failure //This can probably be replaced by calling JsfHelper from the provpopup bean public void showProvError() { - JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("file.metadataTab.provenance.error")); + JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.metadataTab.provenance.error")); } } diff --git a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java index ec0acde8a0c..23aac4a24a3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/GuestbookResponsesPage.java @@ -7,6 +7,8 @@ import edu.harvard.iq.dataverse.engine.command.impl.UpdateDataverseCommand; import static edu.harvard.iq.dataverse.util.JsfHelper.JH; + +import edu.harvard.iq.dataverse.util.BundleUtil; import edu.harvard.iq.dataverse.util.SystemConfig; import java.util.List; import java.util.logging.Logger; @@ -91,8 +93,8 @@ public String init() { responsesAsArray = guestbookResponseService.findArrayByGuestbookIdAndDataverseId(guestbookId, dataverseId, systemConfig.getGuestbookResponsesPageDisplayLimit()); FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, - JH.localize("dataset.guestbooksResponses.tip.title"), - JH.localize("dataset.guestbooksResponses.tip.downloadascsv"))); + BundleUtil.getStringFromBundle("dataset.guestbooksResponses.tip.title"), + BundleUtil.getStringFromBundle("dataset.guestbooksResponses.tip.downloadascsv"))); return null; } diff --git a/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java b/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java index d947849f4fb..826cb2b37d5 100644 --- a/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/HarvestingClientsPage.java @@ -124,7 +124,7 @@ public String init() { configuredHarvestingClients = harvestingClientService.getAllHarvestingClients(); pageMode = PageMode.VIEW; - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, JH.localize("harvestclients.title"), JH.localize("harvestclients.toptip"))); + FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("harvestclients.title"), BundleUtil.getStringFromBundle("harvestclients.toptip"))); return null; } @@ -216,7 +216,7 @@ public void runHarvest(HarvestingClient harvestingClient) { return; } - String successMessage = JH.localize("harvestclients.actions.runharvest.success"); + String successMessage = BundleUtil.getStringFromBundle("harvestclients.actions.runharvest.success"); successMessage = successMessage.replace("{0}", harvestingClient.getName()); JsfHelper.addSuccessMessage(successMessage); @@ -297,7 +297,7 @@ public void deleteClient() { //engineService.submit(new DeleteHarvestingClientCommand(dvRequestService.getDataverseRequest(), selectedClient)); harvestingClientService.deleteClient(selectedClient.getId()); - JsfHelper.addInfoMessage(JH.localize("harvestclients.tab.header.action.delete.infomessage")); + JsfHelper.addInfoMessage(BundleUtil.getStringFromBundle("harvestclients.tab.header.action.delete.infomessage")); //} catch (CommandException ex) { // String failMessage = "Selected harvesting client cannot be deleted."; @@ -365,7 +365,7 @@ public void createClient(ActionEvent ae) { // from the harvesting url: newHarvestingClient.setArchiveUrl(makeDefaultArchiveUrl()); // set default description - they can customize it as they see fit: - newHarvestingClient.setArchiveDescription(JH.localize("harvestclients.viewEditDialog.archiveDescription.default.generic")); + newHarvestingClient.setArchiveDescription(BundleUtil.getStringFromBundle("harvestclients.viewEditDialog.archiveDescription.default.generic")); // will try to save it now: @@ -378,7 +378,7 @@ public void createClient(ActionEvent ae) { // NO, we no longer create timers here. It is the job of the Mother Timer! //dataverseTimerService.createHarvestTimer(newHarvestingClient); - String successMessage = JH.localize("harvestclients.newClientDialog.success"); + String successMessage = BundleUtil.getStringFromBundle("harvestclients.newClientDialog.success"); successMessage = successMessage.replace("{0}", newHarvestingClient.getName()); JsfHelper.addSuccessMessage(successMessage); @@ -486,7 +486,7 @@ public void validateMetadataFormat(FacesContext context, UIComponent toValidate, input.setValid(false); context.addMessage(toValidate.getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.oaiMetadataFormat.required"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.oaiMetadataFormat.required"))); } } @@ -498,14 +498,14 @@ public boolean validateNickname() { if (getNewNickname().length() > 30 || (!Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", getNewNickname())) ) { //input.setValid(false); FacesContext.getCurrentInstance().addMessage(getNewClientNicknameInputField().getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.nickname.invalid"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.nickname.invalid"))); return false; // If it passes the regex test, check } else if ( harvestingClientService.findByNickname(getNewNickname()) != null ) { //input.setValid(false); FacesContext.getCurrentInstance().addMessage(getNewClientNicknameInputField().getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.nickname.alreadyused"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.nickname.alreadyused"))); return false; } return true; @@ -513,14 +513,14 @@ public boolean validateNickname() { // Nickname field is empty: FacesContext.getCurrentInstance().addMessage(getNewClientNicknameInputField().getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.nickname.required"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.nickname.required"))); return false; } public boolean validateSelectedDataverse() { if (selectedDestinationDataverse == null) { FacesContext.getCurrentInstance().addMessage(getSelectedDataverseMenu().getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestclients.newClientDialog.dataverse.required"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestclients.newClientDialog.dataverse.required"))); return false; } return true; @@ -579,12 +579,12 @@ public boolean validateServerUrlOAI() { } FacesContext.getCurrentInstance().addMessage(getNewClientUrlInputField().getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", getNewHarvestingUrl() + ": " + JH.localize("harvestclients.newClientDialog.url.invalid"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", getNewHarvestingUrl() + ": " + BundleUtil.getStringFromBundle("harvestclients.newClientDialog.url.invalid"))); return false; } FacesContext.getCurrentInstance().addMessage(getNewClientUrlInputField().getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", getNewHarvestingUrl() + ": " + JH.localize("harvestclients.newClientDialog.url.required"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", getNewHarvestingUrl() + ": " + BundleUtil.getStringFromBundle("harvestclients.newClientDialog.url.required"))); return false; } diff --git a/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java b/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java index ad68c750ec4..496050ca7f4 100644 --- a/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/HarvestingSetsPage.java @@ -140,7 +140,7 @@ public String init() { oaiServerStatusRadio = oaiServerStatusRadioDisabled; } - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, JH.localize("harvestserver.title"), JH.localize("harvestserver.toptip"))); + FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("harvestserver.title"), BundleUtil.getStringFromBundle("harvestserver.toptip"))); return null; } @@ -173,7 +173,7 @@ public void toggleHarvestingServerStatus() { systemConfig.disableOAIServer(); } else { systemConfig.enableOAIServer(); - JsfHelper.addSuccessMessage(JH.localize("harvestserver.service.enable.success")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("harvestserver.service.enable.success")); checkIfDefaultSetExists(); } } @@ -253,7 +253,7 @@ public void createSet(ActionEvent ae) { try { oaiSetService.save(newOaiSet); configuredHarvestingSets = oaiSetService.findAll(); - String successMessage = JH.localize("harvestserver.newSetDialog.success"); + String successMessage = BundleUtil.getStringFromBundle("harvestserver.newSetDialog.success"); successMessage = successMessage.replace("{0}", newOaiSet.getSpec()); JsfHelper.addSuccessMessage(successMessage); success = true; @@ -326,7 +326,7 @@ public void deleteSet() { selectedSet = null; configuredHarvestingSets = oaiSetService.findAll(); - JsfHelper.addInfoMessage(JH.localize("harvestserver.tab.header.action.delete.infomessage")); + JsfHelper.addInfoMessage(BundleUtil.getStringFromBundle("harvestserver.tab.header.action.delete.infomessage")); } catch (Exception ex) { String failMessage = BundleUtil.getStringFromBundle("harvest.delete.fail")+ex.getMessage(); JH.addMessage(FacesMessage.SEVERITY_FATAL, failMessage); @@ -507,7 +507,7 @@ public void validateSetSpec() { if (! Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", getNewSetSpec()) ) { //input.setValid(false); FacesContext.getCurrentInstance().addMessage(getNewSetSpecInputField().getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.invalid"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.invalid"))); setSetSpecValidated(false); return; @@ -515,7 +515,7 @@ public void validateSetSpec() { } else if ( oaiSetService.findBySpec(getNewSetSpec()) != null ) { //input.setValid(false); FacesContext.getCurrentInstance().addMessage(getNewSetSpecInputField().getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.alreadyused"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.alreadyused"))); setSetSpecValidated(false); return; } @@ -525,7 +525,7 @@ public void validateSetSpec() { // Nickname field is empty: FacesContext.getCurrentInstance().addMessage(getNewSetSpecInputField().getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.required"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required"))); setSetSpecValidated(false); return; }*/ @@ -541,21 +541,21 @@ public void validateSetSpec(FacesContext context, UIComponent toValidate, Object if (value.length() > 30){ input.setValid(false); context.addMessage(toValidate.getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.sizelimit"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.sizelimit"))); return; } if (!Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", value)) { input.setValid(false); context.addMessage(toValidate.getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.invalid"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.invalid"))); return; // If it passes the regex test, check } else if (oaiSetService.findBySpec(value) != null) { input.setValid(false); context.addMessage(toValidate.getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.alreadyused"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.alreadyused"))); return; } @@ -566,7 +566,7 @@ public void validateSetSpec(FacesContext context, UIComponent toValidate, Object // the field can't be left empty either: input.setValid(false); context.addMessage(toValidate.getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("harvestserver.newSetDialog.setspec.required"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("harvestserver.newSetDialog.setspec.required"))); } @@ -583,7 +583,7 @@ public void startSetExport(OAISet oaiSet) { return; } - String successMessage = JH.localize("harvestserver.actions.runreexport.success"); + String successMessage = BundleUtil.getStringFromBundle("harvestserver.actions.runreexport.success"); successMessage = successMessage.replace("{0}", oaiSet.getSpec()); JsfHelper.addSuccessMessage(successMessage); configuredHarvestingSets = oaiSetService.findAll(); diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java index bef3d174088..ecec28863da 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManageGroupsPage.java @@ -387,13 +387,13 @@ public void validateGroupIdentifier(FacesContext context, UIComponent toValidate if (! Pattern.matches("^[a-zA-Z0-9\\_\\-]+$", value) ) { input.setValid(false); context.addMessage(toValidate.getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("dataverse.permissions.explicitGroupEditDialog.groupIdentifier.invalid"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("dataverse.permissions.explicitGroupEditDialog.groupIdentifier.invalid"))); } else if ( explicitGroupService.findInOwner(dataverse.getId(), value) != null ) { // Ok, see that the alias is not taken input.setValid(false); context.addMessage(toValidate.getClientId(), - new FacesMessage(FacesMessage.SEVERITY_ERROR, "", JH.localize("dataverse.permissions.explicitGroupEditDialog.groupIdentifier.taken"))); + new FacesMessage(FacesMessage.SEVERITY_ERROR, "", BundleUtil.getStringFromBundle("dataverse.permissions.explicitGroupEditDialog.groupIdentifier.taken"))); } } } diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java index 564cddcbfe3..a4602759ea8 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManageGuestbooksPage.java @@ -84,8 +84,8 @@ public String init() { displayDownloadAll = true; FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, - JH.localize("dataset.manageGuestbooks.tip.title"), - JH.localize("dataset.manageGuestbooks.tip.downloadascsv"))); + BundleUtil.getStringFromBundle("dataset.manageGuestbooks.tip.title"), + BundleUtil.getStringFromBundle("dataset.manageGuestbooks.tip.downloadascsv"))); } @@ -263,9 +263,9 @@ private void saveDataverse(String successMessage, String failureMessage) { } try { engineService.submit(new UpdateDataverseCommand(getDataverse(), null, null, dvRequestService.getDataverseRequest(), null)); - JsfHelper.addSuccessMessage(JH.localize(successMessage)); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle(successMessage)); } catch (CommandException ex) { - JH.addMessage(FacesMessage.SEVERITY_FATAL, JH.localize(failureMessage)); + JH.addMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle(failureMessage)); } } diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java index 781f7c0eaba..f4ece9cab6b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java @@ -93,7 +93,7 @@ public String init() { templates.add(ct); } if (!templates.isEmpty()){ - JH.addMessage(FacesMessage.SEVERITY_INFO, JH.localize("dataset.manageTemplates.info.message.notEmptyTable")); + JH.addMessage(FacesMessage.SEVERITY_INFO, BundleUtil.getStringFromBundle("dataset.manageTemplates.info.message.notEmptyTable")); } return null; } diff --git a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java index 89a91c4c900..3ca8876bf2d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java +++ b/src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java @@ -279,13 +279,13 @@ public String save() { commandEngine.submit(cmd); } catch (Exception ex) { logger.log(Level.SEVERE, "error updating dataverse theme", ex); - FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataverse.save.failed"), JH.localize("dataverse.theme.failure"))); + FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, BundleUtil.getStringFromBundle("dataverse.save.failed"), BundleUtil.getStringFromBundle("dataverse.theme.failure"))); return null; } finally { this.cleanupTempDirectory(); } - JsfHelper.addSuccessMessage(JH.localize("dataverse.theme.success")); + JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataverse.theme.success")); return "dataverse.xhtml?faces-redirect=true&alias="+editDv.getAlias(); // go to dataverse page } diff --git a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java index 21a0b68d6b4..cea26bc65db 100644 --- a/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/provenance/ProvPopupFragmentBean.java @@ -99,7 +99,7 @@ public void handleFileUpload(FileUploadEvent event) throws IOException { Logger.getLogger(ProvPopupFragmentBean.class.getName()) .log(Level.INFO, BundleUtil.getStringFromBundle("file.editProvenanceDialog.invalidSchemaError")); removeJsonAndRelatedData(); - JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("file.editProvenanceDialog.invalidSchemaError")); + JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.editProvenanceDialog.invalidSchemaError")); } else { @@ -110,11 +110,11 @@ public void handleFileUpload(FileUploadEvent event) throws IOException { Logger.getLogger(ProvPopupFragmentBean.class.getName()) .log(Level.SEVERE, BundleUtil.getStringFromBundle("file.editProvenanceDialog.uploadError"), e); removeJsonAndRelatedData(); - JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("file.editProvenanceDialog.uploadError")); + JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.editProvenanceDialog.uploadError")); } if(provJsonParsedEntities.isEmpty()) { removeJsonAndRelatedData(); - JH.addMessage(FacesMessage.SEVERITY_ERROR, JH.localize("file.editProvenanceDialog.noEntitiesError")); + JH.addMessage(FacesMessage.SEVERITY_ERROR, BundleUtil.getStringFromBundle("file.editProvenanceDialog.noEntitiesError")); } } @@ -255,24 +255,24 @@ public void addSuccessMessageToPage(boolean saveInPopup) { if(saveInPopup) { if(isJsonUpdated()) { if(isDataFilePublishedRendering()) { - message += JH.localize("file.provAlert.filePage.published.json"); + message += BundleUtil.getStringFromBundle("file.provAlert.filePage.published.json"); } else { - message += JH.localize("file.provAlert.filePage.unpublished.json"); + message += BundleUtil.getStringFromBundle("file.provAlert.filePage.unpublished.json"); } } if (isFreeformUpdated()) { - message += JH.localize("file.provAlert.filePage.freeform"); + message += BundleUtil.getStringFromBundle("file.provAlert.filePage.freeform"); } } else { if(isJsonUpdated()) { if(isDataFilePublishedRendering()) { - message += JH.localize("file.provAlert.published.json"); + message += BundleUtil.getStringFromBundle("file.provAlert.published.json"); } else { - message += JH.localize("file.provAlert.unpublished.json"); + message += BundleUtil.getStringFromBundle("file.provAlert.unpublished.json"); } } if (isFreeformUpdated()) { - message += JH.localize("file.provAlert.freeform"); + message += BundleUtil.getStringFromBundle("file.provAlert.freeform"); } } diff --git a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java index 67b8fba41f4..a3affbe126b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java @@ -55,6 +55,7 @@ public > T enumValue( String param, Class enmClass, T defau * the API so consider using the newer, more flexible BundleUtil methods * instead. */ + /* @Deprecated public String localize( String messageKey ) { FacesContext facesContext = FacesContext.getCurrentInstance(); @@ -63,5 +64,5 @@ public String localize( String messageKey ) { ResourceBundle bundle = ResourceBundle.getBundle("Bundle", locale); return bundle.getString(messageKey); } - + */ } diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml index c8de4c40716..47952211de8 100644 --- a/src/main/webapp/dataverse_template.xhtml +++ b/src/main/webapp/dataverse_template.xhtml @@ -7,8 +7,9 @@ xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui" xmlns:jsf="http://xmlns.jcp.org/jsf" - xmlns:c="http://java.sun.com/jsp/jstl/core" - lang="en"> + xmlns:c="http://java.sun.com/jsp/jstl/core" + lang="#{dataverseLocaleBean.localeCode}" + xml:lang="#{dataverseLocaleBean.localeCode}"> diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml index 7913a1e947d..f9045d897af 100644 --- a/src/main/webapp/dataverseuser.xhtml +++ b/src/main/webapp/dataverseuser.xhtml @@ -7,6 +7,7 @@ xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:o="http://omnifaces.org/ui"> + @@ -658,4 +659,5 @@ + diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml index 6c050e63b1c..6a3e55f9124 100644 --- a/src/main/webapp/manage-templates.xhtml +++ b/src/main/webapp/manage-templates.xhtml @@ -4,7 +4,10 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" - xmlns:jsf="http://xmlns.jcp.org/jsf"> + xmlns:jsf="http://xmlns.jcp.org/jsf" + lang="#{dataverseLocaleBean.localeCode}" + xml:lang="#{dataverseLocaleBean.localeCode}"> + @@ -192,4 +195,5 @@ + diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml index 25a8668935f..824ac19094a 100644 --- a/src/main/webapp/template.xhtml +++ b/src/main/webapp/template.xhtml @@ -5,8 +5,10 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" - xmlns:jsf="http://xmlns.jcp.org/jsf"> - + xmlns:jsf="http://xmlns.jcp.org/jsf" + lang="#{dataverseLocaleBean.localeCode}" + xml:lang="#{dataverseLocaleBean.localeCode}"> + @@ -137,5 +139,6 @@ + From 3c2a48acd6db09085ed0225bf829dedffcf461ca Mon Sep 17 00:00:00 2001 From: chenganj Date: Tue, 4 Dec 2018 11:04:06 -0500 Subject: [PATCH 8/9] Revert: + xmlns:c="http://java.sun.com/jsp/jstl/core" + lang="en"> diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml index f9045d897af..7913a1e947d 100644 --- a/src/main/webapp/dataverseuser.xhtml +++ b/src/main/webapp/dataverseuser.xhtml @@ -7,7 +7,6 @@ xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:o="http://omnifaces.org/ui"> - @@ -659,5 +658,4 @@ - diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml index 6a3e55f9124..6c050e63b1c 100644 --- a/src/main/webapp/manage-templates.xhtml +++ b/src/main/webapp/manage-templates.xhtml @@ -4,10 +4,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" - xmlns:jsf="http://xmlns.jcp.org/jsf" - lang="#{dataverseLocaleBean.localeCode}" - xml:lang="#{dataverseLocaleBean.localeCode}"> - + xmlns:jsf="http://xmlns.jcp.org/jsf"> @@ -195,5 +192,4 @@ - diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml index 824ac19094a..25a8668935f 100644 --- a/src/main/webapp/template.xhtml +++ b/src/main/webapp/template.xhtml @@ -5,10 +5,8 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core" - xmlns:jsf="http://xmlns.jcp.org/jsf" - lang="#{dataverseLocaleBean.localeCode}" - xml:lang="#{dataverseLocaleBean.localeCode}"> - + xmlns:jsf="http://xmlns.jcp.org/jsf"> + @@ -139,6 +137,5 @@ - From 32b36c15fb48310bdd176e256501c5cabcb9cedf Mon Sep 17 00:00:00 2001 From: chenganj Date: Tue, 4 Dec 2018 11:31:00 -0500 Subject: [PATCH 9/9] removed localize() deprecated method --- .../edu/harvard/iq/dataverse/util/JsfHelper.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java index a3affbe126b..5b87b18573b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/JsfHelper.java @@ -49,20 +49,4 @@ public > T enumValue( String param, Class enmClass, T defau return defaultValue; } } - - /** - * @deprecated Localization applies not only to the front end (JSF) but also - * the API so consider using the newer, more flexible BundleUtil methods - * instead. - */ - /* - @Deprecated - public String localize( String messageKey ) { - FacesContext facesContext = FacesContext.getCurrentInstance(); - String messageBundleName = facesContext.getApplication().getMessageBundle(); - Locale locale = facesContext.getViewRoot().getLocale(); - ResourceBundle bundle = ResourceBundle.getBundle("Bundle", locale); - return bundle.getString(messageKey); - } - */ }