merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237

1 files changed, 4 insertions, 6 deletions

diff --git a/rt/t/web/user_update.t b/rt/t/web/user_update.t
index 54139d797..7be088b0a 100644
--- a/rt/t/web/user_update.t
+++ b/rt/t/web/user_update.t
@@ -8,7 +8,7 @@ ok( $m->login(), 'logged in' );
 $m->follow_link_ok({text => 'About me'});
 $m->submit_form_ok({ with_fields => { Lang => 'ja'} },
                "Change to Japanese");
-$m->text_contains("Lang changed from (no value) to 'ja'");
+$m->text_contains(Encode::decode("UTF-8","Langは「(値なし)」から「'ja'」に変更されました"));
 $m->text_contains(Encode::decode("UTF-8","実名"), "Page content is japanese");
 
 # we only changed one field, and it wasn't the default, so this feedback is
@@ -19,9 +19,7 @@ $m->content_lacks("That is already the current value");
 $m->submit_form_ok({ with_fields => { Lang => 'en_us'} },
                "Change back to english");
 
-# This message shows up in Japanese
-# $m->text_contains("Lang changed from 'ja' to 'en_us'");
-$m->text_contains(Encode::decode("UTF-8","Langは「'ja'」から「'en_us'」に変更されました"));
+$m->text_contains("Lang changed from 'ja' to 'en_us'");
 $m->text_contains("Real Name", "Page content is english");
 
 # Check for a lack of spurious updates
@@ -30,11 +28,11 @@ $m->content_lacks("That is already the current value");
 # Ensure that we can change the language back to the default.
 $m->submit_form_ok({ with_fields => { Lang => 'ja'} },
                    "Back briefly to Japanese");
-$m->text_contains("Lang changed from 'en_us' to 'ja'");
+$m->text_contains(Encode::decode("UTF-8","Langは「'en_us'」から「'ja'」に変更されました"));
 $m->text_contains(Encode::decode("UTF-8","実名"), "Page content is japanese");
 $m->submit_form_ok({ with_fields => { Lang => ''} },
                    "And set to the default");
-$m->text_contains(Encode::decode("UTF-8","Langは「'ja'」から「(値なし)」に変更されました"));
+$m->text_contains("Lang changed from 'ja' to (no value)");
 $m->text_contains("Real Name", "Page content is english");
 
 undef $m;