mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2025-03-19 15:40:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed spring msg with args for several views

Browse Source
This commit is contained in:
Jake Potrebic 2020-09-02 18:27:57 -07:00
parent 5809d70caf
commit 60b2a977c5
No known key found for this signature in database
GPG Key ID: 7C58557EC9C421F8
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/templates/linkout.ftlh
View File

@ -13,7 +13,7 @@
</h3>
</div>
<div class="panel-body">
<p><@spring.messageArgs "general.linkout.warning", [remoteUrl] /></p>
<p><@spring.messageArgs code="general.linkout.warning" args=[remoteUrl] /></p>
<a class="pull-left link-go-back">
<i class="fas fa-arrow-left"></i> <@spring.message "project.back" />
</a>

2
src/main/resources/templates/projects/settings.ftlh
View File

@ -278,7 +278,7 @@
<textarea name="comment" class="textarea-delete-comment form-control" rows="3"></textarea>
<br>
<div class="alert alert-warning">
<@spring.messageArgs "project.delete.info.uniqueid", p.project.name />
<@spring.messageArgs code="project.delete.info.uniqueid" args=[p.project.name] />
</div>
</div>
<div class="modal-footer">

2
src/main/resources/templates/projects/versions/create.ftlh
View File

@ -177,7 +177,7 @@
</div>
</div>
<span class="pull-left tos"><i><@spring.messageArgs "version.create.tos" "#" /></i></span>
<span class="pull-left tos"><i><@spring.messageArgs code="version.create.tos" args=["#"] /></i></span>
</div>
<#import "*/projects/helper/createSteps.ftlh" as createSteps>

2
src/main/resources/templates/projects/versions/log.ftlh
View File

@ -2,7 +2,7 @@
<#import "*/utils/hangar.ftlh" as hangar />
<#import "*/layout/base.ftlh" as base />
<#assign message><@spring.messageArgs "version.log.logger.title" project.namespace /></#assign>
<#assign message><@spring.messageArgs code="version.log.logger.title" args=[project.namespace] /></#assign>
<@base.base title=message>
<div class="row">
<div class="col-md-12">

3
src/main/resources/templates/projects/versions/view.ftlh
View File

@ -55,8 +55,7 @@
<#if headerData.globalPerm(Permission.Reviewer)>
<#if v.approvedBy?has_content>
<i class="minor">
<#assign msgArgs=[v.approvedBy, utils.prettifyDateTime(v.v.approvedAt)] />
<@spring.messageArgs "version.approved.info" msgArgs />
<@spring.messageArgs code="version.approed.info" args=[v.approvedBy, utils.prettifyDateTime(v.v.approvedAt)] />
</i>
</#if>
</#if>

2
src/main/resources/templates/projects/view.ftlh
View File

@ -48,7 +48,7 @@ Base template for Project overview.
${p.renderVisibilityChange(markdownService, "Unknown")}
<#else>
<#if p.visibility == Visibility.SOFTDELETE>
<@spring.messageArgs "visibility.notice." + p.visibility.getName(), [p.lastVisibilityChangeUser] />
<@spring.messageArgs code="visibility.notice." + p.visibility.getName() args=[p.lastVisibilityChangeUser] />
<#else>
<@spring.message "visibility.notice." + p.visibility.getName() />
${p.renderVisibilityChange(markdownService, "")}

4
src/main/resources/templates/users/view.ftlh
View File

@ -26,8 +26,8 @@
CATEGORY_TITLE['${category.apiName}'] = '${category.title}';
CATEGORY_ICON['${category.apiName}'] = '${category.icon}';
</#list>
NO_ACTION_MESSAGE.starred = '<@spring.messageArgs "user.noStars" u.user.name />';
NO_ACTION_MESSAGE.watching = '<@spring.messageArgs "user.noWatching" u.user.name />';
NO_ACTION_MESSAGE.starred = '<@spring.messageArgs code="user.noStars" args=[u.user.name] />';
NO_ACTION_MESSAGE.watching = '<@spring.messageArgs code="user.noWatching" args=[u.user.name] />';
</script>
${additionalScripts}
</#assign>