Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support i18n and nested templates in ScriptTemplateView

Browse Source 
This commit changes the 3rd parameter passed to the rendering
function from String url to RenderingContext renderingContext.

RenderingContext contains 4 properties:
 - ApplicationContext applicationContext
 - Locale locale
 - Function<String, String> templateLoader
 - String url

Issue: SPR-15064
This commit is contained in:
Sebastien Deleuze
2017-01-23 18:37:27 +01:00
parent 8038fb9c8b
commit 2d95199466
29 changed files with 320 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jruby/render.rb
View File

@@ -3,7 +3,7 @@ require 'ostruct'
require 'java'
# Renders an ERB template against a hashmap of variables.
def render(template, variables, url)
def render(template, variables, renderingContext)
context = OpenStruct.new(variables).instance_eval do
variables.each do |k, v|
instance_variable_set(k, v) if k[0] == '@'

2
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/jython/render.py
View File

@@ -1,5 +1,5 @@
from string import Template
def render(template, model, url):
def render(template, model, renderingContext):
s = Template(template)
return s.substitute(model)

1
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/footer.html Normal file
View File

@@ -0,0 +1 @@
</body></html>

1
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/header.html Normal file
View File

@@ -0,0 +1 @@
<html><body>

9
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/render.kts
View File

@@ -1,10 +1,17 @@
import javax.script.*
import org.springframework.web.servlet.view.script.RenderingContext
import org.springframework.context.support.ResourceBundleMessageSource
import org.springframework.beans.factory.getBean
// TODO Use engine.eval(String, Bindings) when https://youtrack.jetbrains.com/issue/KT-15450 will be fixed
fun render(template: String, model: Map<String, Any>, url: String): String {
fun render(template: String, model: Map<String, Any>, renderingContext: RenderingContext): String {
val engine = ScriptEngineManager().getEngineByName("kotlin")
val bindings = SimpleBindings()
bindings.putAll(model)
var messageSource = renderingContext.applicationContext.getBean<ResourceBundleMessageSource>()
bindings.put("i18n", { code: String -> messageSource.getMessage(code, null, renderingContext.locale) })
bindings.put("include", { path: String -> renderingContext.templateLoader.apply("org/springframework/web/servlet/view/script/kotlin/$path.html") })
engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE)
return engine.eval(template) as String
}

6
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/template.kts
View File

@@ -1 +1,5 @@
"""<html><head><title>${bindings["title"]}</title></head><body><p>${bindings["body"]}</p></body></html>"""
import org.springframework.web.reactive.result.view.script.*
"""${include("header") }
<p>${i18n("hello")} $foo</p>
${include("footer")}"""

1
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/messages_en.properties Normal file
View File

@@ -0,0 +1 @@
hello = Hello

1
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/messages_fr.properties Normal file
View File

@@ -0,0 +1 @@
hello = Bonjour

4
spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/nashorn/render.js
View File

@@ -2,6 +2,6 @@ function render(template, model) {
return template.replace("{{title}}", model.title).replace("{{body}}", model.body);
}
function renderWithUrl(template, model, url) {
return template.replace("{{title}}", "Check url parameter").replace("{{body}}", url);
function renderWithUrl(template, model, renderingContext) {
return template.replace("{{title}}", "Check url parameter").replace("{{body}}", renderingContext.url);
}