diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-12-05 08:54:16 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-12-05 08:54:16 -0200 |
| commit | 95ddfc4e5840ca88e559157ca105e0042eb5942b (patch) | |
| tree | 1e77afdc209c99214c12e8910838b7d817023279 /actionpack | |
| parent | bbbe9cfc61bf0ab8f6b672d394fa00bdb9941fc3 (diff) | |
| parent | 8ef51f64e51a71353e2dbee20f2a0f466445c805 (diff) | |
| download | rails-95ddfc4e5840ca88e559157ca105e0042eb5942b.tar.gz rails-95ddfc4e5840ca88e559157ca105e0042eb5942b.tar.bz2 rails-95ddfc4e5840ca88e559157ca105e0042eb5942b.zip | |
Merge pull request #17925 from rebyn/german_typo
Fix typo in "Hello World" template in German
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/test/controller/localized_templates_test.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/fixtures/localized/hello_world.de.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/localized_templates_test.rb b/actionpack/test/controller/localized_templates_test.rb index 27871ef351..2be947c648 100644 --- a/actionpack/test/controller/localized_templates_test.rb +++ b/actionpack/test/controller/localized_templates_test.rb @@ -19,7 +19,7 @@ class LocalizedTemplatesTest < ActionController::TestCase def test_localized_template_is_used I18n.locale = :de get :hello_world - assert_equal "Gutten Tag", @response.body + assert_equal "Guten Tag", @response.body end def test_default_locale_template_is_used_when_locale_is_missing @@ -34,7 +34,7 @@ class LocalizedTemplatesTest < ActionController::TestCase I18n.fallbacks[:"de-AT"] = [:de] get :hello_world - assert_equal "Gutten Tag", @response.body + assert_equal "Guten Tag", @response.body end def test_localized_template_has_correct_header_with_no_format_in_template_name diff --git a/actionpack/test/fixtures/localized/hello_world.de.html b/actionpack/test/fixtures/localized/hello_world.de.html index 4727d7a7e0..a8fc612c60 100644 --- a/actionpack/test/fixtures/localized/hello_world.de.html +++ b/actionpack/test/fixtures/localized/hello_world.de.html @@ -1 +1 @@ -Gutten Tag
\ No newline at end of file +Guten Tag
\ No newline at end of file |