Skip to content

Commit 3fa8e41

Browse files
committed
Fixed i18n Messages, added new a i18n Message for when ownProfile=false
1 parent d2387bd commit 3fa8e41

File tree

5 files changed

+26
-15
lines changed

5 files changed

+26
-15
lines changed

app/views/collections/miniList.scala.html

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
@(profile: User, collectionsList: List[Collection], deletePermission: Boolean,
3-
ownProfile: Option[Boolean], userSelections: List[String])(implicit user: Option[models.User])
3+
ownProfile: Boolean, userSelections: List[String])(implicit user: Option[User])
44

55

66
<div class="row top-padding">
@@ -22,8 +22,11 @@
2222
</div>
2323
@if(collectionsList.size < 1) {
2424
<div class="text-center">
25-
<div>@Messages("home.empty.message", Messages("collections.title").toLowerCase) </div>
26-
27-
<div> <a class="btn-link" href="@routes.Collections.newCollection(None)" title="Create a new @Messages("collection.title")">@Messages("create.title", Messages("collection.title"))</a></div>
25+
@if(ownProfile) {
26+
<div>@Messages("home.empty.message", Messages("collections.title").toLowerCase) </div>
27+
<div><a class="btn-link" href="@routes.Collections.newCollection(None)" title="Create a new @Messages("collection.title")">@Messages("create.title", Messages("collection.title"))</a></div>
28+
} else {
29+
<div>@Messages("profile.empty.message", Messages("collections.title").toLowerCase) </div>
30+
}
2831
</div>
2932
}

app/views/datasets/miniList.scala.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
@(profile: User, datasetsList: List[Dataset], deletePermission: Boolean,
3-
ownProfile: Option[Boolean], userSelections: List[String])(implicit user: Option[models.User])
3+
ownProfile: Boolean, userSelections: List[String])(implicit user: Option[models.User])
44

55

66
<div class="row top-padding">
@@ -25,8 +25,12 @@
2525
</div>
2626
@if(datasetsList.size < 1) {
2727
<div class="text-center">
28-
<div>@Messages("home.empty.message", Messages("datasets.title").toLowerCase) </div>
29-
<div> <a class="btn-link" href="@routes.Datasets.newDataset(None, None)" title="Create a new @Messages("dataset.title")">@Messages("create.title", Messages("dataset.title"))</a></div>
28+
@if(ownProfile) {
29+
<div>@Messages("home.empty.message", Messages("datasets.title").toLowerCase)</div>
30+
<div><a class="btn-link" href="@routes.Datasets.newDataset(None, None)" title="Create a new @Messages("dataset.title")">@Messages("create.title", Messages("dataset.title"))</a></div>
31+
} else {
32+
<div>@Messages("profile.empty.message", Messages("datasets.title").toLowerCase) </div>
33+
}
3034
</div>
3135
}
3236

app/views/profile.scala.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,17 +164,17 @@ <h4>Past Projects</h4>
164164
<div class="tab-content">
165165
<!-- Spaces tab -->
166166
<div role="tabpanel" class="tab-pane active" id="spaces">
167-
@views.html.spaces.miniList(profile, spacesList, false, Some(ownProfile), List.empty)
167+
@views.html.spaces.miniList(profile, spacesList, false, ownProfile, List.empty)
168168
</div>
169169

170170
<!-- Datasets tab -->
171171
<div role="tabpanel" class="tab-pane" id="datasets">
172-
@views.html.datasets.miniList(profile, datasetsList, false, Some(ownProfile), List.empty)
172+
@views.html.datasets.miniList(profile, datasetsList, false, ownProfile, List.empty)
173173
</div>
174174

175175
<!-- Collections tab -->
176176
<div role="tabpanel" class="tab-pane" id="collections">
177-
@views.html.collections.miniList(profile, collectionsList, false, Some(ownProfile), List.empty)
177+
@views.html.collections.miniList(profile, collectionsList, false, ownProfile, List.empty)
178178
</div>
179179

180180
<!-- API Keys tab -->

app/views/spaces/miniList.scala.html

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
@(profile: User, spacesList: List[ProjectSpace], deletePermission: Boolean,
3-
ownProfile: Option[Boolean], userSelections: List[String])(implicit user: Option[models.User])
3+
ownProfile: Boolean, userSelections: List[String])(implicit user: Option[User])
44

55
<div class="row top-padding">
66
<div class="col-xs-12">
@@ -21,8 +21,11 @@
2121
</div>
2222
@if(spacesList.size < 1) {
2323
<div class="text-center">
24-
<div>@Messages("home.empty.message", Messages("spaces.title")) </div>
25-
26-
<div> <a class="btn-link" href="@routes.Spaces.newSpace()" title="Create a new @Messages("space.title")">@Messages("create.title", Messages("space.title"))</a></div>
24+
@if(ownProfile) {
25+
<div>@Messages("home.empty.message", Messages("spaces.title").toLowerCase)</div>
26+
<div><a class="btn-link" href="@routes.Spaces.newSpace()" title="Create a new @Messages("space.title")">@Messages("create.title", Messages("space.title"))</a></div>
27+
} else {
28+
<div>@Messages("profile.empty.message", Messages("spaces.title").toLowerCase)</div>
29+
}
2730
</div>
2831
}

conf/messages

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ dataset.trash.message=These {0} are in the trash. You can restore them or delete
4141
collection.list.message=Use {0} to bring together multiple {1} and their associated files in an almost unlimited number of ways.
4242
collection.trash.message=These {0} are in the trash. You can restore them or delete them.
4343
space.list.message=Use {0} to collaboratively work with your team to manage and annotate data.
44-
home.empty.message=This area will show all {0} you've created.
44+
home.empty.message=This area will show all {0} you''ve created.
45+
profile.empty.message=This area will show all {0} this user has created.
4546
recent.message=Viewing most recent {0}
4647
view.all = View All {0}
4748
a.in.b = {0} in the {1}

0 commit comments

Comments
 (0)