aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/fixtures
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-12-11 08:08:03 -0500
committerGitHub <noreply@github.com>2017-12-11 08:08:03 -0500
commit4edce566ad13d54c86637caf56750df0d6dc7b1a (patch)
treeab83ebd5ba664a742e87731f022aed9a04507837 /actionview/test/fixtures
parenta41fa1fae035124978c6dff07fbc500b82aa46ee (diff)
parent6d3b57fe423e18d61ae457a718c0f9901a173ace (diff)
downloadrails-4edce566ad13d54c86637caf56750df0d6dc7b1a.tar.gz
rails-4edce566ad13d54c86637caf56750df0d6dc7b1a.tar.bz2
rails-4edce566ad13d54c86637caf56750df0d6dc7b1a.zip
Merge pull request #30361 from mfo/master
StreamingTemplateRenderer fails to forward I18n.locale in layouts
Diffstat (limited to 'actionview/test/fixtures')
-rw-r--r--actionview/test/fixtures/layouts/streaming_with_locale.erb2
-rw-r--r--actionview/test/fixtures/test/streaming_with_locale.erb1
2 files changed, 3 insertions, 0 deletions
diff --git a/actionview/test/fixtures/layouts/streaming_with_locale.erb b/actionview/test/fixtures/layouts/streaming_with_locale.erb
new file mode 100644
index 0000000000..e1fdad2073
--- /dev/null
+++ b/actionview/test/fixtures/layouts/streaming_with_locale.erb
@@ -0,0 +1,2 @@
+layout.locale: <%= I18n.locale %>
+<%= yield %>
diff --git a/actionview/test/fixtures/test/streaming_with_locale.erb b/actionview/test/fixtures/test/streaming_with_locale.erb
new file mode 100644
index 0000000000..b0f2b2f7e9
--- /dev/null
+++ b/actionview/test/fixtures/test/streaming_with_locale.erb
@@ -0,0 +1 @@
+view.locale: <%= I18n.locale %>