Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4679 javascript bundle #5351

Merged
merged 19 commits into from
Apr 5, 2019
Merged

4679 javascript bundle #5351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
216eff9
internationalize the english strings
JayanthyChengan Nov 28, 2018
7d97938
internationalize the english strings
JayanthyChengan Nov 28, 2018
c95e094
Merge remote-tracking branch 'remotes/origin/develop' into 4679-javas…
JayanthyChengan Dec 12, 2018
427171d
Merged "alert messages branch : https://github.com/scholarsportal/dat…
JayanthyChengan Dec 12, 2018
507c82f
Added variables in mydata_fragment.xhtml and passed to MyData.js
JayanthyChengan Dec 12, 2018
6a60582
Fixed 'ResourceBundles are immutable' error on My Data [ref #4679]
mheppler Dec 13, 2018
dd7f442
Merge pull request #29 from IQSS/4679-mydata-bundle-lang-fix
JayanthyChengan Dec 13, 2018
55a0d89
Merge remote-tracking branch 'remotes/origin/develop' into 4679-javas…
JayanthyChengan Dec 19, 2018
af47064
rolled back the changes for role
JayanthyChengan Dec 19, 2018
0c68fde
dct_explore
lubitchv Mar 26, 2019
bcb47a5
remove dct_explore
lubitchv Mar 26, 2019
c1b3778
Merge branch 'develop' of https://github.com/scholarsportal/dataverse…
JayanthyChengan Mar 28, 2019
7668eac
Merge remote-tracking branch 'remotes/remote/develop' into develop
JayanthyChengan Apr 2, 2019
ef0b5fe
Merge remote-tracking branch 'remotes/remote/develop' into develop
JayanthyChengan Apr 3, 2019
fbbc1b7
Merge remote-tracking branch 'remotes/origin/develop' into 4679-javas…
JayanthyChengan Apr 3, 2019
1f9a6cd
rearranged bundle keys
JayanthyChengan Apr 4, 2019
8960215
Merge remote-tracking branch 'remotes/remote/develop' into develop
JayanthyChengan Apr 5, 2019
dcc8a03
rearranged bundle keys
JayanthyChengan Apr 5, 2019
2195685
Merge remote-tracking branch 'remotes/origin/develop' into 4679-javas…
JayanthyChengan Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ htmlAllowedTags=<a>, <b>, <blockquote>, <br>, <code>, <del>, <dd>, <dl>, <dt>, <
toggleNavigation=Toggle navigation
defaultBody=Default Body
filter=Filter
to=to
of=of

# dataverse_header.xhtml
header.noscript=Please enable JavaScript in your browser. It is required to use most of the features of Dataverse.
Expand Down Expand Up @@ -1578,6 +1580,7 @@ file.dataFilesTab.versions.description.deaccessionedReason=Deaccessioned Reason:
file.dataFilesTab.versions.description.beAccessedAt=The dataset can now be accessed at:
file.dataFilesTab.versions.viewDetails.btn=View Details
file.dataFilesTab.versions.widget.viewMoreInfo=To view more information about the versions of this dataset, and to edit it if this is your dataset, please visit the <a href="/dataset.xhtml?persistentId={0}" title="{1}" target="_blank">full version of this dataset</a> at the {2}.
file.dataFilesTab.versions.preloadmessage=(Loading versions...)
file.deleteDialog.tip=Are you sure you want to delete this dataset and all of its files? You cannot undelete this dataset.
file.deleteDialog.header=Delete Dataset
file.deleteDraftDialog.tip=Are you sure you want to delete this draft version? Files will be reverted to the most recently published version. You cannot undelete this draft.
Expand Down Expand Up @@ -1863,6 +1866,10 @@ mydataFragment.publicationStatus=Publication Status
mydataFragment.roles=Roles
mydataFragment.resultsByUserName=Results by Username
mydataFragment.search=Search my data...
mydata.result=Result
mydata.results=Results
mydata.viewnext=View Next
mydata.more=More

file.provenance=Provenance
file.editProvenanceDialog=Provenance
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/Bundle_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ htmlAllowedTags=<a>, <b>, <blockquote>, <br>, <code>, <del>, <dd>, <dl>, <dt>, <
toggleNavigation=Basculer la navigation
defaultBody=Corps du texte par d�faut
filter=Filtre
to=�
of=de

# dataverse_header.xhtml
header.status.header=�tat
Expand Down Expand Up @@ -1562,6 +1564,7 @@ file.dataFilesTab.versions.description.deaccessionedReason=Raison du retrait\u00
file.dataFilesTab.versions.description.beAccessedAt=L'ensemble de donn�es peut maintenant �tre consult� �\u00A0:
file.dataFilesTab.versions.viewDetails.btn=Voir les renseignements
file.dataFilesTab.versions.widget.viewMoreInfo=Pour afficher plus d'informations sur les versions de cet ensemble de donn�es et pour le modifier s''il s''agit de votre ensemble de donn�es, consulter la <a href="/dataset.xhtml?persistentId={0}" title="{1}" target="_blank">version compl�te de cet ensemble</a> � {2}.
file.dataFilesTab.versions.preloadmessage=(Chargement des versions\u2026)
file.deleteDialog.tip=�tes-vous s�r(e) de vouloir supprimer cet ensemble de donn�es? Vous ne pourrez pas annuler la suppression.
file.deleteDialog.header=Supprimer l'ensemble de donn�es
file.deleteDraftDialog.tip=�tes-vous s�r(e) de vouloir supprimer cette version provisoire? Vous ne pourrez pas annuler la suppression de cette version.
Expand Down Expand Up @@ -1836,6 +1839,10 @@ mydataFragment.publicationStatus=Statut de publication
mydataFragment.roles=R�les
mydataFragment.resultsByUserName=R�sultats par nom d'utilisateur
mydataFragment.search=Rechercher mes donn�es\u2026
mydata.result=R�sultat
mydata.results=R�sultats
mydata.viewnext=Voir suivant
mydata.more=Plus

file.provenance=Provenance
file.editProvenanceDialog=Provenance
Expand Down
Loading