4685 langtoggle

doc/sphinx-guides/source/installation/config.rst

@@ -1297,3 +1297,11 @@ Enable the collection of provenance metadata on Dataverse via the provenance pop
 Sets how long a cached metrics result is used before re-running the query for a request. Note this only effects queries on the current month, previous months queries are cached indefinitely. The default timeout is 7 days (10080 minutes).
 
 ``curl -X PUT -d 10080 http://localhost:8080/api/admin/settings/:MetricsCacheTimeoutMinutes``
+
+:Languages
+++++++++++
+
+Sets which languages should be available. If there is more than one, a dropdown is displayed
+in the header. This should be formated as a JSON array as shown below.
+
+``curl http://localhost:8080/api/admin/settings/:Languages -X PUT -d '[{  "locale":"en", "title":"English"},  {  "locale":"fr", "title":"Français"}]'``

src/main/java/Bundle.properties

@@ -12,6 +12,7 @@ restricted=Restricted
 restrictedaccess=Restricted Access
 find=Find
 search=Search
+language=Language
 unpublished=Unpublished
 cancel=Cancel
 ok=OK

src/main/java/ValidationMessages_fr.properties

@@ -0,0 +1,49 @@
+user.firstName=Veuillez entrer votre pr�nom.
+user.lastName=Veuillez entrer votre nom de famille. 
+user.invalidEmail=Veuillez entrer une adresse courriel valide.
+user.enterUsername=Veuillez entrer un nom d'utilisateur.
+user.usernameLength=Le nom d'utilisateur doit comporter entre 2 et 60 caract�res.
+user.illegalCharacters=Caract�re(s) non valide(s) utilis�(s). Les caract�res valides sont a-Z, 0-9, '_', '-' et '.'.
+
+user.enterNickname=Veuillez entrer un pseudonyme.
+user.nicknameLength=Le pseudonyme ne peut exc�der 30 caract�res.
+user.nicknameNotnumber=Le pseudonyme ne devrait pas �tre un nombre
+
+dataset.templatename=Veuillez ajouter un nom pour le mod�le d'ensemble de donn�es.
+dataset.nameLength=Le nom ne peut exc�der 255 caract�res.
+
+dataverse.name=Veuillez entrer un nom.
+dataverse.alias=Veuillez entrer un alias.
+dataverse.aliasLength=L'alias ne peut exc�der 60 caract�res.
+dataverse.aliasNotnumber=L'alias ne devrait pas �tre un nombre.
+dataverse.nameIllegalCharacters=Caract�re(s) non valide(s) utilis�(s). Les caract�res valides sont a-Z, 0-9, '_', '-'.
+dataverse.category=Veuillez s�lectionner une cat�gorie pour votre dataverse.
+contenttype.slash=Le type de contenu doit contenir une barre oblique.
+setspec.notNumber=Le nom (Setspec) ne devrait pas �tre un nombre.
+setspec.maxLength=Le nom (Setspec) ne peut exc�der 30 caract�res.
+
+role.name=Un r�le doit avoir un nom.
+desc.maxLength=Le description ne peut exc�der 255 caract�res.
+alias.maxLength=L'alias ne peut exc�der 26 caract�res.
+alias.illegalCharacters=L'alias ne peut �tre vide. Les caract�res valides sont a-Z, 0-9, '_', '-'.
+
+custom.response=Veuillez entrer la r�ponse.
+custom.questiontext=Veuillez entrer le texte de la question.
+filename.illegalCharacters=Le nom du fichier ne peut contenir aucun des caract�res suivants\u00A0: \ / : * ? " < > | ; # .
+directoryname.illegalCharacters=Le nom du r�pertoire ne peut pas �tre suivi ni pr�c�d� d'un caract�re s�parateur de fichiers.
+filename.blank=Veuillez sp�cifier un nom de fichier.
+
+
+map.layername=Veuillez sp�cifier un nom de couche cartographique. 
+map.layerlink=Veuillez sp�cifier un lien de couche cartographique. 
+map.link=Veuillez sp�cifier un lien de carte int�gr�e.
+map.imagelink=Veuillez sp�cifier un lien d'image de carte.
+map.username=Veuillez sp�cifier un nom d'utilisateur WorldMap.
+
+oauth.username=Veuillez entrer votre nom d'utilisateur.
+
+password.retype=Le nouveau mot de passe est vide\u00A0: veuillez le retaper � nouveau.
+password.current=Veuillez entrer votre mot de passe actuel.
+password.validate=Page de r�initialisation du mot de passe par d�faut.
+
+guestbook.name=Saisir un nom pour le registre de visiteurs.

src/main/java/edu/harvard/iq/dataverse/DataverseLocaleBean.java

@@ -0,0 +1,116 @@
+package edu.harvard.iq.dataverse;
+
+import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.*;
+import java.util.logging.Logger;
+
+import javax.faces.context.FacesContext;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.servlet.http.HttpServletRequest;
+
+import org.json.*;
+
+@Named
+@javax.enterprise.context.SessionScoped
+public class DataverseLocaleBean implements Serializable {
+
+    private static final Logger logger = Logger.getLogger(DataverseLocaleBean.class.getCanonicalName());
+
+    @Inject
+    SettingsWrapper settingsWrapper;
+
+    {
+        //Noticed that the NullPointerException was thrown from FacesContext.getCurrentInstance() while running the testcases(mvn:package).
+        //Reason: the FacesContext is not initialized until the app starts. So, added the below if-condition
+        if(FacesContext.getCurrentInstance() == null)
+        {
+            localeCode = "en";
+        }
+        else {
+            if (FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage() == "en_US") {
+                localeCode = "en";
+            } else {
+                localeCode = FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage();
+            }
+        }
+    }
+
+    // Map from locale to display name eg     en -> English
+    private Map<String, String> dataverseLocales;
+
+    private String localeCode;
+
+    public void init() {
+        dataverseLocales = new LinkedHashMap<>();
+        try {
+            JSONArray entries = new JSONArray(settingsWrapper.getValueForKey(SettingsServiceBean.Key.Languages, "[]"));
+            for (Object obj : entries) {
+                JSONObject entry = (JSONObject) obj;
+                String locale = entry.getString("locale");
+                String title = entry.getString("title");
+
+                dataverseLocales.put(locale, title);
+            }
+        } catch (JSONException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        //localeCode = dataverseLocales.keySet().iterator().next();
+        /*if (FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage() == "en_US") {
+            localeCode = "en";
+        } else {
+            localeCode = FacesContext.getCurrentInstance().getViewRoot().getLocale().getLanguage();
+        }*/
+    }
+
+    public Map<String, String>  getDataverseLocales(){
+        return dataverseLocales;
+    }
+
+    public boolean useLocale() {
+        if (dataverseLocales == null) {
+            init();
+        }
+        return dataverseLocales.size() > 1;
+    }
+
+    public String getLocaleCode() {
+        if (localeCode == null) {
+            init();
+        }
+        return localeCode;
+    }
+
+    public void setLocaleCode(String localeCode) {
+        this.localeCode = localeCode;
+    }
+
+    public String getLocaleTitle() {
+        if (dataverseLocales == null) {
+            init();
+        }
+        return dataverseLocales.get(localeCode);
+    }
+
+    public void countryLocaleCodeChanged(String code) {
+        if (dataverseLocales == null) {
+            init();
+        }
+        localeCode = code;
+        FacesContext.getCurrentInstance()
+                .getViewRoot().setLocale(new Locale(dataverseLocales.get(code)));
+        try {
+            String url = ((HttpServletRequest) FacesContext.getCurrentInstance()
+                    .getExternalContext().getRequest()).getHeader("referer");
+            FacesContext.getCurrentInstance().getExternalContext().redirect(url);
+
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+
+    }
+
+}

src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java

@@ -163,6 +163,5 @@ public String getSupportTeamName() {
     public boolean isRootDataverseThemeDisabled() {
         return isTrueForKey(Key.DisableRootDataverseTheme, false);
     }
-
 }
 

src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java

@@ -355,6 +355,9 @@ Whether Harvesting (OAI) service is enabled
         'INDEPENDENT' means a new global id, completely independent from the dataset-level global id.
         */
         DataFilePIDFormat, 
+        /* Json array of supported languages
+        */
+        Languages,
         /*
         Number for the minimum number of files to send PID registration to asynchronous workflow
         */

src/main/java/edu/harvard/iq/dataverse/util/BundleUtil.java

@@ -1,5 +1,7 @@
 package edu.harvard.iq.dataverse.util;
 
+import edu.harvard.iq.dataverse.DataverseLocaleBean;
+
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Locale;
@@ -12,16 +14,17 @@ public class BundleUtil {
     private static final Logger logger = Logger.getLogger(BundleUtil.class.getCanonicalName());
 
     private static final String defaultBundleFile = "Bundle";
-    private static final Locale defaultLocale = Locale.US;
+    private static Locale bundle_locale;
 
     public static String getStringFromBundle(String key) {
         return getStringFromBundle(key, null);
     }
 
     public static String getStringFromBundle(String key, List<String> arguments) {
-        ResourceBundle bundle = ResourceBundle.getBundle(defaultBundleFile, defaultLocale);
+        DataverseLocaleBean d = new DataverseLocaleBean();
+        bundle_locale= new Locale(d.getLocaleCode());
+        ResourceBundle bundle = ResourceBundle.getBundle(defaultBundleFile, bundle_locale);
         return getStringFromBundle(key, arguments, bundle);
-
     }
 
     public static String getStringFromBundle(String key, List<String> arguments, ResourceBundle bundle) {

src/main/webapp/WEB-INF/faces-config.xml

@@ -10,6 +10,7 @@
         </resource-bundle>     
         <locale-config>
             <default-locale>en</default-locale>
+            <supported-locale>fr</supported-locale>
             <supported-locale>zh_CN</supported-locale>
         </locale-config>
     </application>

src/main/webapp/dataverse_header.xhtml

@@ -38,58 +38,75 @@
                 </div>
                 <div class="collapse navbar-collapse" id="topNavBar">
                     <ul class="nav navbar-nav navbar-right">
-                         <li>
-                            <a href="#" id="navbar-search-toggle" title="#{bundle['header.search.title']}">
-                                <span class="glyphicon glyphicon-search"></span>
-                            </a>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle.search} <b class="caret"></b></a>
+                            <ul class="dropdown-menu" style="padding:12px;min-width:350px;">
+                                <form class="form-inline" role="search">
+                                    <label class="sr-only" for="navbarsearch">#{bundle.search}</label>
+                                    <div class="input-group">
+                                        <input id="navbarsearch" type="text" class="form-control" size="28" value="" placeholder="#{bundle['header.search.title']}"/>
+                                        <span class="input-group-btn">
+                                            <button type="submit" class="btn btn-default" onclick="window.location = '/dataverse/#{dataverseServiceBean.findRootDataverse().alias}&#63;q=' + document.getElementById('navbarsearch').value;
+                                                    return false;">
+                                                <span class="glyphicon glyphicon-search"/> #{bundle.find}
+                                            </button>
+                                        </span>
+                                    </div>
+                                </form>
+                            </ul>
                         </li>
-                        <form class="navbar-form navbar-left" role="search" style="display:none;">
-                            <div class="form-group">
-                                <label class="sr-only" for="navbarsearch">#{bundle.search}</label>
-                                <input id="navbarsearch" type="text" class="search-input ui-inputfield ui-inputtext ui-widget ui-state-default ui-corner-all" size="28" value="" placeholder="#{bundle['header.search.title']}"/>            
-                            </div>                            
-                            <button type="submit" class="btn btn-default" onclick="window.location = '/dataverse/#{dataverseServiceBean.findRootDataverse().alias}&#63;q=' + document.getElementById('navbarsearch').value;
-                                    return false;">
-                                <span class="glyphicon glyphicon-search"/> #{bundle.find}
-                            </button>
-                        </form>
-                        <ui:fragment rendered="#{!empty settingsWrapper.get(':NavbarAboutUrl')}">
-                        <li>
+
+                        <li jsf:rendered="#{!empty settingsWrapper.get(':NavbarAboutUrl')}">
                             <h:outputLink value="#{settingsWrapper.get(':NavbarAboutUrl')}" target="_blank">
-                                #{bundle['header.about']}
-                            </h:outputLink>                         
+                                <h:outputText value="#{bundle['header.about']}"/>
+                            </h:outputLink>
                         </li>
-                        </ui:fragment>
 
                         <li>
                             <h:outputLink value="#{settingsWrapper.guidesBaseUrl}/#{systemConfig.guidesVersion}/user" target="_blank">
-                                #{bundle['header.guides.user']}
+                                <h:outputText value="#{bundle['header.guides.user']}"/>
                             </h:outputLink>
                         </li>
-
-                        <ui:fragment rendered="#{!empty settingsWrapper.get(':NavbarSupportUrl')}">
-                            <li>
-                                <h:outputLink value="#{settingsWrapper.get(':NavbarSupportUrl')}" target="_blank">
-                                    #{bundle['header.support']}
-                                </h:outputLink>
-                            </li>
-                        </ui:fragment>
+
+                        <li jsf:rendered="#{!empty settingsWrapper.get(':NavbarSupportUrl')}">
+                            <h:outputLink value="#{settingsWrapper.get(':NavbarSupportUrl')}" target="_blank">
+                                <h:outputText value="#{bundle['header.support']}"/>
+                            </h:outputLink>
+                        </li>
+
                         <ui:fragment rendered="#{empty settingsWrapper.get(':NavbarSupportUrl')}">
                             <o:form useRequestURI="true" class="navbar-form navbar-left navbar-form-link">
-                                <p:commandLink value="#{bundle['header.support']}" oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
+                                <p:commandLink oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}">
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
                                     <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                    <h:outputText value="#{bundle['header.support']}"/>
                                 </p:commandLink>
                             </o:form>
                         </ui:fragment>
-
-                        <li jsf:rendered="#{dataverseSession.user.superuser}">
-                            <h:outputLink value="/dashboard.xhtml?dataverseId=#{dataverseServiceBean.findRootDataverse().id}">
-                                <h:outputText value="#{bundle['header.dashboard']}" />
-                            </h:outputLink>
+
+                        <li class="dropdown" jsf:rendered="#{dataverseLocaleBean.useLocale()}">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="#{bundle.language}">#{dataverseLocaleBean.localeTitle} <b class="caret"></b></a>
+                            <ul class="dropdown-menu">
+                                <h:form class="form-inline">
+                                    <ui:repeat value="#{dataverseLocaleBean.dataverseLocales.entrySet().toArray()}" var="language">
+                                        <li class="#{dataverseLocaleBean.localeTitle == language.value ? 'active' : ''}">
+                                            <h:commandLink value="#{language.value}" actionListener="#{dataverseLocaleBean.countryLocaleCodeChanged(language.key)}" action="submit()"
+                                                           style="padding: 3px 20px;
+                                                                    clear: both;
+                                                                    font-weight: 400;
+                                                                    line-height: 1.42857143;
+                                                                    color: rgb(51, 51, 51);
+                                                                    white-space: nowrap;
+                                                                    text-decoration: none;
+                                                                    display: block;"/>
+                                        </li>
+                                    </ui:repeat>
+                                </h:form>
+                            </ul>
                         </li>
+
                         <ui:fragment rendered="#{!dataverseSession.user.authenticated}">
                             <li>
                                 <h:outputLink rendered="#{dataverseHeaderFragment.signupAllowed}"
@@ -103,6 +120,7 @@
                                 </h:outputLink>
                             </li>
                         </ui:fragment>
+
                         <ui:fragment rendered="#{dataverseSession.user.authenticated}">
                             <li class="dropdown accountName">
                                 <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" role="menu" aria-haspopup="true" aria-expanded="false">
@@ -148,9 +166,15 @@
                                             <h:outputText value="#{bundle['header.user.selectTab.apiToken']}" />
                                         </h:outputLink>
                                     </li>
-                                    <li class="divider" tabindex="-1"></li>
+                                    <li class="divider"></li>
+                                    <li jsf:rendered="#{dataverseSession.user.superuser}" tabindex="-1">
+                                        <h:outputLink value="/dashboard.xhtml?dataverseId=#{dataverseServiceBean.findRootDataverse().id}">
+                                            <h:outputText value="#{bundle['header.dashboard']}" />
+                                        </h:outputLink>
+                                    </li>
+                                    <li class="divider" jsf:rendered="#{dataverseSession.user.superuser}"></li>
                                     <li class="logout" tabindex="-1">
-                                        <o:form useRequestURI="true" styleClass="navbar-form navbar-left" pt:role="logout">
+                                        <o:form useRequestURI="true" pt:role="logout">
                                             <h:commandLink action="#{dataverseHeaderFragment.logout}" id="lnk_header_logout">
                                                 <h:outputText value="#{bundle['header.logOut']}" />
                                             </h:commandLink>